April 2016 - Wine-Commits - list.winehq.org

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in Ellipse within a path.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 661bc10bfed0d515c837be35b7954fe3f8c58223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661bc10bfed0d515c837be35b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:32 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Ellipse within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/tests/metafile.c | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 19cc423..5b1b0a4 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -221,6 +221,7 @@ BOOL EMFDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, */ BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRELLIPSE emr; INT temp; @@ -243,7 +244,8 @@ BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) emr.rclBox.right = right; emr.rclBox.bottom = bottom; - EMFDRV_UpdateBBox( dev, &emr.rclBox ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &emr.rclBox ); return EMFDRV_WriteRecord( dev, &emr.emr ); } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f8ced6e..3e989c4 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x70, 0x01, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, + 0x88, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, @@ -3621,7 +3621,10 @@ static const unsigned char EMF_PATH_BITS[] = 0x15, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, - 0x15, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x15, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 @@ -3653,10 +3656,11 @@ static void test_emf_GetPath(void) Arc(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Chord(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); + Ellipse(hdcMetafile, 10, 10, 20, 20); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 40, "GetPath returned %d.\n", size); + todo_wine ok( size == 53, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in Rectangle within a path.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 44f860daff9b5667bef2128f19fe30013fd3a4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f860daff9b5667bef2128f1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:30 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Rectangle within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 38a71b6..0484ebf 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -248,6 +248,7 @@ BOOL EMFDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) */ BOOL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRRECTANGLE emr; INT temp; @@ -270,7 +271,8 @@ BOOL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) emr.rclBox.right = right; emr.rclBox.bottom = bottom; - EMFDRV_UpdateBBox( dev, &emr.rclBox ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &emr.rclBox ); return EMFDRV_WriteRecord( dev, &emr.emr ); }

1 0

Nikolay Sivov : comctl32/tests: Remove some casts we don't need.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 22bfbfe9fc907bdb67cbcf9c1fee0a7596d91f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bfbfe9fc907bdb67cbcf9c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 29 14:30:30 2016 +0300 comctl32/tests: Remove some casts we don't need. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 10e7d0e..ed5d9f9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2236,8 +2236,9 @@ static void test_multiselect(void) HWND hwnd; INT r; - int i,j,item_count,selected_count; + int i, j; static const int items=5; + DWORD item_count; BYTE kstate[256]; select_task task; LONG_PTR style; @@ -2255,10 +2256,11 @@ static void test_multiselect(void) for (i = 0; i < items; i++) insert_item(hwnd, 0); - item_count = (int)SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + item_count = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items, item_count); for (i = 0; i < 4; i++) { + DWORD selected_count; LVITEMA item; task = task_list[i]; @@ -2291,9 +2293,11 @@ static void test_multiselect(void) expect(0,r); } - selected_count = (int)SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); - ok((task.result == -1 ? item_count : task.result) == selected_count, "Failed multiple selection %s. There should be %d selected items (is %d)\n", task.descr, item_count, selected_count); + ok((task.result == -1 ? item_count : task.result) == selected_count, + "Failed multiple selection %s. There should be %d selected items (is %d)\n", + task.descr, item_count, selected_count); /* Set SHIFT key released */ GetKeyboardState(kstate); @@ -2307,7 +2311,7 @@ static void test_multiselect(void) for (i=0;i<items;i++) { insert_item(hwnd, 0); } - item_count = (int)SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + item_count = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items,item_count); /* try with NULL pointer */

1 0

Sebastian Lackner : quartz/tests: Add initial tests for IFileSourceFilter interface.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 610d6b454031f105032d7ceda3735a8d8cca57de URL: http://source.winehq.org/git/wine.git/?a=commit;h=610d6b454031f105032d7ceda… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 29 11:05:35 2016 +0200 quartz/tests: Add initial tests for IFileSourceFilter interface. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 118 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 2fa7f91..fe1069d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -169,6 +169,123 @@ static void test_basefilter(void) IBaseFilter_Release(base); } +static void test_filesourcefilter(void) +{ + static const WCHAR prefix[] = {'w','i','n',0}; + static const struct + { + const char *label; + const char *data; + DWORD size; + const GUID *subtype; + } + tests[] = + { + { + "AVI", + "\x52\x49\x46\x46xxxx\x41\x56\x49\x20", + 12, + &MEDIASUBTYPE_Avi, + }, + { + "MPEG1 System", + "\x00\x00\x01\xBA\x21\x00\x01\x00\x01\x80\x00\x01\x00\x00\x01\xBB", + 16, + &MEDIASUBTYPE_MPEG1System, + }, + { + "MPEG1 Video", + "\x00\x00\x01\xB3", + 4, + &MEDIASUBTYPE_MPEG1Video, + }, + { + "MPEG1 Audio", + "\xFF\xE0", + 2, + &MEDIASUBTYPE_MPEG1Audio, + }, + { + "WAVE", + "\x52\x49\x46\x46xxxx\x57\x41\x56\x45", + 12, + &MEDIASUBTYPE_WAVE, + }, + }; + WCHAR path[MAX_PATH], temp[MAX_PATH]; + IFileSourceFilter *filesource; + DWORD ret, written; + IBaseFilter *base; + AM_MEDIA_TYPE mt; + OLECHAR *olepath; + BOOL success; + HANDLE file; + HRESULT hr; + int i; + + ret = GetTempPathW(MAX_PATH, temp); + ok(ret, "GetTempPathW failed with error %u\n", GetLastError()); + ret = GetTempFileNameW(temp, prefix, 0, path); + ok(ret, "GetTempFileNameW failed with error %u\n", GetLastError()); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + trace("Running test for %s\n", tests[i].label); + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed with error %u\n", GetLastError()); + success = WriteFile(file, tests[i].data, tests[i].size, &written, NULL); + ok(success, "WriteFile failed with error %u\n", GetLastError()); + ok(written == tests[i].size, "could not write test data\n"); + CloseHandle(file); + + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&base); + ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); + hr = IBaseFilter_QueryInterface(base, &IID_IFileSourceFilter, (void **)&filesource); + ok(hr == S_OK, "IBaseFilter_QueryInterface failed with %08x\n", hr); + + olepath = (void *)0xdeadbeef; + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(olepath == NULL, "expected NULL, got %p\n", olepath); + + hr = IFileSourceFilter_Load(filesource, NULL, NULL); + todo_wine + ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr); + + hr = IFileSourceFilter_Load(filesource, path, NULL); + ok(hr == S_OK, "IFileSourceFilter_Load failed with %08x\n", hr); + + hr = IFileSourceFilter_GetCurFile(filesource, NULL, &mt); + ok(hr == E_POINTER, "expected E_POINTER, got %08x\n", hr); + + olepath = NULL; + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, NULL); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + CoTaskMemFree(olepath); + + olepath = NULL; + memset(&mt, 0x11, sizeof(mt)); + hr = IFileSourceFilter_GetCurFile(filesource, &olepath, &mt); + ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(olepath, path), + "expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(olepath)); + ok(IsEqualGUID(&mt.majortype, &MEDIATYPE_Stream), + "expected MEDIATYPE_Stream, got %s\n", wine_dbgstr_guid(&mt.majortype)); + ok(IsEqualGUID(&mt.subtype, tests[i].subtype), + "expected %s, got %s\n", wine_dbgstr_guid(tests[i].subtype), wine_dbgstr_guid(&mt.subtype)); + CoTaskMemFree(olepath); + + IFileSourceFilter_Release(filesource); + IBaseFilter_Release(base); + + success = DeleteFileW(path); + ok(success, "DeleteFileW failed with error %u\n", GetLastError()); + } +} + static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; static const char afile[] = "test.avi"; @@ -462,6 +579,7 @@ START_TEST(avisplitter) test_query_interface(); test_basefilter(); + test_filesourcefilter(); test_threads(); release_avisplitter();

1 0

Alex Henrie : quartz/tests: Print the correct function name when tests fail.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 74425e6b04ab4fb64218ddfb541adfee5651bf4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74425e6b04ab4fb64218ddfb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 27 23:12:55 2016 -0600 quartz/tests: Print the correct function name when tests fail. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtermapper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index fe23a72..11b7d39 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -593,7 +593,7 @@ static void test_aggregate_filter_mapper(void) ok(pmapper != &unk_outer.IUnknown_iface, "pmapper = %p, expected not %p\n", pmapper, &unk_outer.IUnknown_iface); hr = IUnknown_QueryInterface(pmapper, &IID_IUnknown, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -603,7 +603,7 @@ static void test_aggregate_filter_mapper(void) unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -613,7 +613,7 @@ static void test_aggregate_filter_mapper(void) unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper2, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk); @@ -623,7 +623,7 @@ static void test_aggregate_filter_mapper(void) unk_outer.Release_called = 0; hr = IUnknown_QueryInterface(pmapper, &IID_IFilterMapper3, (void **)&punk); - ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); + ok(hr == S_OK, "IUnknown_QueryInterface returned %x\n", hr); ok(punk != &unk_outer.IUnknown_iface, "punk = %p, expected not %p\n", punk, &unk_outer.IUnknown_iface); IUnknown_Release(punk);

1 0

Alex Henrie : qedit: Remove redundant "return 0" from Release functions.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 36113e6ded8b19f4c5a22771ed12cbd8564e3155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36113e6ded8b19f4c5a22771e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 27 23:12:54 2016 -0600 qedit: Remove redundant "return 0" from Release functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 1 - dlls/qedit/samplegrabber.c | 2 -- dlls/qedit/timeline.c | 3 --- 3 files changed, 6 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 53ab75a..b7a5abb 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -112,7 +112,6 @@ static ULONG WINAPI MediaDet_inner_Release(IUnknown *iface) { MD_cleanup(This); CoTaskMemFree(This); - return 0; } return ref; diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 946dba9..e3f387b 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -92,7 +92,6 @@ static ULONG WINAPI Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) if (This->mtype.pbFormat) CoTaskMemFree(This->mtype.pbFormat); CoTaskMemFree(This); - return 0; } return refCount; } @@ -335,7 +334,6 @@ static ULONG WINAPI SampleGrabber_Release(IUnknown *iface) { SampleGrabber_cleanup(This); CoTaskMemFree(This); - return 0; } return ref; } diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index 8293c8f..906efd5 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -106,10 +106,7 @@ static ULONG WINAPI Timeline_Release(IUnknown *iface) TRACE("(%p) new ref = %u\n", This, ref); if (ref == 0) - { CoTaskMemFree(This); - return 0; - } return ref; }

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in PolyPolyline within a path.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: dfb750b9c2f3d57be332fe97f12a39ee737e7767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb750b9c2f3d57be332fe97f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:49:07 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in PolyPolyline within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 5 +++-- dlls/gdi32/tests/metafile.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 1b5d26d..b139305 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -533,6 +533,7 @@ static BOOL EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys, DWORD iType) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRPOLYPOLYLINE *emr; DWORD cptl = 0, poly, size, i; INT point; @@ -576,7 +577,7 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po if(use_small_emr) emr->emr.iType += EMR_POLYPOLYLINE16 - EMR_POLYPOLYLINE; emr->emr.nSize = size; - if(bounds_valid) + if(bounds_valid && !physDev->path) emr->rclBounds = bounds; else emr->rclBounds = empty; @@ -608,7 +609,7 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po ret = FALSE; SetLastError( ERROR_INVALID_PARAMETER ); } - if(ret) + if(ret && !physDev->path) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); HeapFree( GetProcessHeap(), 0, emr ); return ret; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 64ad004..9a5c1a5 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xd4, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x0c, 0x02, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, @@ -3634,6 +3634,13 @@ static const unsigned char EMF_PATH_BITS[] = 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x5a, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, @@ -3643,6 +3650,7 @@ static const unsigned char EMF_PATH_BITS[] = static void test_emf_GetPath(void) { POINT pts[4] = {{10, 10}, {20, 10}, {10, 20}, {20, 20}}; + DWORD counts[2] = {2, 2}; HDC hdcMetafile; HENHMETAFILE hemf; BOOL ret; @@ -3670,10 +3678,11 @@ static void test_emf_GetPath(void) Ellipse(hdcMetafile, 10, 10, 20, 20); RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); Polyline(hdcMetafile, pts, 4); + PolyPolyline(hdcMetafile, pts, counts, 2); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 73, "GetPath returned %d.\n", size); + todo_wine ok( size == 77, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in Polyline within a path.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 67e26bec8dc5d0ca4d1c60772e57a5d74890b490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e26bec8dc5d0ca4d1c60772… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:58 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in Polyline within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 36 +++++++++++++++++++++++++++--------- dlls/gdi32/tests/metafile.c | 20 ++++++++++++++------ 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 98121e5..1b5d26d 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -347,6 +347,7 @@ COLORREF EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) static BOOL EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRPOLYLINE *emr; DWORD size; INT i; @@ -358,6 +359,17 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; + emr->cptl = count; + memcpy(emr->aptl, pt, count * sizeof(POINTL)); + + if(physDev->path) { + emr->rclBounds.left = emr->rclBounds.top = 0; + emr->rclBounds.right = emr->rclBounds.bottom = -1; + ret = EMFDRV_WriteRecord( dev, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); + return ret; + } + if(iType == EMR_POLYBEZIERTO) { POINT cur_pt; @@ -384,9 +396,6 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->rclBounds.bottom = pt[i].y; } - emr->cptl = count; - memcpy(emr->aptl, pt, count * sizeof(POINTL)); - ret = EMFDRV_WriteRecord( dev, &emr->emr ); if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); @@ -406,6 +415,7 @@ EMFDRV_Polylinegon( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) static BOOL EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRPOLYLINE16 *emr; DWORD size; INT i; @@ -424,6 +434,20 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->emr.iType = iType; emr->emr.nSize = size; + emr->cpts = count; + for(i = 0; i < count; i++ ) { + emr->apts[i].x = pt[i].x; + emr->apts[i].y = pt[i].y; + } + + if(physDev->path) { + emr->rclBounds.left = emr->rclBounds.top = 0; + emr->rclBounds.right = emr->rclBounds.bottom = -1; + ret = EMFDRV_WriteRecord( dev, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); + return ret; + } + if(iType == EMR_POLYBEZIERTO16) { POINT cur_pt; @@ -450,12 +474,6 @@ EMFDRV_Polylinegon16( PHYSDEV dev, const POINT* pt, INT count, DWORD iType ) emr->rclBounds.bottom = pt[i].y; } - emr->cpts = count; - for(i = 0; i < count; i++ ) { - emr->apts[i].x = pt[i].x; - emr->apts[i].y = pt[i].y; - } - ret = EMFDRV_WriteRecord( dev, &emr->emr ); if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index bdc2a0a..64ad004 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xa8, 0x01, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0xd4, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, @@ -3628,14 +3628,21 @@ static const unsigned char EMF_PATH_BITS[] = 0x20, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x05, 0x00, 0x00, 0x00, 0x57, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static void test_emf_GetPath(void) { + POINT pts[4] = {{10, 10}, {20, 10}, {10, 20}, {20, 20}}; HDC hdcMetafile; HENHMETAFILE hemf; BOOL ret; @@ -3662,10 +3669,11 @@ static void test_emf_GetPath(void) Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Ellipse(hdcMetafile, 10, 10, 20, 20); RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); + Polyline(hdcMetafile, pts, 4); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 69, "GetPath returned %d.\n", size); + todo_wine ok( size == 73, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Piotr Caban : gdi32/enhmfdrv: Don' t update document bounds in RoundRect within a path.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 0d84feaf49bfcce1e82930f4e08b577b537710ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d84feaf49bfcce1e82930f4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:48:46 2016 +0200 gdi32/enhmfdrv: Don't update document bounds in RoundRect within a path. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/tests/metafile.c | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 5b1b0a4..98121e5 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -288,6 +288,7 @@ BOOL EMFDRV_Rectangle(PHYSDEV dev, INT left, INT top, INT right, INT bottom) BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT ell_width, INT ell_height ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRROUNDRECT emr; INT temp; @@ -310,7 +311,8 @@ BOOL EMFDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, emr.szlCorner.cx = ell_width; emr.szlCorner.cy = ell_height; - EMFDRV_UpdateBBox( dev, &emr.rclBox ); + if(!physDev->path) + EMFDRV_UpdateBBox( dev, &emr.rclBox ); return EMFDRV_WriteRecord( dev, &emr.emr ); } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 3e989c4..bdc2a0a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3585,7 +3585,7 @@ static const unsigned char EMF_PATH_BITS[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xff, 0xff, 0xff, 0xea, 0xff, 0xff, 0xff, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0x88, 0x01, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0xa8, 0x01, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x07, 0x00, 0x00, 0x3e, 0x04, 0x00, 0x00, @@ -3624,7 +3624,11 @@ static const unsigned char EMF_PATH_BITS[] = 0x15, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, - 0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 @@ -3657,10 +3661,11 @@ static void test_emf_GetPath(void) Chord(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Pie(hdcMetafile, 21, 21, 39, 29, 39, 29, 21, 21); Ellipse(hdcMetafile, 10, 10, 20, 20); + RoundRect(hdcMetafile, 10, 10, 20, 20, 3, 5); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 53, "GetPath returned %d.\n", size); + todo_wine ok( size == 69, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Hans Leidekker : kernel32: Improve the stub for GetThreadPreferredUILanguages.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: c90845cf9330e7b731508ee5e40616341bdb7ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90845cf9330e7b731508ee5e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 29 10:14:35 2016 +0200 kernel32: Improve the stub for GetThreadPreferredUILanguages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 69 ++++++++++++++++++++++++++++++-------------- dlls/kernel32/tests/locale.c | 29 +++++++++++++++++++ dlls/kernel32/thread.c | 20 ------------- include/winnls.h | 1 + 4 files changed, 77 insertions(+), 42 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 528f945..a2f369a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1048,35 +1048,17 @@ INT WINAPI GetSystemDefaultLocaleName(LPWSTR localename, INT len) return LCIDToLocaleName(lcid, localename, len, 0); } -/*********************************************************************** - * GetSystemPreferredUILanguages (KERNEL32.@) - */ -BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) +static BOOL get_dummy_preferred_ui_language( DWORD flags, ULONG *count, WCHAR *buffer, ULONG *size ) { LCTYPE type; int lsize; - if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if ((flags & MUI_LANGUAGE_NAME) && (flags & MUI_LANGUAGE_ID)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - if (*size && !buffer) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); if (flags & MUI_LANGUAGE_ID) - type = LOCALE_ILANGUAGE; - else - type = LOCALE_SNAME; + type = LOCALE_ILANGUAGE; + else + type = LOCALE_SNAME; lsize = GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, type, NULL, 0); if (!lsize) @@ -1109,6 +1091,49 @@ BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buff *count = 1; TRACE("returned variable content: %d, \"%s\", %d\n", *count, debugstr_w(buffer), *size); return TRUE; + +} + +/*********************************************************************** + * GetSystemPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetSystemPreferredUILanguages(DWORD flags, ULONG* count, WCHAR* buffer, ULONG* size) +{ + if (flags & ~(MUI_LANGUAGE_NAME | MUI_LANGUAGE_ID | MUI_MACHINE_LANGUAGE_SETTINGS)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if ((flags & MUI_LANGUAGE_NAME) && (flags & MUI_LANGUAGE_ID)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (*size && !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return get_dummy_preferred_ui_language( flags, count, buffer, size ); +} + +/*********************************************************************** + * SetThreadPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI SetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG count ) +{ + FIXME( "%u, %p, %p\n", flags, buffer, count ); + return TRUE; +} + +/*********************************************************************** + * GetThreadPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, ULONG *count, WCHAR *buf, ULONG *size ) +{ + FIXME( "%08x, %p, %p %p\n", flags, count, buf, size ); + return get_dummy_preferred_ui_language( flags, count, buf, size ); } /*********************************************************************** diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 57dc418..20f52d2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -98,6 +98,7 @@ static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); +static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static void InitFunctionPointers(void) { @@ -127,6 +128,7 @@ static void InitFunctionPointers(void) X(GetGeoInfoW); X(EnumSystemGeoID); X(GetSystemPreferredUILanguages); + X(GetThreadPreferredUILanguages); #undef X } @@ -4770,6 +4772,32 @@ static void test_GetSystemPreferredUILanguages(void) "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); } +static void test_GetThreadPreferredUILanguages(void) +{ + BOOL ret; + ULONG count, size; + WCHAR *buf; + + if (!pGetThreadPreferredUILanguages) + { + win_skip("GetThreadPreferredUILanguages is not available.\n"); + return; + } + + size = count = 0; + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, NULL, &size); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + ok(size, "expected size > 0\n"); + + count = 0; + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(WCHAR)); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, buf, &size); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + HeapFree(GetProcessHeap(), 0, buf); +} + START_TEST(locale) { InitFunctionPointers(); @@ -4813,6 +4841,7 @@ START_TEST(locale) test_EnumSystemGeoID(); test_invariant(); test_GetSystemPreferredUILanguages(); + test_GetThreadPreferredUILanguages(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); } diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 0e9de82..6630e7f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -888,26 +888,6 @@ BOOL WINAPI GetThreadIOPendingFlag( HANDLE thread, PBOOL io_pending ) } /*********************************************************************** - * SetThreadPreferredUILanguages (KERNEL32.@) - */ -BOOL WINAPI SetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG count ) -{ - FIXME( "%u, %p, %p\n", flags, buffer, count ); - return TRUE; -} - -/*********************************************************************** - * GetThreadPreferredUILanguages (KERNEL32.@) - */ -BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR buffer, PULONG buffersize ) -{ - FIXME( "%u, %p, %p %p\n", flags, count, buffer, buffersize ); - *count = 0; - *buffersize = 0; - return TRUE; -} - -/*********************************************************************** * CallbackMayRunLong (KERNEL32.@) */ BOOL WINAPI CallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) diff --git a/include/winnls.h b/include/winnls.h index 6e5897b..1a7baaf 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -909,6 +909,7 @@ WINBASEAPI LCID WINAPI GetSystemDefaultLCID(void); WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI LCID WINAPI GetThreadLocale(void); +WINBASEAPI BOOL WINAPI GetThreadPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);

1 0