wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Andrew Eikum : dsound: Handle default case in dsound3d mode switch ( Coverity).
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: f461610e6c93f74e7eb07567f0740c8f357eb951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f461610e6c93f74e7eb07567f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:15 2016 -0600 dsound: Handle default case in dsound3d mode switch (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/sound3d.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index e428053..840ab93 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -170,11 +170,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) switch (dsb->ds3db_ds3db.dwMode) { - case DS3DMODE_DISABLE: - TRACE("3D processing disabled\n"); - /* this one is here only to eliminate annoying warning message */ - DSOUND_RecalcVolPan (&dsb->volpan); - return; case DS3DMODE_NORMAL: TRACE("Normal 3D processing mode\n"); /* we need to calculate distance between buffer and listener*/ @@ -187,6 +182,11 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) vDistance = dsb->ds3db_ds3db.vPosition; flDistance = VectorMagnitude (&vDistance); break; + default: + TRACE("3D processing disabled\n"); + /* this one is here only to eliminate annoying warning message */ + DSOUND_RecalcVolPan (&dsb->volpan); + return; } if (flDistance > dsb->ds3db_ds3db.flMaxDistance)

1 0

Andrew Eikum : dsound: Avoid NULL pointer dereference (Coverity).
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 468477b69410f3f9731b4f9fec568945acb8e1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=468477b69410f3f9731b4f9fe… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:04 2016 -0600 dsound: Avoid NULL pointer dereference (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 2a80c3f..e85a5d1 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1205,9 +1205,9 @@ HRESULT IDirectSoundBufferImpl_Duplicate( HeapFree(GetProcessHeap(),0,dsb->pwfx); HeapFree(GetProcessHeap(),0,dsb); dsb = NULL; - } + }else + IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); - IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); *ppdsb = dsb; return hres; }

1 0

Andrew Eikum : ntdll: Initialize variable (Coverity).
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 0df38064c2940275c110274c9880ec4e7b0e8e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df38064c2940275c110274c9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:53:42 2016 -0600 ntdll: Initialize variable (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5c8b7fd..a18dfae 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2340,7 +2340,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInformationClass, void *Query, ULONG QueryLength, void *SystemInformation, ULONG Length, ULONG *ResultLength) { - ULONG len; + ULONG len = 0; NTSTATUS ret = STATUS_NOT_IMPLEMENTED; TRACE("(0x%08x,%p,%u,%p,%u,%p) stub\n", SystemInformationClass, Query, QueryLength, SystemInformation,

1 0

Andrew Eikum : winmm: Reset dwUser in mixerGetLineInfo.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 992e3c5dc8b1c5d52cffef96e7452cb17300e472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992e3c5dc8b1c5d52cffef96e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:33:23 2016 -0600 winmm: Reset dwUser in mixerGetLineInfo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mixer.c | 4 ++++ dlls/winmm/waveform.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 82eb338..f03a71e 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -438,11 +438,13 @@ static void mixer_test_deviceA(int device) mixerlineA.cbStruct = sizeof(mixerlineA); mixerlineA.dwDestination=d; + mixerlineA.dwUser = (ULONG_PTR)0xdeadbeef; rc = mixerGetLineInfoA(mix, &mixerlineA, MIXER_GETLINEINFOF_DESTINATION); ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER, "mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); + ok(mixerlineA.dwUser == 0, "dwUser was not reset\n"); if (rc==MMSYSERR_NODRIVER) trace(" No Driver\n"); else if (rc==MMSYSERR_NOERROR) { @@ -822,11 +824,13 @@ static void mixer_test_deviceW(int device) mixerlineW.cbStruct = sizeof(mixerlineW); mixerlineW.dwDestination=d; + mixerlineW.dwUser = (ULONG_PTR)0xdeadbeef; rc = mixerGetLineInfoW(mix, &mixerlineW, MIXER_GETLINEINFOF_DESTINATION); ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER, "mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): " "MMSYSERR_NOERROR expected, got %s\n", mmsys_error(rc)); + ok(mixerlineW.dwUser == 0, "dwUser was not reset\n"); if (rc==MMSYSERR_NODRIVER) trace(" No Driver\n"); else if (rc==MMSYSERR_NOERROR && winetest_interactive) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 93a5004..a4917a2 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -4287,6 +4287,8 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo if(!mmdevice) return MMSYSERR_INVALHANDLE; + lpmliW->dwUser = 0; + switch(fdwInfo & MIXER_GETLINEINFOF_QUERYMASK){ case MIXER_GETLINEINFOF_DESTINATION: return WINMM_GetDestinationLineInfo(mmdevice, mmdev_index, lpmliW,

1 0

Nikolay Sivov : user32/tests: Simplify some tests using todo_wine_if().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 8a7e7ec6a14c49deee8cc461a7ad05ab7ea0f416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7e7ec6a14c49deee8cc461a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 05:26:32 2016 +0300 user32/tests: Simplify some tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 11 +---------- dlls/user32/tests/menu.c | 14 ++------------ dlls/user32/tests/monitor.c | 6 +++--- dlls/user32/tests/msg.c | 12 ++---------- dlls/user32/tests/sysparams.c | 4 +--- dlls/user32/tests/win.c | 4 +--- dlls/user32/tests/winstation.c | 12 +++--------- 7 files changed, 13 insertions(+), 50 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 3488f31..eede834 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -394,17 +394,8 @@ static void test_GetNextDlgItem(void) { HWND a; a = (p->tab ? GetNextDlgTabItem : GetNextDlgGroupItem) (hwnd[p->dlg], hwnd[p->ctl], p->prev); - if (p->isok) - { + todo_wine_if (!p->isok) ok (a == hwnd[p->res], "Test %d: %s %s item of %d in %d was %d instead of %d\n", p->test, p->prev ? "Prev" : "Next", p->tab ? "Tab" : "Group", p->ctl, p->dlg, id(a), p->res); - } - else - { - todo_wine - { - ok (a == hwnd[p->res], "Test %d: %s %s item of %d in %d was actually %d matching expected %d\n", p->test, p->prev ? "Prev" : "Next", p->tab ? "Tab" : "Group", p->ctl, p->dlg, id(a), p->res); - } - } p++; } } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 33d8eb8..88b9df9 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2382,13 +2382,7 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) return 0; } - if (menu_tests[i]._todo_wine) - { - todo_wine { - ok(menu_tests[i].bMenuVisible == bMenuVisible, "test %d\n", i); - } - } - else + todo_wine_if (menu_tests[i]._todo_wine) ok(menu_tests[i].bMenuVisible == bMenuVisible, "test %d\n", i); } return 0; @@ -2450,11 +2444,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, if (pGetMenuInfo) /* Skip on NT */ { /* Native returns handle to destroyed window */ - if (msg==WM_UNINITMENUPOPUP && popmenu==1) - todo_wine ok(!mbi.hwndMenu == !popmenu, - "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", - msg, mbi.hwndMenu, popmenu ? "not " : ""); - else + todo_wine_if (msg==WM_UNINITMENUPOPUP && popmenu==1) ok(!mbi.hwndMenu == !popmenu, "msg %x: GetMenuBarInfo.hwndMenu wrong: %p expected %sNULL\n", msg, mbi.hwndMenu, popmenu ? "not " : ""); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 864eb85..d0c9a8c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -524,11 +524,11 @@ static void test_work_area(void) wp.rcNormalPosition.left, wp.rcNormalPosition.top, wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); OffsetRect(&wp.rcNormalPosition, rc_work.left, rc_work.top); - if (mi.rcMonitor.left != mi.rcWork.left || + todo_wine_if (mi.rcMonitor.left != mi.rcWork.left || mi.rcMonitor.top != mi.rcWork.top) /* FIXME: remove once Wine is fixed */ - todo_wine ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); - else + { ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); + } SetWindowLongA(hwnd, GWL_EXSTYLE, WS_EX_TOOLWINDOW); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9990bcc..d15a8e7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11805,13 +11805,7 @@ static void test_ShowWindow(void) "expected -1,-1 got %d,%d\n", wp.ptMinPosition.x, wp.ptMinPosition.y); ok(wp.ptMaxPosition.x == -1 && wp.ptMaxPosition.y == -1, "expected -1,-1 got %d,%d\n", wp.ptMaxPosition.x, wp.ptMaxPosition.y); - if (work_rc.left || work_rc.top) todo_wine /* FIXME: remove once Wine is fixed */ - ok(EqualRect(&win_rc, &wp.rcNormalPosition), - "expected %d,%d-%d,%d got %d,%d-%d,%d\n", - win_rc.left, win_rc.top, win_rc.right, win_rc.bottom, - wp.rcNormalPosition.left, wp.rcNormalPosition.top, - wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); - else + todo_wine_if (work_rc.left || work_rc.top) /* FIXME: remove once Wine is fixed */ ok(EqualRect(&win_rc, &wp.rcNormalPosition), "expected %d,%d-%d,%d got %d,%d-%d,%d\n", win_rc.left, win_rc.top, win_rc.right, win_rc.bottom, @@ -15106,9 +15100,7 @@ static void test_SendMessage_other_thread(int thread_n) ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); /* FIXME: remove once Wine is fixed */ -if (thread_n == 2) todo_wine - ok(ret == 0, "wrong status %08x\n", ret); -else +todo_wine_if (thread_n == 2) ok(ret == 0, "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 6fc24a6..cffc815 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2495,9 +2495,7 @@ static void test_WM_DISPLAYCHANGE(void) continue; } - if(start_bpp != test_bpps[i]) { - todo_wine ok(last_bpp == test_bpps[i], "Set bpp %d, but WM_DISPLAYCHANGE reported bpp %d\n", test_bpps[i], last_bpp); - } else { + todo_wine_if(start_bpp != test_bpps[i]) { ok(last_bpp == test_bpps[i], "Set bpp %d, but WM_DISPLAYCHANGE reported bpp %d\n", test_bpps[i], last_bpp); } last_set_bpp = test_bpps[i]; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b202544..70c07e0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7702,9 +7702,7 @@ static void test_child_window_from_point(void) ok(hwnd != 0, "RealChildWindowFromPoint failed\n"); ret = window_to_index(hwnd, window, sizeof(window)/sizeof(window[0])); /* FIXME: remove once Wine is fixed */ - if (ret != real_child_pos[i]) - todo_wine ok(ret == real_child_pos[i] || broken(ret == real_child_pos_nt4[i]), "expected %d, got %d\n", real_child_pos[i], ret); - else + todo_wine_if (ret != real_child_pos[i]) ok(ret == real_child_pos[i] || broken(ret == real_child_pos_nt4[i]), "expected %d, got %d\n", real_child_pos[i], ret); get_window_attributes(hwnd, &attrs); diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 35c9d0d..e49420b 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -942,10 +942,8 @@ static void test_foregroundwindow(void) if (input_desk_id == thread_desk_id) { ok(ret, "SetForegroundWindow failed!\n"); - if (hwnd) + todo_wine_if (!hwnd) ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); - else - todo_wine ok(hwnd == hwnd_test , "unexpected foreground window %p\n", hwnd); } else { @@ -958,18 +956,14 @@ static void test_foregroundwindow(void) if (input_desk_id == thread_desk_id) { ok(!ret, "SetForegroundWindow should fail!\n"); - if (hwnd) + todo_wine_if (!hwnd) ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); - else - todo_wine ok(hwnd == partners[input_desk_id] , "unexpected foreground window %p\n", hwnd); } else { todo_wine ok(!ret, "SetForegroundWindow should fail!\n"); - if (!hwnd) + todo_wine_if (hwnd) ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); - else - todo_wine ok(hwnd == 0, "unexpected foreground window %p\n", hwnd); } } }

1 0

Nikolay Sivov : gdi32/tests: Simplify tests using todo_wine_if().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 10437c027fa6527f2f0609951aa100b06c805a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10437c027fa6527f2f0609951… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 05:02:14 2016 +0300 gdi32/tests: Simplify tests using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 28 +++++----------------------- dlls/gdi32/tests/dib.c | 5 +---- dlls/gdi32/tests/font.c | 49 +++++++++++++++++-------------------------------- dlls/gdi32/tests/path.c | 10 ++-------- 4 files changed, 25 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10437c027fa6527f2f060…

1 0

Nikolay Sivov : dwrite: Add support for PFM files in Analyze().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 38a99b2f25faf2bf483d59b10a780ad7d842042c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a99b2f25faf2bf483d59b10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 04:50:07 2016 +0300 dwrite: Add support for PFM files in Analyze(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a913dc9..5b29c21 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -811,6 +811,16 @@ static HRESULT opentype_otf_analyzer(IDWriteFontFileStream *stream, UINT32 *font static HRESULT opentype_type1_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type) { +#include "pshpack1.h" + /* Specified in Adobe TechNote #5178 */ + struct pfm_header { + WORD dfVersion; + DWORD dfSize; + char data0[95]; + DWORD dfDevice; + char data1[12]; + }; +#include "poppack.h" struct type1_header { WORD tag; char data[14]; @@ -834,6 +844,44 @@ static HRESULT opentype_type1_analyzer(IDWriteFontFileStream *stream, UINT32 *fo IDWriteFontFileStream_ReleaseFileFragment(stream, context); + /* let's see if it's a .pfm metrics file */ + if (*file_type == DWRITE_FONT_FILE_TYPE_UNKNOWN) { + const struct pfm_header *pfm_header; + UINT64 filesize; + DWORD offset; + BOOL header_checked; + + hr = IDWriteFontFileStream_GetFileSize(stream, &filesize); + if (FAILED(hr)) + return hr; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&pfm_header, 0, sizeof(*pfm_header), &context); + if (FAILED(hr)) + return hr; + + offset = pfm_header->dfDevice; + header_checked = pfm_header->dfVersion == 0x100 && pfm_header->dfSize == filesize; + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + + /* as a last test check static string in PostScript information section */ + if (header_checked) { + static const char postscript[] = "PostScript"; + char *devtype_name; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&devtype_name, offset, sizeof(postscript), &context); + if (FAILED(hr)) + return hr; + + if (!memcmp(devtype_name, postscript, sizeof(postscript))) { + *font_count = 1; + *file_type = DWRITE_FONT_FILE_TYPE_TYPE1_PFM; + *face_type = DWRITE_FONT_FACE_TYPE_TYPE1; + } + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + } + } + return *file_type != DWRITE_FONT_FILE_TYPE_UNKNOWN ? S_OK : S_FALSE; }

1 0

Vincent Povirk : gdiplus/tests: Add test for GdipWidenPath.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: b9e58dd7cc7281cdad65f6404b8bc62cef1cbda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e58dd7cc7281cdad65f6404… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 10 16:02:47 2016 -0600 gdiplus/tests: Add test for GdipWidenPath. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphicspath.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 6d4171c..aa44911 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1055,6 +1055,62 @@ static void test_flatten(void) GdipDeletePath(path); } +static path_test_t widenline_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 15.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 15.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ + }; + +static void test_widen(void) +{ + GpStatus status; + GpPath *path; + GpPen *pen; + GpMatrix *m; + + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipCreatePen1(0xffffffff, 10.0, UnitPixel, &pen); + expect(Ok, status); + status = GdipCreateMatrix(&m); + expect(Ok, status); + + /* NULL arguments */ + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + status = GdipWidenPath(NULL, NULL, NULL, 0.0); + expect(InvalidParameter, status); + status = GdipWidenPath(path, pen, m, 0.0); + expect(Ok, status); + status = GdipWidenPath(path, pen, NULL, 1.0); + expect(Ok, status); + status = GdipWidenPath(path, NULL, m, 1.0); + expect(InvalidParameter, status); + status = GdipWidenPath(NULL, pen, m, 1.0); + expect(InvalidParameter, status); + + /* widen empty path */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipWidenPath(path, pen, m, 1.0); + expect(OutOfMemory, status); + + /* horizontal line */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.0, 10.0, 50.0, 10.0); + expect(Ok, status); + + status = GdipWidenPath(path, pen, m, 1.0); + expect(Ok, status); + ok_path(path, widenline_path, sizeof(widenline_path)/sizeof(path_test_t), FALSE); + + GdipDeleteMatrix(m); + GdipDeletePen(pen); + GdipDeletePath(path); +} + static void test_isvisible(void) { GpPath *path; @@ -1163,6 +1219,7 @@ START_TEST(graphicspath) test_reverse(); test_addpie(); test_flatten(); + test_widen(); test_isvisible(); test_empty_rect();

1 0

Michael Müller : advapi32/tests: Add tests for Win8 pseudo handles.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: c937cf6ad272ce0e7d95ac8a2cd2fbd875f0d4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c937cf6ad272ce0e7d95ac8a2… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:23:16 2016 +0100 advapi32/tests: Add tests for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 498d19a..8dafb08 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6103,6 +6103,57 @@ static void test_GetSidIdentifierAuthority(void) ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", GetLastError()); } +static void test_pseudo_tokens(void) +{ + TOKEN_STATISTICS statistics1, statistics2; + HANDLE token; + DWORD retlen; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + memset(&statistics1, 0x11, sizeof(statistics1)); + ret = GetTokenInformation(token, TokenStatistics, &statistics1, sizeof(statistics1), &retlen); + ok(ret, "GetTokenInformation failed with %u\n", GetLastError()); + CloseHandle(token); + + /* test GetCurrentProcessToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentProcessToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentProcessToken not supported, skipping test\n"); + + /* test GetCurrentThreadEffectiveToken() */ + SetLastError(0xdeadbeef); + memset(&statistics2, 0x22, sizeof(statistics2)); + ret = GetTokenInformation(GetCurrentThreadEffectiveToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + ok(ret || broken(GetLastError() == ERROR_INVALID_HANDLE), + "GetTokenInformation failed with %u\n", GetLastError()); + if (ret) + ok(!memcmp(&statistics1, &statistics2, sizeof(statistics1)), "Token statistics do not match\n"); + else + win_skip("CurrentThreadEffectiveToken not supported, skipping test\n"); + + SetLastError(0xdeadbeef); + ret = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token); + ok(!ret, "OpenThreadToken should have failed\n"); + ok(GetLastError() == ERROR_NO_TOKEN, "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); + + /* test GetCurrentThreadToken() */ + SetLastError(0xdeadbeef); + ret = GetTokenInformation(GetCurrentThreadToken(), TokenStatistics, + &statistics2, sizeof(statistics2), &retlen); + todo_wine ok(GetLastError() == ERROR_NO_TOKEN || broken(GetLastError() == ERROR_INVALID_HANDLE), + "Expected ERROR_NO_TOKEN, got %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -6148,4 +6199,5 @@ START_TEST(security) test_AddAce(); test_system_security_access(); test_GetSidIdentifierAuthority(); + test_pseudo_tokens(); }

1 0

Michael Müller : server: Add support for Win8 pseudo handles.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 18a8636ebee7c02d1a777eaf2ce287d92607a145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a8636ebee7c02d1a777eaf2… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 10 22:22:45 2016 +0100 server: Add support for Win8 pseudo handles. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/handle.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/handle.c b/server/handle.c index 15e5670..3b0d033 100644 --- a/server/handle.c +++ b/server/handle.c @@ -405,6 +405,12 @@ static inline struct object *get_magic_handle( obj_handle_t handle ) { switch(handle) { + case 0xfffffffa: /* current thread impersonation token pseudo-handle */ + return (struct object *)thread_get_impersonation_token( current ); + case 0xfffffffb: /* current thread token pseudo-handle */ + return (struct object *)current->token; + case 0xfffffffc: /* current process token pseudo-handle */ + return (struct object *)current->process->token; case 0xfffffffe: /* current thread pseudo-handle */ return &current->obj; case 0x7fffffff: /* current process pseudo-handle */

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2016