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

[PATCH 1/2] jscript: Use wide-string literals in-place for object.
by Jeff Smith 23 Mar '20

23 Mar '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/object.c | 80 ++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 580e11833e..ef249e91a9 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -24,32 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; -static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; -static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; -static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; -static const WCHAR propertyIsEnumerableW[] = - {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; - -static const WCHAR createW[] = {'c','r','e','a','t','e',0}; -static const WCHAR getOwnPropertyDescriptorW[] = - {'g','e','t','O','w','n','P','r','o','p','e','r','t','y','D','e','s','c','r','i','p','t','o','r',0}; -static const WCHAR getPrototypeOfW[] = - {'g','e','t','P','r','o','t','o','t','y','p','e','O','f',0}; -static const WCHAR definePropertyW[] = {'d','e','f','i','n','e','P','r','o','p','e','r','t','y',0}; - -static const WCHAR definePropertiesW[] = {'d','e','f','i','n','e','P','r','o','p','e','r','t','i','e','s',0}; - -static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b','j','e','c','t',']',0}; - -static const WCHAR configurableW[] = {'c','o','n','f','i','g','u','r','a','b','l','e',0}; -static const WCHAR enumerableW[] = {'e','n','u','m','e','r','a','b','l','e',0}; -static const WCHAR valueW[] = {'v','a','l','u','e',0}; -static const WCHAR writableW[] = {'w','r','i','t','a','b','l','e',0}; -static const WCHAR getW[] = {'g','e','t',0}; -static const WCHAR setW[] = {'s','e','t',0}; - static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -110,7 +84,7 @@ static HRESULT Object_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return E_FAIL; } - return jsdisp_call_name(jsthis->u.jsdisp, toStringW, DISPATCH_METHOD, 0, NULL, r); + return jsdisp_call_name(jsthis->u.jsdisp, L"toString", DISPATCH_METHOD, 0, NULL, r); } static HRESULT Object_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, @@ -230,7 +204,7 @@ static HRESULT Object_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) TRACE("\n"); - ret = jsstr_alloc(default_valueW); + ret = jsstr_alloc(L"[object Object]"); if(!ret) return E_OUTOFMEMORY; @@ -244,12 +218,12 @@ static void Object_destructor(jsdisp_t *dispex) } static const builtin_prop_t Object_props[] = { - {hasOwnPropertyW, Object_hasOwnProperty, PROPF_METHOD|1}, - {isPrototypeOfW, Object_isPrototypeOf, PROPF_METHOD|1}, - {propertyIsEnumerableW, Object_propertyIsEnumerable, PROPF_METHOD|1}, - {toLocaleStringW, Object_toLocaleString, PROPF_METHOD}, - {toStringW, Object_toString, PROPF_METHOD}, - {valueOfW, Object_valueOf, PROPF_METHOD} + {L"hasOwnProperty", Object_hasOwnProperty, PROPF_METHOD|1}, + {L"isPrototypeOf", Object_isPrototypeOf, PROPF_METHOD|1}, + {L"propertyIsEnumerable", Object_propertyIsEnumerable, PROPF_METHOD|1}, + {L"toLocaleString", Object_toLocaleString, PROPF_METHOD}, + {L"toString", Object_toString, PROPF_METHOD}, + {L"valueOf", Object_valueOf, PROPF_METHOD} }; static const builtin_info_t Object_info = { @@ -289,7 +263,7 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro memset(desc, 0, sizeof(*desc)); desc->value = jsval_undefined(); - hres = jsdisp_get_id(attr_obj, enumerableW, 0, &id); + hres = jsdisp_get_id(attr_obj, L"enumerable", 0, &id); if(SUCCEEDED(hres)) { desc->mask |= PROPF_ENUMERABLE; hres = jsdisp_propget(attr_obj, id, &v); @@ -305,7 +279,7 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } - hres = jsdisp_get_id(attr_obj, configurableW, 0, &id); + hres = jsdisp_get_id(attr_obj, L"configurable", 0, &id); if(SUCCEEDED(hres)) { desc->mask |= PROPF_CONFIGURABLE; hres = jsdisp_propget(attr_obj, id, &v); @@ -321,7 +295,7 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } - hres = jsdisp_get_id(attr_obj, valueW, 0, &id); + hres = jsdisp_get_id(attr_obj, L"value", 0, &id); if(SUCCEEDED(hres)) { hres = jsdisp_propget(attr_obj, id, &desc->value); if(FAILED(hres)) @@ -331,7 +305,7 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } - hres = jsdisp_get_id(attr_obj, writableW, 0, &id); + hres = jsdisp_get_id(attr_obj, L"writable", 0, &id); if(SUCCEEDED(hres)) { desc->mask |= PROPF_WRITABLE; hres = jsdisp_propget(attr_obj, id, &v); @@ -349,7 +323,7 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } - hres = jsdisp_get_id(attr_obj, getW, 0, &id); + hres = jsdisp_get_id(attr_obj, L"get", 0, &id); if(SUCCEEDED(hres)) { desc->explicit_getter = TRUE; hres = jsdisp_propget(attr_obj, id, &v); @@ -373,7 +347,7 @@ static HRESULT to_property_descriptor(script_ctx_t *ctx, jsdisp_t *attr_obj, pro return hres; } - hres = jsdisp_get_id(attr_obj, setW, 0, &id); + hres = jsdisp_get_id(attr_obj, L"set", 0, &id); if(SUCCEEDED(hres)) { desc->explicit_setter = TRUE; hres = jsdisp_propget(attr_obj, id, &v); @@ -561,22 +535,22 @@ static HRESULT Object_getOwnPropertyDescriptor(script_ctx_t *ctx, vdisp_t *jsthi return hres; if(prop_desc.explicit_getter || prop_desc.explicit_setter) { - hres = jsdisp_define_data_property(desc_obj, getW, PROPF_ALL, + hres = jsdisp_define_data_property(desc_obj, L"get", PROPF_ALL, prop_desc.getter ? jsval_obj(prop_desc.getter) : jsval_undefined()); if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(desc_obj, setW, PROPF_ALL, + hres = jsdisp_define_data_property(desc_obj, L"set", PROPF_ALL, prop_desc.setter ? jsval_obj(prop_desc.setter) : jsval_undefined()); }else { - hres = jsdisp_propput_name(desc_obj, valueW, prop_desc.value); + hres = jsdisp_propput_name(desc_obj, L"value", prop_desc.value); if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(desc_obj, writableW, PROPF_ALL, + hres = jsdisp_define_data_property(desc_obj, L"writable", PROPF_ALL, jsval_bool(!!(prop_desc.flags & PROPF_WRITABLE))); } if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(desc_obj, enumerableW, PROPF_ALL, + hres = jsdisp_define_data_property(desc_obj, L"enumerable", PROPF_ALL, jsval_bool(!!(prop_desc.flags & PROPF_ENUMERABLE))); if(SUCCEEDED(hres)) - hres = jsdisp_define_data_property(desc_obj, configurableW, PROPF_ALL, + hres = jsdisp_define_data_property(desc_obj, L"configurable", PROPF_ALL, jsval_bool(!!(prop_desc.flags & PROPF_CONFIGURABLE))); release_property_descriptor(&prop_desc); @@ -652,11 +626,11 @@ static HRESULT Object_getPrototypeOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl } static const builtin_prop_t ObjectConstr_props[] = { - {createW, Object_create, PROPF_ES5|PROPF_METHOD|2}, - {definePropertiesW, Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, - {definePropertyW, Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, - {getOwnPropertyDescriptorW, Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, - {getPrototypeOfW, Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1} + {L"create", Object_create, PROPF_ES5|PROPF_METHOD|2}, + {L"defineProperties", Object_defineProperties, PROPF_ES5|PROPF_METHOD|2}, + {L"defineProperty", Object_defineProperty, PROPF_ES5|PROPF_METHOD|2}, + {L"getOwnPropertyDescriptor", Object_getOwnPropertyDescriptor, PROPF_ES5|PROPF_METHOD|2}, + {L"getPrototypeOf", Object_getPrototypeOf, PROPF_ES5|PROPF_METHOD|1} }; static const builtin_info_t ObjectConstr_info = { @@ -717,9 +691,7 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags HRESULT create_object_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) { - static const WCHAR ObjectW[] = {'O','b','j','e','c','t',0}; - - return create_builtin_constructor(ctx, ObjectConstr_value, ObjectW, &ObjectConstr_info, PROPF_CONSTR, + return create_builtin_constructor(ctx, ObjectConstr_value, L"Object", &ObjectConstr_info, PROPF_CONSTR, object_prototype, ret); } -- 2.23.0

3 4

[PATCH 1/4] quartz/tests: Add a test for autoplugging from UYVY.
by Zebediah Figura 23 Mar '20

23 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 027b2080d7d..6f3a1d427ca 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4438,6 +4438,47 @@ static void test_window_threading(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +/* Hyperdevotion Noire needs to be able to Render() from UYVY. */ +static void test_autoplug_uyvy(void) +{ + static const VIDEOINFOHEADER source_format = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 600, + .bmiHeader.biHeight = 400, + .bmiHeader.biCompression = mmioFOURCC('U','Y','V','Y'), + .bmiHeader.biBitCount = 16, + }; + AM_MEDIA_TYPE source_type = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_UYVY, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(source_format), + .pbFormat = (BYTE *)&source_format, + }; + + IFilterGraph2 *graph = create_graph(); + struct testpin source_pin; + struct testfilter source; + HRESULT hr; + ULONG ref; + + testsource_init(&source_pin, &source_type, 1); + testfilter_init(&source, &source_pin, 1); + source_pin.request_mt = &source_type; + + IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, L"source"); + + hr = IFilterGraph2_Render(graph, &source_pin.IPin_iface); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref); + ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -4461,6 +4502,7 @@ START_TEST(filtergraph) test_default_sync_source(); test_add_source_filter(); test_window_threading(); + test_autoplug_uyvy(); CoUninitialize(); test_render_with_multithread(); -- 2.25.1

2 7

[PATCH] mf/tests: Add tests for _Load method of topology loader.
by Sergio Gómez Del Real 23 Mar '20

23 Mar '20

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/mf/tests/mf.c | 371 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 369 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ca825ac9a7..14038bf9dd 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1238,11 +1238,136 @@ static const IMFSampleGrabberSinkCallbackVtbl test_grabber_callback_vtbl = test_grabber_callback_OnShutdown, }; +static HRESULT WINAPI test_media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) +{ + if (IsEqualIID(riid, &IID_IMFMediaSource) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + } + else + { + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI test_media_source_AddRef(IMFMediaSource *iface) +{ + return 2; +} + +static ULONG WINAPI test_media_source_Release(IMFMediaSource *iface) +{ + return 1; +} + +static HRESULT WINAPI test_media_source_GetEvent(IMFMediaSource *iface, DWORD flags, IMFMediaEvent **event) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_BeginGetEvent(IMFMediaSource *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_EndGetEvent(IMFMediaSource *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_QueueEvent(IMFMediaSource *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_GetCharacteristics(IMFMediaSource *iface, DWORD *characteristics) +{ + return E_NOTIMPL; +} + +static IMFPresentationDescriptor *presdesc=NULL; +static HRESULT WINAPI test_media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) +{ + IMFStreamDescriptor *sd[2]; + IMFMediaType *mediatype; + HRESULT hr; + + if (presdesc == NULL) + { + if (FAILED(hr = MFCreateMediaType(&mediatype))) + return hr; + hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd[0]); + IMFMediaType_Release(mediatype); + + if (FAILED(hr = MFCreateMediaType(&mediatype))) + return hr; + hr = MFCreateStreamDescriptor(1, 1, &mediatype, &sd[1]); + IMFMediaType_Release(mediatype); + + if (FAILED(hr)) + return hr; + + hr = MFCreatePresentationDescriptor(2, sd, &presdesc); + IMFStreamDescriptor_Release(sd[0]); + IMFStreamDescriptor_Release(sd[1]); + } + *descriptor = presdesc; + + return S_OK; +} + +static HRESULT WINAPI test_media_source_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, + const GUID *time_format, const PROPVARIANT *start_position) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_Stop(IMFMediaSource *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_Pause(IMFMediaSource *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_media_source_Shutdown(IMFMediaSource *iface) +{ + return S_OK; +} + +static const IMFMediaSourceVtbl test_media_source_vtbl = +{ + test_media_source_QueryInterface, + test_media_source_AddRef, + test_media_source_Release, + test_media_source_GetEvent, + test_media_source_BeginGetEvent, + test_media_source_EndGetEvent, + test_media_source_QueueEvent, + test_media_source_GetCharacteristics, + test_media_source_CreatePresentationDescriptor, + test_media_source_Start, + test_media_source_Stop, + test_media_source_Pause, + test_media_source_Shutdown, +}; + static void test_topology_loader(void) { IMFSampleGrabberSinkCallback test_grabber_callback = { &test_grabber_callback_vtbl }; + IMFMediaSource test_media_source = { &test_media_source_vtbl }; IMFTopology *topology, *topology2, *full_topology; IMFTopologyNode *src_node, *sink_node; + IMFMediaTypeHandler *mth; IMFPresentationDescriptor *pd; IMFSourceResolver *resolver; IMFActivate *sink_activate; @@ -1257,6 +1382,7 @@ static void test_topology_loader(void) IMFAttributes *attr; IMFMediaSink *sink; WCHAR *filename; + WORD node_count; BOOL selected; HRESULT hr; GUID guid; @@ -1370,10 +1496,12 @@ todo_wine ok(count == 0, "Unexpected count %u.\n", count); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); -todo_wine ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); ok(full_topology != topology, "Unexpected instance.\n"); + IMFTopology_GetNodeCount(full_topology, &node_count); + ok(node_count == 2, "Topology node count is %#x.\n", node_count); + hr = IMFTopology_GetCount(topology, &count); ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); ok(count == 0, "Unexpected count %u.\n", count); @@ -1400,11 +1528,250 @@ todo_wine { IMFTopology_Release(topology2); IMFTopology_Release(full_topology); + IMFByteStream_Release(stream); + IMFStreamDescriptor_Release(sd); + IMFTopologyNode_Release(src_node); + + /* test with stream deselected */ + IMFPresentationDescriptor_GetStreamDescriptorCount(pd, &count); + ok(count == 1, "Unexpected stream descriptor count.\n"); + hr = IMFPresentationDescriptor_DeselectStream(pd, 0); + ok(hr == S_OK, "Failed to deselect stream, hr %#x.\n"); + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + hr = IMFTopology_GetNode(full_topology, 0, &src_node); + ok(hr == S_OK, "Failed to get full topology source node, hr %#x.\n", hr); + hr = IMFTopologyNode_GetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, &IID_IMFPresentationDescriptor, (void **)&pd); + ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); + IMFTopologyNode_Release(src_node); + IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + ok(!selected, "Stream should not be selected\n."); + + IMFTopology_Release(full_topology); + IMFActivate_ShutdownObject(sink_activate); + + /* test incompatible media types between source and sink */ + IMFTopology_RemoveNode(topology, sink_node); + hr = IMFTopology_GetNode(topology, 0, &src_node); + ok(hr == S_OK, "Failed to get topology source node, hr %#x.\n", hr); + + 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, 11025); + ok(hr == S_OK, "Failed to set sample rate, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Failed to get stream sink, hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &mth); + ok(hr == S_OK, "Failed to get media type handler, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(mth, 0, &media_type); + ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); + IMFMediaTypeHandler_Release(mth); + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &mth); + ok(hr == S_OK, "Failed to get media type handler, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(mth, media_type, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + IMFMediaType_Release(media_type); + IMFMediaTypeHandler_Release(mth); + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + hr = IMFTopology_AddNode(topology, sink_node); + ok(hr == S_OK, "Failed to add sink node, hr %#x.\n", hr); + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + hr = IMFTopology_GetNodeCount(full_topology, &node_count); + ok(hr == S_OK, "Failed to get node count, hr %#x.\n", hr); +todo_wine + ok(node_count == 3, "Unexpected node count.\n"); + + IMFTopology_Release(topology); + IMFTopology_Release(full_topology); IMFMediaSource_Release(source); IMFSourceResolver_Release(resolver); - IMFByteStream_Release(stream); + IMFStreamDescriptor_Release(sd); + IMFPresentationDescriptor_Release(pd); + IMFTopologyNode_Release(src_node); + IMFTopologyNode_Release(sink_node); + + /* test topology with 2 branches */ + hr = MFCreateTopology(&topology); + ok(hr == S_OK, "Failed to create topology, hr %#x.\n", hr); + + hr = IMFMediaSource_CreatePresentationDescriptor(&test_media_source, &pd); + ok(hr == S_OK, "Failed to create descriptor, hr %#x.\n", hr); + + hr = IMFPresentationDescriptor_GetStreamDescriptorCount(pd, &count); + ok(count == 2, "Descriptor count was %d\n", count); + + /* add first branch to topology */ + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 0, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &mth); + ok(hr == S_OK, "Failed to get media type handler, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(mth, 0, &media_type); + ok(hr == S_OK, "Failed to get 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_MP3); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 32000); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type, &MF_MT_AUDIO_NUM_CHANNELS, 2); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(mth, media_type); + ok(hr == S_OK, "Failed to set current media type, hr %#x.\n", hr); + IMFMediaType_Release(media_type); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)&test_media_source); + ok(hr == S_OK, "Failed to set node source, hr %#x.\n", hr); + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); + ok(hr == S_OK, "Failed to set node pd, hr %#x.\n", hr); + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, src_node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + 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 = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Failed to get stream sink, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); + ok(hr == S_OK, "Failed to create output node, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, sink_node); + ok(hr == S_OK, "Failed to add sink node, hr %#x.\n", hr); + + hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to resolve topology, hr %#x.\n", hr); + + IMFTopology_GetNodeCount(full_topology, &node_count); +todo_wine + ok(node_count == 3, "Unexpected node count. Expect 3, was %d.\n", node_count); + + IMFTopology_Release(full_topology); + IMFStreamDescriptor_Release(sd); + IMFTopologyNode_Release(src_node); + IMFTopologyNode_Release(sink_node); + + /* add second branch with disconnected nodes */ + hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(pd, 1, &selected, &sd); + ok(hr == S_OK, "Failed to get stream descriptor, hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &mth); + ok(hr == S_OK, "Failed to get media type handler, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(mth, 0, &media_type); + ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_H264); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &src_node); + ok(hr == S_OK, "Failed to create topology node, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, (IUnknown *)&test_media_source); + ok(hr == S_OK, "Failed to set node source, hr %#x.\n", hr); + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); + ok(hr == S_OK, "Failed to set node pd, hr %#x.\n", hr); + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + ok(hr == S_OK, "Failed to set node sd, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, src_node); + ok(hr == S_OK, "Failed to add a node, hr %#x.\n", hr); + + 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_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_YUY2); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateSampleGrabberSinkActivate(media_type, &test_grabber_callback, &sink_activate); + ok(hr == S_OK, "Failed to create grabber sink, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(sink_activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream_sink); + ok(hr == S_OK, "Failed to get stream sink, hr %#x.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &sink_node); + ok(hr == S_OK, "Failed to create output node, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetObject(sink_node, (IUnknown *)stream_sink); + ok(hr == S_OK, "Failed to set object, hr %#x.\n", hr); + + hr = IMFTopology_AddNode(topology, sink_node); + ok(hr == S_OK, "Failed to add sink node, hr %#x.\n", hr); + + /* topology is resolved with connected nodes; other are discarded */ + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to load full topology, hr %#x.\n", hr); + + IMFTopology_GetNodeCount(full_topology, &node_count); +todo_wine + ok(node_count == 3, "Unexpected node count. Expected 3, was %d.\n", node_count); + + hr = IMFTopology_Release(full_topology); + + hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + ok(hr == S_OK, "Failed to connect nodes, hr %#x.\n", hr); + + hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); + ok(hr == S_OK, "Failed to load full topology, hr %#x.\n", hr); + + IMFTopology_GetNodeCount(full_topology, &node_count); +todo_wine + ok(node_count == 6, "Unexpected node count. Expected 6, was %d.\n", node_count); + IMFTopoLoader_Release(loader); + IMFTopology_Release(full_topology); + IMFTopology_Release(topology); + IMFStreamDescriptor_Release(sd); + IMFTopologyNode_Release(src_node); + IMFTopologyNode_Release(sink_node); hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); -- 2.17.1

2 1

[PATCH v4] winevulkan: Create JSON manifest and registry entry used by official Vulkan loader.
by Brendan Shanks 23 Mar '20

23 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47109 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v4: Rebase on latest Vulkan 1.2.134 commits, and use the new VK_HEADER_VERSION_COMPLETE #define rather than adding our own. dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/make_vulkan | 3 ++ dlls/winevulkan/vulkan.c | 83 +++++++++++++++++++++++++++++++++ dlls/winevulkan/winevulkan.spec | 2 + loader/wine.inf.in | 1 + 5 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index e0bca6fad7..2ffff40c3a 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,6 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 advapi32 C_SRCS = \ vulkan.c \ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e0b94a06cb..bccfa6a6d6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2509,6 +2509,9 @@ class VkGenerator(object): else: f.write("@ stub {0}\n".format(func.name)) + f.write("@ stdcall -private DllRegisterServer()\n") + f.write("@ stdcall -private DllUnregisterServer()\n") + def generate_vulkan_loader_spec(self, f): self._generate_copyright(f, spec_file=True) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 59472bcef8..5c5cde3649 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winuser.h" #include "vulkan_private.h" @@ -1307,3 +1308,85 @@ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) { return vk_funcs->p_vkGetInstanceProcAddr(instance, name); } + + +static const WCHAR winevulkan_jsonW[] = {'\\','w','i','n','e','v','u','l','k','a','n','.','j','s','o','n',0}; +static const WCHAR vulkan_driversW[] = {'S','o','f','t','w','a','r','e','\\','K','h','r','o','n','o','s','\\', + 'V','u','l','k','a','n','\\','D','r','i','v','e','r','s',0}; +static BOOL writestr(HANDLE handle, const char *str) +{ + DWORD written; + return WriteFile(handle, str, strlen(str), &written, NULL); +} + +HRESULT WINAPI DllRegisterServer(void) +{ + WCHAR path[MAX_PATH]; + char vk_version[20]; + HANDLE file; + LRESULT result; + HKEY key; + DWORD zero = 0; + + /* Create the JSON manifest and registry key to register this ICD with the official Vulkan loader. */ + TRACE("\n"); + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, winevulkan_jsonW); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + { ERR("Unable to create JSON manifest.\n"); return E_UNEXPECTED; } + + snprintf(vk_version, sizeof(vk_version), "%u.%u.%u", + VK_VERSION_MAJOR(VK_HEADER_VERSION_COMPLETE), + VK_VERSION_MINOR(VK_HEADER_VERSION_COMPLETE), + VK_VERSION_PATCH(VK_HEADER_VERSION_COMPLETE)); + + writestr(file, "{\r\n"); + writestr(file, " \"file_format_version\": \"1.0.0\",\r\n"); + writestr(file, " \"ICD\": {\r\n"); + writestr(file, " \"library_path\": \"winevulkan.dll\",\r\n"); + writestr(file, " \"api_version\": \""); + writestr(file, vk_version); + writestr(file, "\"\r\n"); + writestr(file, " }\r\n"); + writestr(file, "}\r\n"); + CloseHandle(file); + + result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, + 0, NULL, 0, KEY_SET_VALUE, NULL, &key, NULL); + if (result != ERROR_SUCCESS) + { ERR("Unable to create registry key.\n"); return E_UNEXPECTED; } + + result = RegSetValueExW(key, path, 0, REG_DWORD, (const BYTE *)&zero, sizeof(zero)); + if (result != ERROR_SUCCESS) + { ERR("Unable to set registry value.\n"); return E_UNEXPECTED; } + + RegCloseKey(key); + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + WCHAR path[MAX_PATH]; + LRESULT result; + HKEY key; + + /* Remove the JSON manifest and registry key */ + TRACE("\n"); + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, winevulkan_jsonW); + if (!DeleteFileW(path)) + ERR("Unable to delete JSON file.\n"); + + result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, + 0, KEY_SET_VALUE, &key); + if (result != ERROR_SUCCESS) + { ERR("Unable to open registry key.\n"); return E_UNEXPECTED; } + + result = RegDeleteValueW(key, path); + if (result != ERROR_SUCCESS) + ERR("Unable to delete registry key.\n"); + + RegCloseKey(key); + return S_OK; +} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index c02af5aeaa..e024a43586 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -239,3 +239,5 @@ @ stdcall -private wine_vkUpdateDescriptorSets(ptr long ptr long ptr) @ stdcall -private wine_vkWaitForFences(ptr long ptr long int64) @ stdcall -private wine_vkWaitSemaphores(ptr ptr int64) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6e0cb21253..d0b156eb77 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2569,6 +2569,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 +11,,winevulkan.dll,1 11,,wintrust.dll,1 11,,iexplore.exe,1 -- 2.24.1

2 1

[PATCH] xaudio2_7: Trace FAudio version being used
by Alistair Leslie-Hughes 23 Mar '20

23 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure.ac | 3 ++- dlls/xaudio2_7/xaudio_dll.c | 3 +++ include/config.h.in | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3222f21732..fc4fd64d55 100644 --- a/configure.ac +++ b/configure.ac @@ -1756,7 +1756,8 @@ then [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \ - F3DAudioInitialize8], [$FAUDIO_LIBS]) + F3DAudioInitialize8 \ + FAudioLinkedVersion], [$FAUDIO_LIBS]) ]) fi WINE_NOTICE_WITH(faudio,[test "x$ac_cv_lib_soname_FAudio" = "x"], diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index fa0361182c..e8b81b125a 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -90,6 +90,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); +#ifdef HAVE_FAUDIOLINKEDVERSION + TRACE("Using FAudio version %d\n", FAudioLinkedVersion() ); +#endif break; } return TRUE; diff --git a/include/config.h.in b/include/config.h.in index de434d6ed2..4fa805ef19 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -152,6 +152,9 @@ /* Define to 1 if you have the `fallocate' function. */ #undef HAVE_FALLOCATE +/* Define to 1 if you have the `FAudioLinkedVersion' function. */ +#undef HAVE_FAUDIOLINKEDVERSION + /* Define to 1 if you have the `FAudio_CommitOperationSet' function. */ #undef HAVE_FAUDIO_COMMITOPERATIONSET -- 2.25.1

2 1

[PATCH] mmdevapi: Report 100% volume in GetMasterVolumeLevelScalar stub
by Alex Henrie 23 Mar '20

23 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31890 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mmdevapi/audiovolume.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 24d210a1c8..9214980120 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -159,7 +159,8 @@ static HRESULT WINAPI AEV_GetMasterVolumeLevelScalar(IAudioEndpointVolumeEx *ifa if (!level) return E_POINTER; FIXME("stub\n"); - return E_NOTIMPL; + *level = 1.0; + return S_OK; } static HRESULT WINAPI AEV_SetChannelVolumeLevel(IAudioEndpointVolumeEx *iface, UINT chan, float leveldb, const GUID *ctx) -- 2.25.2

2 1

Installing Wine's 32 and 64 bit build dependencies
by Francois Gouget 23 Mar '20

23 Mar '20

So I added a script to the wt-daily suite[1] that automates installing Wine's 32 and 64 bit build dependencies[2]. https://raw.githubusercontent.com/fgouget/wt-daily/master/wt-install-dev This initial version supports Debian 9 & 10 and Ubuntu 18.04 & 19.10. I can add support for more Linux distributions if you send me patches :-) An important aspect is that the script works around the broken packages that don't support multiarch, which is usually the hard part of setting things up. So to install the build dependencies simply run: sudo ./wt-install-dev Or if you just want to see what it would do: ./wt-install-dev --dry-run You can also do it in separate steps, to first install the packages and then inspect what it would do to work around the broken ones: sudo ./wt-install-dev --packages ./wt-install-dev --workarounds --dry-run As usual you can get the usage with: ./wt-install-dev --help [1] https://github.com/fgouget/wt-daily [2] Yes this is similar to the Ansible script I published in 2018. But this is a basic shell script which I guess is going to be easier to use for most people. It also supports more and newer Linux distributions. https://www.winehq.org/pipermail/wine-devel/2018-July/128955.html -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Indifference will certainly be the downfall of mankind, but who cares?

1 0

[PATCH] kernelbase: Implement GEO_FRIENDLYNAME for GetGeoInfoW()
by Aaro Altonen 23 Mar '20

23 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48644 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/kernel32/tests/locale.c | 28 ++ dlls/kernelbase/locale.c | 609 ++++++++++++++++++----------------- 2 files changed, 336 insertions(+), 301 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4c1e1b4d73..9e845b5088 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5056,6 +5056,34 @@ static void test_GetGeoInfo(void) ok(!strcmp(buffA, "643"), "got %s\n", buffA); } + if ((LANGIDFROMLCID(GetSystemDefaultLCID()) != MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US)) || + (LANGIDFROMLCID(GetThreadLocale()) != MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US))) + { + skip("Non US-English locale\n"); + } + else + { + buffA[0] = 0; + ret = pGetGeoInfoA(203, GEO_FRIENDLYNAME, buffA, 20, 0); + ok(ret == 7, "got %d, expected 7\n", ret); + ok(!strcmp(buffA, "Russia"), "got %s, expected Russia\n", buffA); + + /* Kosovo does not have a friendly name (except on win10) */ + SetLastError(0xdeadbeef); + buffA[0] = 0; + ret = pGetGeoInfoA(9914689, GEO_FRIENDLYNAME, buffA, 20, 0); + ok(ret == 0 || broken(ret == 7) /* win10 */, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef) /* win10 */, + "got %x, expected 87\n", GetLastError()); + + /* Buffer too short, 342 is "South Georgia and the South Sandwich Islands" */ + SetLastError(0xdeadbeef); + buffA[0] = 0; + ret = pGetGeoInfoA(342, GEO_FRIENDLYNAME, buffA, 20, 0); + ok(ret == 0, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %x, expected 122\n", GetLastError()); + } + /* try invalid type value */ SetLastError(0xdeadbeef); ret = pGetGeoInfoA(203, GEO_ID + 1, NULL, 0, 0); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 623cb01280..f2855ad0b5 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -226,6 +226,7 @@ struct geoinfo GEOID id; WCHAR iso2W[3]; WCHAR iso3W[4]; + const WCHAR *friendly; GEOID parent; int uncode; enum locationkind kind; @@ -233,306 +234,306 @@ struct geoinfo static const struct geoinfo geoinfodata[] = { - { 2, L"AG", L"ATG", 10039880, 28 }, /* Antigua and Barbuda */ - { 3, L"AF", L"AFG", 47614, 4 }, /* Afghanistan */ - { 4, L"DZ", L"DZA", 42487, 12 }, /* Algeria */ - { 5, L"AZ", L"AZE", 47611, 31 }, /* Azerbaijan */ - { 6, L"AL", L"ALB", 47610, 8 }, /* Albania */ - { 7, L"AM", L"ARM", 47611, 51 }, /* Armenia */ - { 8, L"AD", L"AND", 47610, 20 }, /* Andorra */ - { 9, L"AO", L"AGO", 42484, 24 }, /* Angola */ - { 10, L"AS", L"ASM", 26286, 16 }, /* American Samoa */ - { 11, L"AR", L"ARG", 31396, 32 }, /* Argentina */ - { 12, L"AU", L"AUS", 10210825, 36 }, /* Australia */ - { 14, L"AT", L"AUT", 10210824, 40 }, /* Austria */ - { 17, L"BH", L"BHR", 47611, 48 }, /* Bahrain */ - { 18, L"BB", L"BRB", 10039880, 52 }, /* Barbados */ - { 19, L"BW", L"BWA", 10039883, 72 }, /* Botswana */ - { 20, L"BM", L"BMU", 23581, 60 }, /* Bermuda */ - { 21, L"BE", L"BEL", 10210824, 56 }, /* Belgium */ - { 22, L"BS", L"BHS", 10039880, 44 }, /* Bahamas, The */ - { 23, L"BD", L"BGD", 47614, 50 }, /* Bangladesh */ - { 24, L"BZ", L"BLZ", 27082, 84 }, /* Belize */ - { 25, L"BA", L"BIH", 47610, 70 }, /* Bosnia and Herzegovina */ - { 26, L"BO", L"BOL", 31396, 68 }, /* Bolivia */ - { 27, L"MM", L"MMR", 47599, 104 }, /* Myanmar */ - { 28, L"BJ", L"BEN", 42483, 204 }, /* Benin */ - { 29, L"BY", L"BLR", 47609, 112 }, /* Belarus */ - { 30, L"SB", L"SLB", 20900, 90 }, /* Solomon Islands */ - { 32, L"BR", L"BRA", 31396, 76 }, /* Brazil */ - { 34, L"BT", L"BTN", 47614, 64 }, /* Bhutan */ - { 35, L"BG", L"BGR", 47609, 100 }, /* Bulgaria */ - { 37, L"BN", L"BRN", 47599, 96 }, /* Brunei */ - { 38, L"BI", L"BDI", 47603, 108 }, /* Burundi */ - { 39, L"CA", L"CAN", 23581, 124 }, /* Canada */ - { 40, L"KH", L"KHM", 47599, 116 }, /* Cambodia */ - { 41, L"TD", L"TCD", 42484, 148 }, /* Chad */ - { 42, L"LK", L"LKA", 47614, 144 }, /* Sri Lanka */ - { 43, L"CG", L"COG", 42484, 178 }, /* Congo */ - { 44, L"CD", L"COD", 42484, 180 }, /* Congo (DRC) */ - { 45, L"CN", L"CHN", 47600, 156 }, /* China */ - { 46, L"CL", L"CHL", 31396, 152 }, /* Chile */ - { 49, L"CM", L"CMR", 42484, 120 }, /* Cameroon */ - { 50, L"KM", L"COM", 47603, 174 }, /* Comoros */ - { 51, L"CO", L"COL", 31396, 170 }, /* Colombia */ - { 54, L"CR", L"CRI", 27082, 188 }, /* Costa Rica */ - { 55, L"CF", L"CAF", 42484, 140 }, /* Central African Republic */ - { 56, L"CU", L"CUB", 10039880, 192 }, /* Cuba */ - { 57, L"CV", L"CPV", 42483, 132 }, /* Cape Verde */ - { 59, L"CY", L"CYP", 47611, 196 }, /* Cyprus */ - { 61, L"DK", L"DNK", 10039882, 208 }, /* Denmark */ - { 62, L"DJ", L"DJI", 47603, 262 }, /* Djibouti */ - { 63, L"DM", L"DMA", 10039880, 212 }, /* Dominica */ - { 65, L"DO", L"DOM", 10039880, 214 }, /* Dominican Republic */ - { 66, L"EC", L"ECU", 31396, 218 }, /* Ecuador */ - { 67, L"EG", L"EGY", 42487, 818 }, /* Egypt */ - { 68, L"IE", L"IRL", 10039882, 372 }, /* Ireland */ - { 69, L"GQ", L"GNQ", 42484, 226 }, /* Equatorial Guinea */ - { 70, L"EE", L"EST", 10039882, 233 }, /* Estonia */ - { 71, L"ER", L"ERI", 47603, 232 }, /* Eritrea */ - { 72, L"SV", L"SLV", 27082, 222 }, /* El Salvador */ - { 73, L"ET", L"ETH", 47603, 231 }, /* Ethiopia */ - { 75, L"CZ", L"CZE", 47609, 203 }, /* Czech Republic */ - { 77, L"FI", L"FIN", 10039882, 246 }, /* Finland */ - { 78, L"FJ", L"FJI", 20900, 242 }, /* Fiji Islands */ - { 80, L"FM", L"FSM", 21206, 583 }, /* Micronesia */ - { 81, L"FO", L"FRO", 10039882, 234 }, /* Faroe Islands */ - { 84, L"FR", L"FRA", 10210824, 250 }, /* France */ - { 86, L"GM", L"GMB", 42483, 270 }, /* Gambia, The */ - { 87, L"GA", L"GAB", 42484, 266 }, /* Gabon */ - { 88, L"GE", L"GEO", 47611, 268 }, /* Georgia */ - { 89, L"GH", L"GHA", 42483, 288 }, /* Ghana */ - { 90, L"GI", L"GIB", 47610, 292 }, /* Gibraltar */ - { 91, L"GD", L"GRD", 10039880, 308 }, /* Grenada */ - { 93, L"GL", L"GRL", 23581, 304 }, /* Greenland */ - { 94, L"DE", L"DEU", 10210824, 276 }, /* Germany */ - { 98, L"GR", L"GRC", 47610, 300 }, /* Greece */ - { 99, L"GT", L"GTM", 27082, 320 }, /* Guatemala */ - { 100, L"GN", L"GIN", 42483, 324 }, /* Guinea */ - { 101, L"GY", L"GUY", 31396, 328 }, /* Guyana */ - { 103, L"HT", L"HTI", 10039880, 332 }, /* Haiti */ - { 104, L"HK", L"HKG", 47600, 344 }, /* Hong Kong S.A.R. */ - { 106, L"HN", L"HND", 27082, 340 }, /* Honduras */ - { 108, L"HR", L"HRV", 47610, 191 }, /* Croatia */ - { 109, L"HU", L"HUN", 47609, 348 }, /* Hungary */ - { 110, L"IS", L"ISL", 10039882, 352 }, /* Iceland */ - { 111, L"ID", L"IDN", 47599, 360 }, /* Indonesia */ - { 113, L"IN", L"IND", 47614, 356 }, /* India */ - { 114, L"IO", L"IOT", 39070, 86 }, /* British Indian Ocean Territory */ - { 116, L"IR", L"IRN", 47614, 364 }, /* Iran */ - { 117, L"IL", L"ISR", 47611, 376 }, /* Israel */ - { 118, L"IT", L"ITA", 47610, 380 }, /* Italy */ - { 119, L"CI", L"CIV", 42483, 384 }, /* Côte d'Ivoire */ - { 121, L"IQ", L"IRQ", 47611, 368 }, /* Iraq */ - { 122, L"JP", L"JPN", 47600, 392 }, /* Japan */ - { 124, L"JM", L"JAM", 10039880, 388 }, /* Jamaica */ - { 125, L"SJ", L"SJM", 10039882, 744 }, /* Jan Mayen */ - { 126, L"JO", L"JOR", 47611, 400 }, /* Jordan */ - { 127, L"XX", L"XX", 161832256 }, /* Johnston Atoll */ - { 129, L"KE", L"KEN", 47603, 404 }, /* Kenya */ - { 130, L"KG", L"KGZ", 47590, 417 }, /* Kyrgyzstan */ - { 131, L"KP", L"PRK", 47600, 408 }, /* North Korea */ - { 133, L"KI", L"KIR", 21206, 296 }, /* Kiribati */ - { 134, L"KR", L"KOR", 47600, 410 }, /* Korea */ - { 136, L"KW", L"KWT", 47611, 414 }, /* Kuwait */ - { 137, L"KZ", L"KAZ", 47590, 398 }, /* Kazakhstan */ - { 138, L"LA", L"LAO", 47599, 418 }, /* Laos */ - { 139, L"LB", L"LBN", 47611, 422 }, /* Lebanon */ - { 140, L"LV", L"LVA", 10039882, 428 }, /* Latvia */ - { 141, L"LT", L"LTU", 10039882, 440 }, /* Lithuania */ - { 142, L"LR", L"LBR", 42483, 430 }, /* Liberia */ - { 143, L"SK", L"SVK", 47609, 703 }, /* Slovakia */ - { 145, L"LI", L"LIE", 10210824, 438 }, /* Liechtenstein */ - { 146, L"LS", L"LSO", 10039883, 426 }, /* Lesotho */ - { 147, L"LU", L"LUX", 10210824, 442 }, /* Luxembourg */ - { 148, L"LY", L"LBY", 42487, 434 }, /* Libya */ - { 149, L"MG", L"MDG", 47603, 450 }, /* Madagascar */ - { 151, L"MO", L"MAC", 47600, 446 }, /* Macao S.A.R. */ - { 152, L"MD", L"MDA", 47609, 498 }, /* Moldova */ - { 154, L"MN", L"MNG", 47600, 496 }, /* Mongolia */ - { 156, L"MW", L"MWI", 47603, 454 }, /* Malawi */ - { 157, L"ML", L"MLI", 42483, 466 }, /* Mali */ - { 158, L"MC", L"MCO", 10210824, 492 }, /* Monaco */ - { 159, L"MA", L"MAR", 42487, 504 }, /* Morocco */ - { 160, L"MU", L"MUS", 47603, 480 }, /* Mauritius */ - { 162, L"MR", L"MRT", 42483, 478 }, /* Mauritania */ - { 163, L"MT", L"MLT", 47610, 470 }, /* Malta */ - { 164, L"OM", L"OMN", 47611, 512 }, /* Oman */ - { 165, L"MV", L"MDV", 47614, 462 }, /* Maldives */ - { 166, L"MX", L"MEX", 27082, 484 }, /* Mexico */ - { 167, L"MY", L"MYS", 47599, 458 }, /* Malaysia */ - { 168, L"MZ", L"MOZ", 47603, 508 }, /* Mozambique */ - { 173, L"NE", L"NER", 42483, 562 }, /* Niger */ - { 174, L"VU", L"VUT", 20900, 548 }, /* Vanuatu */ - { 175, L"NG", L"NGA", 42483, 566 }, /* Nigeria */ - { 176, L"NL", L"NLD", 10210824, 528 }, /* Netherlands */ - { 177, L"NO", L"NOR", 10039882, 578 }, /* Norway */ - { 178, L"NP", L"NPL", 47614, 524 }, /* Nepal */ - { 180, L"NR", L"NRU", 21206, 520 }, /* Nauru */ - { 181, L"SR", L"SUR", 31396, 740 }, /* Suriname */ - { 182, L"NI", L"NIC", 27082, 558 }, /* Nicaragua */ - { 183, L"NZ", L"NZL", 10210825, 554 }, /* New Zealand */ - { 184, L"PS", L"PSE", 47611, 275 }, /* Palestinian Authority */ - { 185, L"PY", L"PRY", 31396, 600 }, /* Paraguay */ - { 187, L"PE", L"PER", 31396, 604 }, /* Peru */ - { 190, L"PK", L"PAK", 47614, 586 }, /* Pakistan */ - { 191, L"PL", L"POL", 47609, 616 }, /* Poland */ - { 192, L"PA", L"PAN", 27082, 591 }, /* Panama */ - { 193, L"PT", L"PRT", 47610, 620 }, /* Portugal */ - { 194, L"PG", L"PNG", 20900, 598 }, /* Papua New Guinea */ - { 195, L"PW", L"PLW", 21206, 585 }, /* Palau */ - { 196, L"GW", L"GNB", 42483, 624 }, /* Guinea-Bissau */ - { 197, L"QA", L"QAT", 47611, 634 }, /* Qatar */ - { 198, L"RE", L"REU", 47603, 638 }, /* Reunion */ - { 199, L"MH", L"MHL", 21206, 584 }, /* Marshall Islands */ - { 200, L"RO", L"ROU", 47609, 642 }, /* Romania */ - { 201, L"PH", L"PHL", 47599, 608 }, /* Philippines */ - { 202, L"PR", L"PRI", 10039880, 630 }, /* Puerto Rico */ - { 203, L"RU", L"RUS", 47609, 643 }, /* Russia */ - { 204, L"RW", L"RWA", 47603, 646 }, /* Rwanda */ - { 205, L"SA", L"SAU", 47611, 682 }, /* Saudi Arabia */ - { 206, L"PM", L"SPM", 23581, 666 }, /* St. Pierre and Miquelon */ - { 207, L"KN", L"KNA", 10039880, 659 }, /* St. Kitts and Nevis */ - { 208, L"SC", L"SYC", 47603, 690 }, /* Seychelles */ - { 209, L"ZA", L"ZAF", 10039883, 710 }, /* South Africa */ - { 210, L"SN", L"SEN", 42483, 686 }, /* Senegal */ - { 212, L"SI", L"SVN", 47610, 705 }, /* Slovenia */ - { 213, L"SL", L"SLE", 42483, 694 }, /* Sierra Leone */ - { 214, L"SM", L"SMR", 47610, 674 }, /* San Marino */ - { 215, L"SG", L"SGP", 47599, 702 }, /* Singapore */ - { 216, L"SO", L"SOM", 47603, 706 }, /* Somalia */ - { 217, L"ES", L"ESP", 47610, 724 }, /* Spain */ - { 218, L"LC", L"LCA", 10039880, 662 }, /* St. Lucia */ - { 219, L"SD", L"SDN", 42487, 736 }, /* Sudan */ - { 220, L"SJ", L"SJM", 10039882, 744 }, /* Svalbard */ - { 221, L"SE", L"SWE", 10039882, 752 }, /* Sweden */ - { 222, L"SY", L"SYR", 47611, 760 }, /* Syria */ - { 223, L"CH", L"CHE", 10210824, 756 }, /* Switzerland */ - { 224, L"AE", L"ARE", 47611, 784 }, /* United Arab Emirates */ - { 225, L"TT", L"TTO", 10039880, 780 }, /* Trinidad and Tobago */ - { 227, L"TH", L"THA", 47599, 764 }, /* Thailand */ - { 228, L"TJ", L"TJK", 47590, 762 }, /* Tajikistan */ - { 231, L"TO", L"TON", 26286, 776 }, /* Tonga */ - { 232, L"TG", L"TGO", 42483, 768 }, /* Togo */ - { 233, L"ST", L"STP", 42484, 678 }, /* São Tomé and Príncipe */ - { 234, L"TN", L"TUN", 42487, 788 }, /* Tunisia */ - { 235, L"TR", L"TUR", 47611, 792 }, /* Turkey */ - { 236, L"TV", L"TUV", 26286, 798 }, /* Tuvalu */ - { 237, L"TW", L"TWN", 47600, 158 }, /* Taiwan */ - { 238, L"TM", L"TKM", 47590, 795 }, /* Turkmenistan */ - { 239, L"TZ", L"TZA", 47603, 834 }, /* Tanzania */ - { 240, L"UG", L"UGA", 47603, 800 }, /* Uganda */ - { 241, L"UA", L"UKR", 47609, 804 }, /* Ukraine */ - { 242, L"GB", L"GBR", 10039882, 826 }, /* United Kingdom */ - { 244, L"US", L"USA", 23581, 840 }, /* United States */ - { 245, L"BF", L"BFA", 42483, 854 }, /* Burkina Faso */ - { 246, L"UY", L"URY", 31396, 858 }, /* Uruguay */ - { 247, L"UZ", L"UZB", 47590, 860 }, /* Uzbekistan */ - { 248, L"VC", L"VCT", 10039880, 670 }, /* St. Vincent and the Grenadines */ - { 249, L"VE", L"VEN", 31396, 862 }, /* Bolivarian Republic of Venezuela */ - { 251, L"VN", L"VNM", 47599, 704 }, /* Vietnam */ - { 252, L"VI", L"VIR", 10039880, 850 }, /* Virgin Islands */ - { 253, L"VA", L"VAT", 47610, 336 }, /* Vatican City */ - { 254, L"NA", L"NAM", 10039883, 516 }, /* Namibia */ - { 257, L"EH", L"ESH", 42487, 732 }, /* Western Sahara (disputed) */ - { 258, L"XX", L"XX", 161832256 }, /* Wake Island */ - { 259, L"WS", L"WSM", 26286, 882 }, /* Samoa */ - { 260, L"SZ", L"SWZ", 10039883, 748 }, /* Swaziland */ - { 261, L"YE", L"YEM", 47611, 887 }, /* Yemen */ - { 263, L"ZM", L"ZMB", 47603, 894 }, /* Zambia */ - { 264, L"ZW", L"ZWE", 47603, 716 }, /* Zimbabwe */ - { 269, L"CS", L"SCG", 47610, 891 }, /* Serbia and Montenegro (Former) */ - { 270, L"ME", L"MNE", 47610, 499 }, /* Montenegro */ - { 271, L"RS", L"SRB", 47610, 688 }, /* Serbia */ - { 273, L"CW", L"CUW", 10039880, 531 }, /* Curaçao */ - { 276, L"SS", L"SSD", 42487, 728 }, /* South Sudan */ - { 300, L"AI", L"AIA", 10039880, 660 }, /* Anguilla */ - { 301, L"AQ", L"ATA", 39070, 10 }, /* Antarctica */ - { 302, L"AW", L"ABW", 10039880, 533 }, /* Aruba */ - { 303, L"XX", L"XX", 343 }, /* Ascension Island */ - { 304, L"XX", L"XX", 10210825 }, /* Ashmore and Cartier Islands */ - { 305, L"XX", L"XX", 161832256 }, /* Baker Island */ - { 306, L"BV", L"BVT", 39070, 74 }, /* Bouvet Island */ - { 307, L"KY", L"CYM", 10039880, 136 }, /* Cayman Islands */ - { 308, L"XX", L"XX", 10210824, 830, LOCATION_BOTH }, /* Channel Islands */ - { 309, L"CX", L"CXR", 12, 162 }, /* Christmas Island */ - { 310, L"XX", L"XX", 27114 }, /* Clipperton Island */ - { 311, L"CC", L"CCK", 10210825, 166 }, /* Cocos (Keeling) Islands */ - { 312, L"CK", L"COK", 26286, 184 }, /* Cook Islands */ - { 313, L"XX", L"XX", 10210825 }, /* Coral Sea Islands */ - { 314, L"XX", L"XX", 114 }, /* Diego Garcia */ - { 315, L"FK", L"FLK", 31396, 238 }, /* Falkland Islands (Islas Malvinas) */ - { 317, L"GF", L"GUF", 31396, 254 }, /* French Guiana */ - { 318, L"PF", L"PYF", 26286, 258 }, /* French Polynesia */ - { 319, L"TF", L"ATF", 39070, 260 }, /* French Southern and Antarctic Lands */ - { 321, L"GP", L"GLP", 10039880, 312 }, /* Guadeloupe */ - { 322, L"GU", L"GUM", 21206, 316 }, /* Guam */ - { 323, L"XX", L"XX", 39070 }, /* Guantanamo Bay */ - { 324, L"GG", L"GGY", 308, 831 }, /* Guernsey */ - { 325, L"HM", L"HMD", 39070, 334 }, /* Heard Island and McDonald Islands */ - { 326, L"XX", L"XX", 161832256 }, /* Howland Island */ - { 327, L"XX", L"XX", 161832256 }, /* Jarvis Island */ - { 328, L"JE", L"JEY", 308, 832 }, /* Jersey */ - { 329, L"XX", L"XX", 161832256 }, /* Kingman Reef */ - { 330, L"MQ", L"MTQ", 10039880, 474 }, /* Martinique */ - { 331, L"YT", L"MYT", 47603, 175 }, /* Mayotte */ - { 332, L"MS", L"MSR", 10039880, 500 }, /* Montserrat */ - { 333, L"AN", L"ANT", 10039880, 530, LOCATION_BOTH }, /* Netherlands Antilles (Former) */ - { 334, L"NC", L"NCL", 20900, 540 }, /* New Caledonia */ - { 335, L"NU", L"NIU", 26286, 570 }, /* Niue */ - { 336, L"NF", L"NFK", 10210825, 574 }, /* Norfolk Island */ - { 337, L"MP", L"MNP", 21206, 580 }, /* Northern Mariana Islands */ - { 338, L"XX", L"XX", 161832256 }, /* Palmyra Atoll */ - { 339, L"PN", L"PCN", 26286, 612 }, /* Pitcairn Islands */ - { 340, L"XX", L"XX", 337 }, /* Rota Island */ - { 341, L"XX", L"XX", 337 }, /* Saipan */ - { 342, L"GS", L"SGS", 39070, 239 }, /* South Georgia and the South Sandwich Islands */ - { 343, L"SH", L"SHN", 42483, 654 }, /* St. Helena */ - { 346, L"XX", L"XX", 337 }, /* Tinian Island */ - { 347, L"TK", L"TKL", 26286, 772 }, /* Tokelau */ - { 348, L"XX", L"XX", 343 }, /* Tristan da Cunha */ - { 349, L"TC", L"TCA", 10039880, 796 }, /* Turks and Caicos Islands */ - { 351, L"VG", L"VGB", 10039880, 92 }, /* Virgin Islands, British */ - { 352, L"WF", L"WLF", 26286, 876 }, /* Wallis and Futuna */ - { 742, L"XX", L"XX", 39070, 2, LOCATION_REGION }, /* Africa */ - { 2129, L"XX", L"XX", 39070, 142, LOCATION_REGION }, /* Asia */ - { 10541, L"XX", L"XX", 39070, 150, LOCATION_REGION }, /* Europe */ - { 15126, L"IM", L"IMN", 10039882, 833 }, /* Man, Isle of */ - { 19618, L"MK", L"MKD", 47610, 807 }, /* Macedonia, Former Yugoslav Republic of */ - { 20900, L"XX", L"XX", 27114, 54, LOCATION_REGION }, /* Melanesia */ - { 21206, L"XX", L"XX", 27114, 57, LOCATION_REGION }, /* Micronesia */ - { 21242, L"XX", L"XX", 161832256 }, /* Midway Islands */ - { 23581, L"XX", L"XX", 10026358, 21, LOCATION_REGION }, /* Northern America */ - { 26286, L"XX", L"XX", 27114, 61, LOCATION_REGION }, /* Polynesia */ - { 27082, L"XX", L"XX", 161832257, 13, LOCATION_REGION }, /* Central America */ - { 27114, L"XX", L"XX", 39070, 9, LOCATION_REGION }, /* Oceania */ - { 30967, L"SX", L"SXM", 10039880, 534 }, /* Sint Maarten (Dutch part) */ - { 31396, L"XX", L"XX", 161832257, 5, LOCATION_REGION }, /* South America */ - { 31706, L"MF", L"MAF", 10039880, 663 }, /* Saint Martin (French part) */ - { 39070, L"XX", L"XX", 39070, 1, LOCATION_REGION }, /* World */ - { 42483, L"XX", L"XX", 742, 11, LOCATION_REGION }, /* Western Africa */ - { 42484, L"XX", L"XX", 742, 17, LOCATION_REGION }, /* Middle Africa */ - { 42487, L"XX", L"XX", 742, 15, LOCATION_REGION }, /* Northern Africa */ - { 47590, L"XX", L"XX", 2129, 143, LOCATION_REGION }, /* Central Asia */ - { 47599, L"XX", L"XX", 2129, 35, LOCATION_REGION }, /* South-Eastern Asia */ - { 47600, L"XX", L"XX", 2129, 30, LOCATION_REGION }, /* Eastern Asia */ - { 47603, L"XX", L"XX", 742, 14, LOCATION_REGION }, /* Eastern Africa */ - { 47609, L"XX", L"XX", 10541, 151, LOCATION_REGION }, /* Eastern Europe */ - { 47610, L"XX", L"XX", 10541, 39, LOCATION_REGION }, /* Southern Europe */ - { 47611, L"XX", L"XX", 2129, 145, LOCATION_REGION }, /* Middle East */ - { 47614, L"XX", L"XX", 2129, 34, LOCATION_REGION }, /* Southern Asia */ - { 7299303, L"TL", L"TLS", 47599, 626 }, /* Democratic Republic of Timor-Leste */ - { 9914689, L"XK", L"XKS", 47610, 906 }, /* Kosovo */ - { 10026358, L"XX", L"XX", 39070, 19, LOCATION_REGION }, /* Americas */ - { 10028789, L"AX", L"ALA", 10039882, 248 }, /* Åland Islands */ - { 10039880, L"XX", L"XX", 161832257, 29, LOCATION_REGION }, /* Caribbean */ - { 10039882, L"XX", L"XX", 10541, 154, LOCATION_REGION }, /* Northern Europe */ - { 10039883, L"XX", L"XX", 742, 18, LOCATION_REGION }, /* Southern Africa */ - { 10210824, L"XX", L"XX", 10541, 155, LOCATION_REGION }, /* Western Europe */ - { 10210825, L"XX", L"XX", 27114, 53, LOCATION_REGION }, /* Australia and New Zealand */ - { 161832015, L"BL", L"BLM", 10039880, 652 }, /* Saint Barthélemy */ - { 161832256, L"UM", L"UMI", 27114, 581 }, /* U.S. Minor Outlying Islands */ - { 161832257, L"XX", L"XX", 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 2, L"AG", L"ATG", L"Antigua and Barbuda", 10039880, 28 }, + { 3, L"AF", L"AFG", L"Afghanistan", 47614, 4 }, + { 4, L"DZ", L"DZA", L"Algeria", 42487, 12 }, + { 5, L"AZ", L"AZE", L"Azerbaijan", 47611, 31 }, + { 6, L"AL", L"ALB", L"Albania", 47610, 8 }, + { 7, L"AM", L"ARM", L"Armenia", 47611, 51 }, + { 8, L"AD", L"AND", L"Andorra", 47610, 20 }, + { 9, L"AO", L"AGO", L"Angola", 42484, 24 }, + { 10, L"AS", L"ASM", L"American Samoa", 26286, 16 }, + { 11, L"AR", L"ARG", L"Argentina", 31396, 32 }, + { 12, L"AU", L"AUS", L"Australia", 10210825, 36 }, + { 14, L"AT", L"AUT", L"Austria", 10210824, 40 }, + { 17, L"BH", L"BHR", L"Bahrain", 47611, 48 }, + { 18, L"BB", L"BRB", L"Barbados", 10039880, 52 }, + { 19, L"BW", L"BWA", L"Botswana", 10039883, 72 }, + { 20, L"BM", L"BMU", L"Bermuda", 23581, 60 }, + { 21, L"BE", L"BEL", L"Belgium", 10210824, 56 }, + { 22, L"BS", L"BHS", L"Bahamas, The", 10039880, 44 }, + { 23, L"BD", L"BGD", L"Bangladesh", 47614, 50 }, + { 24, L"BZ", L"BLZ", L"Belize", 27082, 84 }, + { 25, L"BA", L"BIH", L"Bosnia and Herzegovina", 47610, 70 }, + { 26, L"BO", L"BOL", L"Bolivia", 31396, 68 }, + { 27, L"MM", L"MMR", L"Myanmar", 47599, 104 }, + { 28, L"BJ", L"BEN", L"Benin", 42483, 204 }, + { 29, L"BY", L"BLR", L"Belarus", 47609, 112 }, + { 30, L"SB", L"SLB", L"Solomon Islands", 20900, 90 }, + { 32, L"BR", L"BRA", L"Brazil", 31396, 76 }, + { 34, L"BT", L"BTN", L"Bhutan", 47614, 64 }, + { 35, L"BG", L"BGR", L"Bulgaria", 47609, 100 }, + { 37, L"BN", L"BRN", L"Brunei", 47599, 96 }, + { 38, L"BI", L"BDI", L"Burundi", 47603, 108 }, + { 39, L"CA", L"CAN", L"Canada", 23581, 124 }, + { 40, L"KH", L"KHM", L"Cambodia", 47599, 116 }, + { 41, L"TD", L"TCD", L"Chad", 42484, 148 }, + { 42, L"LK", L"LKA", L"Sri Lanka", 47614, 144 }, + { 43, L"CG", L"COG", L"Congo", 42484, 178 }, + { 44, L"CD", L"COD", L"Congo (DRC)", 42484, 180 }, + { 45, L"CN", L"CHN", L"China", 47600, 156 }, + { 46, L"CL", L"CHL", L"Chile", 31396, 152 }, + { 49, L"CM", L"CMR", L"Cameroon", 42484, 120 }, + { 50, L"KM", L"COM", L"Comoros", 47603, 174 }, + { 51, L"CO", L"COL", L"Colombia", 31396, 170 }, + { 54, L"CR", L"CRI", L"Costa Rica", 27082, 188 }, + { 55, L"CF", L"CAF", L"Central African Republic", 42484, 140 }, + { 56, L"CU", L"CUB", L"Cuba", 10039880, 192 }, + { 57, L"CV", L"CPV", L"Cape Verde", 42483, 132 }, + { 59, L"CY", L"CYP", L"Cyprus", 47611, 196 }, + { 61, L"DK", L"DNK", L"Denmark", 10039882, 208 }, + { 62, L"DJ", L"DJI", L"Djibouti", 47603, 262 }, + { 63, L"DM", L"DMA", L"Dominica", 10039880, 212 }, + { 65, L"DO", L"DOM", L"Dominican Republic", 10039880, 214 }, + { 66, L"EC", L"ECU", L"Ecuador", 31396, 218 }, + { 67, L"EG", L"EGY", L"Egypt", 42487, 818 }, + { 68, L"IE", L"IRL", L"Ireland", 10039882, 372 }, + { 69, L"GQ", L"GNQ", L"Equatorial Guinea", 42484, 226 }, + { 70, L"EE", L"EST", L"Estonia", 10039882, 233 }, + { 71, L"ER", L"ERI", L"Eritrea", 47603, 232 }, + { 72, L"SV", L"SLV", L"El Salvador", 27082, 222 }, + { 73, L"ET", L"ETH", L"Ethiopia", 47603, 231 }, + { 75, L"CZ", L"CZE", L"Czech Republic", 47609, 203 }, + { 77, L"FI", L"FIN", L"Finland", 10039882, 246 }, + { 78, L"FJ", L"FJI", L"Fiji Islands", 20900, 242 }, + { 80, L"FM", L"FSM", L"Micronesia", 21206, 583 }, + { 81, L"FO", L"FRO", L"Faroe Islands", 10039882, 234 }, + { 84, L"FR", L"FRA", L"France", 10210824, 250 }, + { 86, L"GM", L"GMB", L"Gambia, The", 42483, 270 }, + { 87, L"GA", L"GAB", L"Gabon", 42484, 266 }, + { 88, L"GE", L"GEO", L"Georgia", 47611, 268 }, + { 89, L"GH", L"GHA", L"Ghana", 42483, 288 }, + { 90, L"GI", L"GIB", L"Gibraltar", 47610, 292 }, + { 91, L"GD", L"GRD", L"Grenada", 10039880, 308 }, + { 93, L"GL", L"GRL", L"Greenland", 23581, 304 }, + { 94, L"DE", L"DEU", L"Germany", 10210824, 276 }, + { 98, L"GR", L"GRC", L"Greece", 47610, 300 }, + { 99, L"GT", L"GTM", L"Guatemala", 27082, 320 }, + { 100, L"GN", L"GIN", L"Guinea", 42483, 324 }, + { 101, L"GY", L"GUY", L"Guyana", 31396, 328 }, + { 103, L"HT", L"HTI", L"Haiti", 10039880, 332 }, + { 104, L"HK", L"HKG", L"Hong Kong S.A.R.", 47600, 344 }, + { 106, L"HN", L"HND", L"Honduras", 27082, 340 }, + { 108, L"HR", L"HRV", L"Croatia", 47610, 191 }, + { 109, L"HU", L"HUN", L"Hungary", 47609, 348 }, + { 110, L"IS", L"ISL", L"Iceland", 10039882, 352 }, + { 111, L"ID", L"IDN", L"Indonesia", 47599, 360 }, + { 113, L"IN", L"IND", L"India", 47614, 356 }, + { 114, L"IO", L"IOT", L"British Indian Ocean Territory", 39070, 86 }, + { 116, L"IR", L"IRN", L"Iran", 47614, 364 }, + { 117, L"IL", L"ISR", L"Israel", 47611, 376 }, + { 118, L"IT", L"ITA", L"Italy", 47610, 380 }, + { 119, L"CI", L"CIV", L"Côte d'Ivoire", 42483, 384 }, + { 121, L"IQ", L"IRQ", L"Iraq", 47611, 368 }, + { 122, L"JP", L"JPN", L"Japan", 47600, 392 }, + { 124, L"JM", L"JAM", L"Jamaica", 10039880, 388 }, + { 125, L"SJ", L"SJM", L"Jan Mayen", 10039882, 744 }, + { 126, L"JO", L"JOR", L"Jordan", 47611, 400 }, + { 127, L"XX", L"XX", L"Johnston Atoll", 161832256 }, + { 129, L"KE", L"KEN", L"Kenya", 47603, 404 }, + { 130, L"KG", L"KGZ", L"Kyrgyzstan", 47590, 417 }, + { 131, L"KP", L"PRK", L"North Korea", 47600, 408 }, + { 133, L"KI", L"KIR", L"Kiribati", 21206, 296 }, + { 134, L"KR", L"KOR", L"Korea", 47600, 410 }, + { 136, L"KW", L"KWT", L"Kuwait", 47611, 414 }, + { 137, L"KZ", L"KAZ", L"Kazakhstan", 47590, 398 }, + { 138, L"LA", L"LAO", L"Laos", 47599, 418 }, + { 139, L"LB", L"LBN", L"Lebanon", 47611, 422 }, + { 140, L"LV", L"LVA", L"Latvia", 10039882, 428 }, + { 141, L"LT", L"LTU", L"Lithuania", 10039882, 440 }, + { 142, L"LR", L"LBR", L"Liberia", 42483, 430 }, + { 143, L"SK", L"SVK", L"Slovakia", 47609, 703 }, + { 145, L"LI", L"LIE", L"Liechtenstein", 10210824, 438 }, + { 146, L"LS", L"LSO", L"Lesotho", 10039883, 426 }, + { 147, L"LU", L"LUX", L"Luxembourg", 10210824, 442 }, + { 148, L"LY", L"LBY", L"Libya", 42487, 434 }, + { 149, L"MG", L"MDG", L"Madagascar", 47603, 450 }, + { 151, L"MO", L"MAC", L"Macao S.A.R.", 47600, 446 }, + { 152, L"MD", L"MDA", L"Moldova", 47609, 498 }, + { 154, L"MN", L"MNG", L"Mongolia", 47600, 496 }, + { 156, L"MW", L"MWI", L"Malawi", 47603, 454 }, + { 157, L"ML", L"MLI", L"Mali", 42483, 466 }, + { 158, L"MC", L"MCO", L"Monaco", 10210824, 492 }, + { 159, L"MA", L"MAR", L"Morocco", 42487, 504 }, + { 160, L"MU", L"MUS", L"Mauritius", 47603, 480 }, + { 162, L"MR", L"MRT", L"Mauritania", 42483, 478 }, + { 163, L"MT", L"MLT", L"Malta", 47610, 470 }, + { 164, L"OM", L"OMN", L"Oman", 47611, 512 }, + { 165, L"MV", L"MDV", L"Maldives", 47614, 462 }, + { 166, L"MX", L"MEX", L"Mexico", 27082, 484 }, + { 167, L"MY", L"MYS", L"Malaysia", 47599, 458 }, + { 168, L"MZ", L"MOZ", L"Mozambique", 47603, 508 }, + { 173, L"NE", L"NER", L"Niger", 42483, 562 }, + { 174, L"VU", L"VUT", L"Vanuatu", 20900, 548 }, + { 175, L"NG", L"NGA", L"Nigeria", 42483, 566 }, + { 176, L"NL", L"NLD", L"Netherlands", 10210824, 528 }, + { 177, L"NO", L"NOR", L"Norway", 10039882, 578 }, + { 178, L"NP", L"NPL", L"Nepal", 47614, 524 }, + { 180, L"NR", L"NRU", L"Nauru", 21206, 520 }, + { 181, L"SR", L"SUR", L"Suriname", 31396, 740 }, + { 182, L"NI", L"NIC", L"Nicaragua", 27082, 558 }, + { 183, L"NZ", L"NZL", L"New Zealand", 10210825, 554 }, + { 184, L"PS", L"PSE", L"Palestinian Authority", 47611, 275 }, + { 185, L"PY", L"PRY", L"Paraguay", 31396, 600 }, + { 187, L"PE", L"PER", L"Peru", 31396, 604 }, + { 190, L"PK", L"PAK", L"Pakistan", 47614, 586 }, + { 191, L"PL", L"POL", L"Poland", 47609, 616 }, + { 192, L"PA", L"PAN", L"Panama", 27082, 591 }, + { 193, L"PT", L"PRT", L"Portugal", 47610, 620 }, + { 194, L"PG", L"PNG", L"Papua New Guinea", 20900, 598 }, + { 195, L"PW", L"PLW", L"Palau", 21206, 585 }, + { 196, L"GW", L"GNB", L"Guinea-Bissau", 42483, 624 }, + { 197, L"QA", L"QAT", L"Qatar", 47611, 634 }, + { 198, L"RE", L"REU", L"Reunion", 47603, 638 }, + { 199, L"MH", L"MHL", L"Marshall Islands", 21206, 584 }, + { 200, L"RO", L"ROU", L"Romania", 47609, 642 }, + { 201, L"PH", L"PHL", L"Philippines", 47599, 608 }, + { 202, L"PR", L"PRI", L"Puerto Rico", 10039880, 630 }, + { 203, L"RU", L"RUS", L"Russia", 47609, 643 }, + { 204, L"RW", L"RWA", L"Russ", 47603, 646 }, + { 205, L"SA", L"SAU", L"RUSS", 47611, 682 }, + { 206, L"PM", L"SPM", L"St. Pierre and Miquelon", 23581, 666 }, + { 207, L"KN", L"KNA", L"St. Kitts and Nevis", 10039880, 659 }, + { 208, L"SC", L"SYC", L"Seychelles", 47603, 690 }, + { 209, L"ZA", L"ZAF", L"South Africa", 10039883, 710 }, + { 210, L"SN", L"SEN", L"Senegal", 42483, 686 }, + { 212, L"SI", L"SVN", L"Slovenia", 47610, 705 }, + { 213, L"SL", L"SLE", L"Sierra Leone", 42483, 694 }, + { 214, L"SM", L"SMR", L"San Marino", 47610, 674 }, + { 215, L"SG", L"SGP", L"Singapore", 47599, 702 }, + { 216, L"SO", L"SOM", L"Somalia", 47603, 706 }, + { 217, L"ES", L"ESP", L"Spain", 47610, 724 }, + { 218, L"LC", L"LCA", L"St. Lucia", 10039880, 662 }, + { 219, L"SD", L"SDN", L"Sudan", 42487, 736 }, + { 220, L"SJ", L"SJM", L"Svalbard", 10039882, 744 }, + { 221, L"SE", L"SWE", L"Sweden", 10039882, 752 }, + { 222, L"SY", L"SYR", L"Syria", 47611, 760 }, + { 223, L"CH", L"CHE", L"Switzerland", 10210824, 756 }, + { 224, L"AE", L"ARE", L"United Arab Emirates", 47611, 784 }, + { 225, L"TT", L"TTO", L"Trinidad and Tobago", 10039880, 780 }, + { 227, L"TH", L"THA", L"Thailand", 47599, 764 }, + { 228, L"TJ", L"TJK", L"Tajikistan", 47590, 762 }, + { 231, L"TO", L"TON", L"Tonga", 26286, 776 }, + { 232, L"TG", L"TGO", L"Togo", 42483, 768 }, + { 233, L"ST", L"STP", L"São Tomé and Príncipe", 42484, 678 }, + { 234, L"TN", L"TUN", L"Tunisia", 42487, 788 }, + { 235, L"TR", L"TUR", L"Turkey", 47611, 792 }, + { 236, L"TV", L"TUV", L"Tuvalu", 26286, 798 }, + { 237, L"TW", L"TWN", L"Taiwan", 47600, 158 }, + { 238, L"TM", L"TKM", L"Turkmenistan", 47590, 795 }, + { 239, L"TZ", L"TZA", L"Tanzania", 47603, 834 }, + { 240, L"UG", L"UGA", L"Uganda", 47603, 800 }, + { 241, L"UA", L"UKR", L"Ukraine", 47609, 804 }, + { 242, L"GB", L"GBR", L"United Kingdom", 10039882, 826 }, + { 244, L"US", L"USA", L"United States", 23581, 840 }, + { 245, L"BF", L"BFA", L"Burkina Faso", 42483, 854 }, + { 246, L"UY", L"URY", L"Uruguay", 31396, 858 }, + { 247, L"UZ", L"UZB", L"Uzbekistan", 47590, 860 }, + { 248, L"VC", L"VCT", L"St. Vincent and the Grenadines", 10039880, 670 }, + { 249, L"VE", L"VEN", L"Bolivarian Republic of Venezuela", 31396, 862 }, + { 251, L"VN", L"VNM", L"Vietnam", 47599, 704 }, + { 252, L"VI", L"VIR", L"Virgin Islands", 10039880, 850 }, + { 253, L"VA", L"VAT", L"Vatican City", 47610, 336 }, + { 254, L"NA", L"NAM", L"Namibia", 10039883, 516 }, + { 257, L"EH", L"ESH", NULL, 42487, 732 }, /* Western Sahara (disputed) */ + { 258, L"XX", L"XX", L"Wake Island", 161832256 }, + { 259, L"WS", L"WSM", L"Samoa", 26286, 882 }, + { 260, L"SZ", L"SWZ", L"Swaziland", 10039883, 748 }, + { 261, L"YE", L"YEM", L"Yemen", 47611, 887 }, + { 263, L"ZM", L"ZMB", L"Zambia", 47603, 894 }, + { 264, L"ZW", L"ZWE", L"Zimbabwe", 47603, 716 }, + { 269, L"CS", L"SCG", L"Serbia and Montenegro (Former)", 47610, 891 }, + { 270, L"ME", L"MNE", L"Montenegro", 47610, 499 }, + { 271, L"RS", L"SRB", L"Serbia", 47610, 688 }, + { 273, L"CW", L"CUW", L"Curaçao", 10039880, 531 }, + { 276, L"SS", L"SSD", L"South Sudan", 42487, 728 }, + { 300, L"AI", L"AIA", L"Anguilla", 10039880, 660 }, + { 301, L"AQ", L"ATA", L"Antarctica", 39070, 10 }, + { 302, L"AW", L"ABW", L"Aruba", 10039880, 533 }, + { 303, L"XX", L"XX", L"Ascension Island", 343 }, + { 304, L"XX", L"XX", L"Ashmore and Cartier Islands", 10210825 }, + { 305, L"XX", L"XX", L"Baker Island", 161832256 }, + { 306, L"BV", L"BVT", L"Bouvet Island", 39070, 74 }, + { 307, L"KY", L"CYM", L"Cayman Islands", 10039880, 136 }, + { 308, L"XX", L"XX", L"Channel Islands", 10210824, 830, LOCATION_BOTH }, + { 309, L"CX", L"CXR", L"Christmas Island", 12, 162 }, + { 310, L"XX", L"XX", L"Clipperton Island", 27114 }, + { 311, L"CC", L"CCK", L"Cocos (Keeling) Islands", 10210825, 166 }, + { 312, L"CK", L"COK", L"Cook Islands", 26286, 184 }, + { 313, L"XX", L"XX", L"Coral Sea Islands", 10210825 }, + { 314, L"XX", L"XX", L"Diego Garcia", 114 }, + { 315, L"FK", L"FLK", L"Falkland Islands (Islas Malvinas)", 31396, 238 }, + { 317, L"GF", L"GUF", L"French Guiana", 31396, 254 }, + { 318, L"PF", L"PYF", L"French Polynesia", 26286, 258 }, + { 319, L"TF", L"ATF", L"French Southern and Antarctic Lands", 39070, 260 }, + { 321, L"GP", L"GLP", L"Guadeloupe", 10039880, 312 }, + { 322, L"GU", L"GUM", L"Guam", 21206, 316 }, + { 323, L"XX", L"XX", L"Guantanamo Bay", 39070 }, + { 324, L"GG", L"GGY", L"Guernsey", 308, 831 }, + { 325, L"HM", L"HMD", L"Heard Island and McDonald Islands", 39070, 334 }, + { 326, L"XX", L"XX", L"Howland Island", 161832256 }, + { 327, L"XX", L"XX", L"Jarvis Island", 161832256 }, + { 328, L"JE", L"JEY", L"Jersey", 308, 832 }, + { 329, L"XX", L"XX", L"Kingman Reef", 161832256 }, + { 330, L"MQ", L"MTQ", L"Martinique", 10039880, 474 }, + { 331, L"YT", L"MYT", L"Mayotte", 47603, 175 }, + { 332, L"MS", L"MSR", L"Montserrat", 10039880, 500 }, + { 333, L"AN", L"ANT", L"Netherlands Antilles (Former)", 10039880, 530, LOCATION_BOTH }, + { 334, L"NC", L"NCL", L"New Caledonia", 20900, 540 }, + { 335, L"NU", L"NIU", L"Niue", 26286, 570 }, + { 336, L"NF", L"NFK", L"Norfolk Island", 10210825, 574 }, + { 337, L"MP", L"MNP", L"Northern Mariana Islands", 21206, 580 }, + { 338, L"XX", L"XX", L"Palmyra Atoll", 161832256 }, + { 339, L"PN", L"PCN", L"Pitcairn Islands", 26286, 612 }, + { 340, L"XX", L"XX", L"Rota Island", 337 }, + { 341, L"XX", L"XX", L"Saipan", 337 }, + { 342, L"GS", L"SGS", L"South Georgia and the South Sandwich Islands", 39070, 239 }, + { 343, L"SH", L"SHN", L"St. Helena", 42483, 654 }, + { 346, L"XX", L"XX", L"Tinian Island", 337 }, + { 347, L"TK", L"TKL", L"Tokelau", 26286, 772 }, + { 348, L"XX", L"XX", L"Tristan da Cunha", 343 }, + { 349, L"TC", L"TCA", L"Turks and Caicos Islands", 10039880, 796 }, + { 351, L"VG", L"VGB", L"Virgin Islands, British", 10039880, 92 }, + { 352, L"WF", L"WLF", L"Wallis and Futuna", 26286, 876 }, + { 742, L"XX", L"XX", NULL, 39070, 2, LOCATION_REGION }, /* Africa */ + { 2129, L"XX", L"XX", NULL, 39070, 142, LOCATION_REGION }, /* Asia */ + { 10541, L"XX", L"XX", NULL, 39070, 150, LOCATION_REGION }, /* Europe */ + { 15126, L"IM", L"IMN", L"Man, Isle of", 10039882, 833 }, + { 19618, L"MK", L"MKD", L"Macedonia, Former Yugoslav Republic of", 47610, 807 }, + { 20900, L"XX", L"XX", NULL, 27114, 54, LOCATION_REGION }, /* Melanesia */ + { 21206, L"XX", L"XX", NULL, 27114, 57, LOCATION_REGION }, /* Micronesia */ + { 21242, L"XX", L"XX", L"Midway Islands", 161832256 }, + { 23581, L"XX", L"XX", NULL, 10026358, 21, LOCATION_REGION }, /* Northern America */ + { 26286, L"XX", L"XX", NULL, 27114, 61, LOCATION_REGION }, /* Polynesia */ + { 27082, L"XX", L"XX", NULL, 161832257, 13, LOCATION_REGION }, /* Central America */ + { 27114, L"XX", L"XX", NULL, 39070, 9, LOCATION_REGION }, /* Oceania */ + { 30967, L"SX", L"SXM", L"Sint Maarten (Dutch part)", 10039880, 534 }, + { 31396, L"XX", L"XX", NULL, 161832257, 5, LOCATION_REGION }, /* South America */ + { 31706, L"MF", L"MAF", NULL, 10039880, 663 }, /* Saint Martin (French part) */ + { 39070, L"XX", L"XX", NULL, 39070, 1, LOCATION_REGION }, /* World */ + { 42483, L"XX", L"XX", NULL, 742, 11, LOCATION_REGION }, /* Western Africa */ + { 42484, L"XX", L"XX", NULL, 742, 17, LOCATION_REGION }, /* Middle Africa */ + { 42487, L"XX", L"XX", NULL, 742, 15, LOCATION_REGION }, /* Northern Africa */ + { 47590, L"XX", L"XX", NULL, 2129, 143, LOCATION_REGION }, /* Central Asia */ + { 47599, L"XX", L"XX", NULL, 2129, 35, LOCATION_REGION }, /* South-Eastern Asia */ + { 47600, L"XX", L"XX", NULL, 2129, 30, LOCATION_REGION }, /* Eastern Asia */ + { 47603, L"XX", L"XX", NULL, 742, 14, LOCATION_REGION }, /* Eastern Africa */ + { 47609, L"XX", L"XX", NULL, 10541, 151, LOCATION_REGION }, /* Eastern Europe */ + { 47610, L"XX", L"XX", NULL, 10541, 39, LOCATION_REGION }, /* Southern Europe */ + { 47611, L"XX", L"XX", NULL, 2129, 145, LOCATION_REGION }, /* Middle East */ + { 47614, L"XX", L"XX", NULL, 2129, 34, LOCATION_REGION }, /* Southern Asia */ + { 7299303, L"TL", L"TLS", L"Democratic Republic of Timor-Leste", 47599, 626 }, + { 9914689, L"XK", L"XKS", NULL, 47610, 906 }, /* Kosovo */ + { 10026358, L"XX", L"XX", NULL, 39070, 19, LOCATION_REGION }, /* Americas */ + { 10028789, L"AX", L"", NULL, 10039882, 248 }, /* Åland Islands */ + { 10039880, L"XX", L"XX", NULL, 161832257, 29, LOCATION_REGION }, /* Caribbean */ + { 10039882, L"XX", L"XX", NULL, 10541, 154, LOCATION_REGION }, /* Northern Europe */ + { 10039883, L"XX", L"XX", NULL, 742, 18, LOCATION_REGION }, /* Southern Africa */ + { 10210824, L"XX", L"XX", NULL, 10541, 155, LOCATION_REGION }, /* Western Europe */ + { 10210825, L"XX", L"XX", NULL, 27114, 53, LOCATION_REGION }, /* Australia and New Zealand */ + { 161832015, L"BL", L"BLM", NULL, 10039880, 652 }, /* Saint Barthélemy */ + { 161832256, L"UM", L"UMI", NULL, 27114, 581 }, /* U.S. Minor Outlying Islands */ + { 161832257, L"XX", L"XX", NULL, 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; /* NLS normalization file */ @@ -4022,9 +4023,15 @@ INT WINAPI DECLSPEC_HOTPATCH GetGeoInfoW( GEOID id, GEOTYPE type, WCHAR *data, i case GEO_ISO3: str = ptr->iso3W; break; + case GEO_FRIENDLYNAME: + if (!(str = ptr->friendly)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + break; case GEO_RFC1766: case GEO_LCID: - case GEO_FRIENDLYNAME: case GEO_OFFICIALNAME: case GEO_TIMEZONES: case GEO_OFFICIALLANGUAGES: -- 2.25.2

3 4

[PATCH 1/2] d3d11/tests: Relax some color comparisons.
by Zebediah Figura 23 Mar '20

23 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 729f57f4436..dcde0d1c10e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29819,7 +29819,7 @@ static void test_color_mask(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240, 0); - ok(color == expected_colors[i], "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[i], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); } @@ -29837,7 +29837,7 @@ static void test_color_mask(void) { get_texture_readback(rts[i], 0, &rb); color = get_readback_color(&rb, 320, 240, 0); - ok(color == expected_colors[0], "%u: Got unexpected color 0x%08x.\n", i, color); + ok(compare_color(color, expected_colors[0], 1), "%u: Got unexpected color 0x%08x.\n", i, color); release_resource_readback(&rb); ID3D11Texture2D_Release(rts[i]); -- 2.25.1

3 7

[PATCH] d2d1/tests: Adjust a color to prevent test failures.
by Zebediah Figura 23 Mar '20

23 Mar '20

Different drivers may produce either #ff7f00 or #ff8000 here, both on Windows and Linux. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Perhaps better would be to avoid depending on pixel-exact color, but it's not clear to me what the preferred way of doing that is. dlls/d2d1/tests/d2d1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 77899ccd6ea..8548a0a4aa2 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1250,7 +1250,7 @@ static void test_clip(void) translate_matrix(&matrix, 0.1f, 0.0f); ID2D1RenderTarget_SetTransform(rt, &matrix); set_rect(&rect, 110.0f, 250.25f, 150.0f, 300.25f); - set_color(&color, 0.0f, 0.5f, 1.0f, 1.0f); + set_color(&color, 0.0f, 1.0f, 0.0f, 1.0f); ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); ID2D1RenderTarget_Clear(rt, &color); ID2D1RenderTarget_PopAxisAlignedClip(rt); @@ -1277,7 +1277,7 @@ static void test_clip(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "a958d1fe69ee880200d47b206948e4c1ef382748"); + match = compare_surface(surface, "cb418ec4a7c8407b5e36db06fc6292a06bb8476c"); ok(match, "Surface does not match.\n"); ID2D1RenderTarget_Release(rt); -- 2.25.1

3 3