January 2011 - Wine-Commits

Marcus Meissner : jscript: Fixed VT variable type for DISPID_GLOBAL_ISWIN64 .
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 45e2bd7c2ee9f153f533ced5870e1a6702358564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e2bd7c2ee9f153f533ced58… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 2 15:06:41 2011 +0100 jscript: Fixed VT variable type for DISPID_GLOBAL_ISWIN64. --- dlls/jscript/tests/run.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f473c6c..326b327 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -576,7 +576,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case DISPID_GLOBAL_ISWIN64: if(pvarRes) { V_VT(pvarRes) = VT_BOOL; - V_BSTR(pvarRes) = sizeof(void*) == 8 ? VARIANT_TRUE : VARIANT_FALSE; + V_BOOL(pvarRes) = sizeof(void*) == 8 ? VARIANT_TRUE : VARIANT_FALSE; } return S_OK;

1 0

André Hentschel : appwiz.cpl: Update German translation.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 60500cd2be873dcbb09e4a2c56916981bd325891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60500cd2be873dcbb09e4a2c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 2 18:54:23 2011 +0100 appwiz.cpl: Update German translation. --- dlls/appwiz.cpl/De.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index 14a8069..cdf2fcf 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -1,8 +1,8 @@ /* * Add/Remove Programs German resources * -* Copyright 2009-2010 André Hentschel * Copyright 2005 Henning Gerhardt +* Copyright 2009-2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -48,6 +48,7 @@ STRINGTABLE { IDS_DOWNLOADING "Lade herunter..." IDS_INSTALLING "Installiere..." + IDS_INVALID_SHA "Unerwartete Prüfsumme der heruntergeladenen Datei. Breche Installation der beschädigten Datei ab." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

André Hentschel : include: Add more minor shutdown reasons.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: c59db6d2744950015172f9825748e1a94a2f962f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59db6d2744950015172f9825… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 2 20:17:41 2011 +0100 include: Add more minor shutdown reasons. --- include/reason.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/include/reason.h b/include/reason.h index 2fe8a57..e8bf7c1 100644 --- a/include/reason.h +++ b/include/reason.h @@ -36,8 +36,39 @@ #define SHTDN_REASON_MAJOR_LEGACY_API 0x00070000 #define SHTDN_REASON_MINOR_OTHER 0x00000000 +#define SHTDN_REASON_MINOR_MAINTENANCE 0x00000001 +#define SHTDN_REASON_MINOR_INSTALLATION 0x00000002 +#define SHTDN_REASON_MINOR_UPGRADE 0x00000003 +#define SHTDN_REASON_MINOR_RECONFIG 0x00000004 +#define SHTDN_REASON_MINOR_HUNG 0x00000005 +#define SHTDN_REASON_MINOR_UNSTABLE 0x00000006 +#define SHTDN_REASON_MINOR_DISK 0x00000007 +#define SHTDN_REASON_MINOR_PROCESSOR 0x00000008 +#define SHTDN_REASON_MINOR_NETWORKCARD 0x00000009 +#define SHTDN_REASON_MINOR_POWER_SUPPLY 0x0000000a +#define SHTDN_REASON_MINOR_CORDUNPLUGGED 0x0000000b +#define SHTDN_REASON_MINOR_ENVIRONMENT 0x0000000c +#define SHTDN_REASON_MINOR_HARDWARE_DRIVER 0x0000000d +#define SHTDN_REASON_MINOR_OTHERDRIVER 0x0000000e +#define SHTDN_REASON_MINOR_BLUESCREEN 0x0000000f +#define SHTDN_REASON_MINOR_SERVICEPACK 0x00000010 +#define SHTDN_REASON_MINOR_HOTFIX 0x00000011 +#define SHTDN_REASON_MINOR_SECURITYFIX 0x00000012 +#define SHTDN_REASON_MINOR_SECURITY 0x00000013 +#define SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY 0x00000014 +#define SHTDN_REASON_MINOR_WMI 0x00000015 +#define SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL 0x00000016 +#define SHTDN_REASON_MINOR_HOTFIX_UNINSTALL 0x00000017 +#define SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL 0x00000018 +#define SHTDN_REASON_MINOR_MMC 0x00000019 +#define SHTDN_REASON_MINOR_SYSTEMRESTORE 0x0000001a +#define SHTDN_REASON_MINOR_TERMSRV 0x00000020 +#define SHTDN_REASON_MINOR_DC_PROMOTION 0x00000021 +#define SHTDN_REASON_MINOR_DC_DEMOTION 0x00000022 #define SHTDN_REASON_MINOR_NONE 0x000000ff +#define SHTDN_REASON_VALID_BIT_MASK 0xc0ffffff + #define SHTDN_REASON_UNKNOWN SHTDN_REASON_MINOR_NONE #define SHTDN_REASON_LEGACY_API (SHTDN_REASON_MAJOR_LEGACY_API | SHTDN_REASON_FLAG_PLANNED)

1 0

Greg Geldorp : msctf/tests: Wait a bit for registrations to become active on Win7.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 8532d0660222f9d7d3b9daaeae1110b2b5ed95d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8532d0660222f9d7d3b9daaea… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 20:26:45 2011 +0100 msctf/tests: Wait a bit for registrations to become active on Win7. --- dlls/msctf/tests/inputprocessor.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index a1682fb..bc9da72 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2113,6 +2113,8 @@ START_TEST(inputprocessor) { test_Register(); test_RegisterCategory(); + Sleep(2000); /* Win7 needs some time before the registrations become active */ + processPendingMessages(); test_EnumLanguageProfiles(); test_EnumInputProcessorInfo(); test_Enable();

1 0

Greg Geldorp : kernel32/tests: Add error codes for XP/Win2003 Wow64.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: e114f85345882925e0c35e489a58c477619603d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e114f85345882925e0c35e489… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 2 20:28:05 2011 +0100 kernel32/tests: Add error codes for XP/Win2003 Wow64. --- dlls/kernel32/tests/loader.c | 76 +++++++++++++++++++++++++----------------- 1 files changed, 45 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e114f85345882925e0c35…

1 0

André Hentschel : gdi32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 56233536e89a934e326f7e0419374b3d7b2fd1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56233536e89a934e326f7e041… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 2 18:50:17 2011 +0100 gdi32/tests: Don't test function directly when reporting GetLastError(). --- dlls/gdi32/tests/font.c | 12 +++++++++--- dlls/gdi32/tests/gdiobj.c | 28 +++++++++++++++++----------- dlls/gdi32/tests/metafile.c | 24 ++++++++++++++++-------- dlls/gdi32/tests/pen.c | 11 ++++++++--- 4 files changed, 50 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c87b062..179e846 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -800,6 +800,7 @@ static void test_bitmap_font_metrics(void) { DWORD fs[2]; CHARSETINFO csi; + BOOL bRet; fs[0] = 1L << bit; fs[1] = 0; @@ -812,7 +813,8 @@ static void test_bitmap_font_metrics(void) hfont = create_font(lf.lfFaceName, &lf); old_hfont = SelectObject(hdc, hfont); - ok(GetTextMetrics(hdc, &tm), "GetTextMetrics error %d\n", GetLastError()); + bRet = GetTextMetrics(hdc, &tm); + ok(bRet, "GetTextMetrics error %d\n", GetLastError()); if(fd[i].dpi == tm.tmDigitizedAspectX) { trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); @@ -1166,6 +1168,7 @@ static void test_GetKerningPairs(void) for (i = 0; i < sizeof(kd)/sizeof(kd[0]); i++) { OUTLINETEXTMETRICW otm; + UINT uiRet; if (!is_font_installed(kd[i].face_name)) { @@ -1185,7 +1188,8 @@ static void test_GetKerningPairs(void) SetLastError(0xdeadbeef); otm.otmSize = sizeof(otm); /* just in case for Win9x compatibility */ - ok(GetOutlineTextMetricsW(hdc, sizeof(otm), &otm) == sizeof(otm), "GetOutlineTextMetricsW error %d\n", GetLastError()); + uiRet = GetOutlineTextMetricsW(hdc, sizeof(otm), &otm); + ok(uiRet == sizeof(otm), "GetOutlineTextMetricsW error %d\n", GetLastError()); ok(match_off_by_1(kd[i].tmHeight, otm.otmTextMetrics.tmHeight), "expected %d, got %d\n", kd[i].tmHeight, otm.otmTextMetrics.tmHeight); @@ -3197,6 +3201,7 @@ static void test_AddFontMemResource(void) void *font; DWORD font_size, num_fonts; HANDLE ret; + BOOL bRet; if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) { @@ -3284,7 +3289,8 @@ static void test_AddFontMemResource(void) free_font(font); SetLastError(0xdeadbeef); - ok(pRemoveFontMemResourceEx(ret), "RemoveFontMemResourceEx error %d\n", GetLastError()); + bRet = pRemoveFontMemResourceEx(ret); + ok(bRet, "RemoveFontMemResourceEx error %d\n", GetLastError()); /* test invalid pointer to number of loaded fonts */ font = load_font("sserife.fon", &font_size); diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 6367071..bc00b3d 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -118,6 +118,7 @@ struct hgdiobj_event static DWORD WINAPI thread_proc(void *param) { LOGPEN lp; + DWORD status; struct hgdiobj_event *hgdiobj_event = param; hgdiobj_event->hdc = CreateDC("display", NULL, NULL, NULL); @@ -130,8 +131,8 @@ static DWORD WINAPI thread_proc(void *param) ok(hgdiobj_event->hgdiobj2 != 0, "Failed to create pen\n"); SetEvent(hgdiobj_event->ready_event); - ok(WaitForSingleObject(hgdiobj_event->stop_event, INFINITE) == WAIT_OBJECT_0, - "WaitForSingleObject error %u\n", GetLastError()); + status = WaitForSingleObject(hgdiobj_event->stop_event, INFINITE); + ok(status == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", GetLastError()); ok(!GetObject(hgdiobj_event->hgdiobj1, sizeof(lp), &lp), "GetObject should fail\n"); @@ -147,6 +148,8 @@ static void test_thread_objects(void) HANDLE hthread; struct hgdiobj_event hgdiobj_event; INT ret; + DWORD status; + BOOL bRet; hgdiobj_event.stop_event = CreateEvent(NULL, 0, 0, NULL); ok(hgdiobj_event.stop_event != NULL, "CreateEvent error %u\n", GetLastError()); @@ -156,11 +159,11 @@ static void test_thread_objects(void) hthread = CreateThread(NULL, 0, thread_proc, &hgdiobj_event, 0, &tid); ok(hthread != NULL, "CreateThread error %u\n", GetLastError()); - ok(WaitForSingleObject(hgdiobj_event.ready_event, INFINITE) == WAIT_OBJECT_0, - "WaitForSingleObject error %u\n", GetLastError()); + status = WaitForSingleObject(hgdiobj_event.ready_event, INFINITE); + ok(status == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", GetLastError()); - ok(GetObject(hgdiobj_event.hgdiobj1, sizeof(lp), &lp) == sizeof(lp), - "GetObject error %u\n", GetLastError()); + ret = GetObject(hgdiobj_event.hgdiobj1, sizeof(lp), &lp); + ok(ret == sizeof(lp), "GetObject error %u\n", GetLastError()); ok(lp.lopnStyle == PS_DASHDOTDOT, "wrong pen style %d\n", lp.lopnStyle); ok(lp.lopnWidth.x == 17, "wrong pen width.y %d\n", lp.lopnWidth.x); ok(lp.lopnWidth.y == 0, "wrong pen width.y %d\n", lp.lopnWidth.y); @@ -169,20 +172,23 @@ static void test_thread_objects(void) ret = GetDeviceCaps(hgdiobj_event.hdc, TECHNOLOGY); ok(ret == DT_RASDISPLAY, "GetDeviceCaps(TECHNOLOGY) should return DT_RASDISPLAY not %d\n", ret); - ok(DeleteObject(hgdiobj_event.hgdiobj1), "DeleteObject error %u\n", GetLastError()); - ok(DeleteDC(hgdiobj_event.hdc), "DeleteDC error %u\n", GetLastError()); + bRet = DeleteObject(hgdiobj_event.hgdiobj1); + ok(bRet, "DeleteObject error %u\n", GetLastError()); + bRet = DeleteDC(hgdiobj_event.hdc); + ok(bRet, "DeleteDC error %u\n", GetLastError()); type = GetObjectType(hgdiobj_event.hgdiobj2); ok(type == OBJ_REGION, "GetObjectType returned %u\n", type); SetEvent(hgdiobj_event.stop_event); - ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, - "WaitForSingleObject error %u\n", GetLastError()); + status = WaitForSingleObject(hthread, INFINITE); + ok(status == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", GetLastError()); CloseHandle(hthread); type = GetObjectType(hgdiobj_event.hgdiobj2); ok(type == OBJ_REGION, "GetObjectType returned %u\n", type); - ok(DeleteObject(hgdiobj_event.hgdiobj2), "DeleteObject error %u\n", GetLastError()); + bRet = DeleteObject(hgdiobj_event.hgdiobj2); + ok(bRet, "DeleteObject error %u\n", GetLastError()); CloseHandle(hgdiobj_event.stop_event); CloseHandle(hgdiobj_event.ready_event); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 791714b..d036065 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -340,13 +340,17 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - ok(GetWindowOrgEx(hdc, &pt), "GetWindowOrgEx error %u\n", GetLastError()); + ret = GetWindowOrgEx(hdc, &pt); + ok(ret, "GetWindowOrgEx error %u\n", GetLastError()); trace("window org (%d,%d)\n", pt.x, pt.y); - ok(GetViewportOrgEx(hdc, &pt), "GetViewportOrgEx error %u\n", GetLastError()); + ret = GetViewportOrgEx(hdc, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); trace("vport org (%d,%d)\n", pt.x, pt.y); - ok(GetWindowExtEx(hdc, &size), "GetWindowExtEx error %u\n", GetLastError()); + ret = GetWindowExtEx(hdc, &size); + ok(ret, "GetWindowExtEx error %u\n", GetLastError()); trace("window ext (%d,%d)\n", size.cx, size.cy); - ok(GetViewportExtEx(hdc, &size), "GetViewportExtEx error %u\n", GetLastError()); + ret = GetViewportExtEx(hdc, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); trace("vport ext (%d,%d)\n", size.cx, size.cy); } else @@ -458,13 +462,17 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - ok(GetWindowOrgEx(hdc, &pt), "GetWindowOrgEx error %u\n", GetLastError()); + ret = GetWindowOrgEx(hdc, &pt); + ok(ret, "GetWindowOrgEx error %u\n", GetLastError()); trace("window org (%d,%d)\n", pt.x, pt.y); - ok(GetViewportOrgEx(hdc, &pt), "GetViewportOrgEx error %u\n", GetLastError()); + ret = GetViewportOrgEx(hdc, &pt); + ok(ret, "GetViewportOrgEx error %u\n", GetLastError()); trace("vport org (%d,%d)\n", pt.x, pt.y); - ok(GetWindowExtEx(hdc, &size), "GetWindowExtEx error %u\n", GetLastError()); + ret = GetWindowExtEx(hdc, &size); + ok(ret, "GetWindowExtEx error %u\n", GetLastError()); trace("window ext (%d,%d)\n", size.cx, size.cy); - ok(GetViewportExtEx(hdc, &size), "GetViewportExtEx error %u\n", GetLastError()); + ret = GetViewportExtEx(hdc, &size); + ok(ret, "GetViewportExtEx error %u\n", GetLastError()); trace("vport ext (%d,%d)\n", size.cx, size.cy); } else diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 640ffc0..db0b60b 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -475,6 +475,8 @@ static void test_ps_alternate(void) HBITMAP bmp; HPEN pen; LOGBRUSH lb; + INT iRet; + HGDIOBJ hRet; lb.lbStyle = BS_SOLID; lb.lbColor = RGB(0xff,0xff,0xff); @@ -490,9 +492,12 @@ static void test_ps_alternate(void) ok(hdc != NULL, "gle=%d\n", GetLastError()); bmp = CreateBitmap(8, 1, 1, 1, NULL); ok(bmp != NULL, "gle=%d\n", GetLastError()); - ok(SelectObject(hdc, bmp) != NULL, "gle=%d\n", GetLastError()); - ok(SelectObject(hdc, pen) != NULL, "gle=%d\n", GetLastError()); - ok(SetBkMode(hdc, TRANSPARENT), "gle=%d\n", GetLastError()); + hRet = SelectObject(hdc, bmp); + ok(hRet != NULL, "gle=%d\n", GetLastError()); + hRet = SelectObject(hdc, pen); + ok(hRet != NULL, "gle=%d\n", GetLastError()); + iRet = SetBkMode(hdc, TRANSPARENT); + ok(iRet, "gle=%d\n", GetLastError()); TEST_LINE(0, 1, "10000000") TEST_LINE(0, 2, "10000000")

1 0

Hwang YunSong : progman: Update Korean resource.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 267582a7aa190643f5b1990d9a37091aa911d012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267582a7aa190643f5b1990d9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Jan 2 21:06:52 2011 +0900 progman: Update Korean resource. --- programs/progman/Ko.rc | 203 +++++++++++++++++++++++++----------------------- 1 files changed, 106 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=267582a7aa190643f5b19…

1 0

Jeremy Chin : wined3d: Update detection of vertex blend capabilities.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: f41fdb225cf1e1df494237664ce92e51179f3725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41fdb225cf1e1df494237664… Author: Jeremy Chin <rekless(a)fastmail.fm> Date: Sun Jan 2 20:41:12 2011 +1100 wined3d: Update detection of vertex blend capabilities. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index da179a7..2b7e5ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2318,7 +2318,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) TRACE_(d3d_caps)("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers); TRACE_(d3d_caps)("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); } - if (gl_info->supported[ARB_VERTEX_BLEND]) + if (gl_info->supported[ARB_VERTEX_BLEND] || gl_info->supported[ARB_VERTEX_PROGRAM]) { glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max); gl_info->limits.blends = gl_max;

1 0

André Hentschel : advapi32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: b49e1c299438cf2b08dbf87b76a865c1de9b74d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49e1c299438cf2b08dbf87b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 2 18:48:08 2011 +0100 advapi32/tests: Don't test function directly when reporting GetLastError(). --- dlls/advapi32/tests/security.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ff07513..5810752 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2318,9 +2318,9 @@ static void test_process_security_child(void) ok(handle != NULL, "OpenProcess(PROCESS_TERMINATE) with err:%d\n", GetLastError()); TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE ); - ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), - &handle1, 0, TRUE, DUPLICATE_SAME_ACCESS ), - "duplicating handle err:%d\n", GetLastError()); + ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), + &handle1, 0, TRUE, DUPLICATE_SAME_ACCESS ); + ok(ret, "duplicating handle err:%d\n", GetLastError()); TEST_GRANTED_ACCESS( handle1, PROCESS_TERMINATE ); CloseHandle( handle1 ); @@ -2344,23 +2344,23 @@ static void test_process_security_child(void) ok(handle == NULL, "OpenProcess(PROCESS_ALL_ACCESS) should have failed\n"); /* Documented privilege elevation */ - ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), - &handle, 0, TRUE, DUPLICATE_SAME_ACCESS ), - "duplicating handle err:%d\n", GetLastError()); + ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &handle, 0, TRUE, DUPLICATE_SAME_ACCESS ); + ok(ret, "duplicating handle err:%d\n", GetLastError()); TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL ); CloseHandle( handle ); /* Same only explicitly asking for all access rights */ - ok(DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), - &handle, PROCESS_ALL_ACCESS, TRUE, 0 ), - "duplicating handle err:%d\n", GetLastError()); + ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &handle, PROCESS_ALL_ACCESS, TRUE, 0 ); + ok(ret, "duplicating handle err:%d\n", GetLastError()); TEST_GRANTED_ACCESS2( handle, PROCESS_ALL_ACCESS, PROCESS_ALL_ACCESS | PROCESS_QUERY_LIMITED_INFORMATION ); - ok(DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), - &handle1, PROCESS_VM_READ, TRUE, 0 ), - "duplicating handle err:%d\n", GetLastError()); + ret = DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), + &handle1, PROCESS_VM_READ, TRUE, 0 ); + ok(ret, "duplicating handle err:%d\n", GetLastError()); TEST_GRANTED_ACCESS( handle1, PROCESS_VM_READ ); CloseHandle( handle1 ); CloseHandle( handle );

1 0

Henri Verbeet : wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_autogen_filter_type ().
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 9de4433dbe889d921d8402846ce51caf32e6cb06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de4433dbe889d921d8402846… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 2 12:26:38 2011 +0100 wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_get_autogen_filter_type(). --- dlls/wined3d/basetexture.c | 8 +++----- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d1c27e8..0c3a67a 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -218,13 +218,11 @@ HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTextureImpl *texture, WI return WINED3D_OK; } -WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) +WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - - FIXME("(%p) : stub\n", This); + TRACE("texture %p.\n", texture); - return This->baseTexture.filterType; + return texture->baseTexture.filterType; } void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 8dc2579..8ef8320 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -265,8 +265,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_SetAutoGenFilterType(IWineD3DCubeT return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } -static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface) { - return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); +static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DCubeTextureImpl_GetAutoGenFilterType(IWineD3DCubeTexture *iface) +{ + return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } static void WINAPI IWineD3DCubeTextureImpl_GenerateMipSubLevels(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 63cf182..a4b7b36 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -256,8 +256,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_SetAutoGenFilterType(IWineD3DTexture * return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } -static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface) { - return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); +static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DTextureImpl_GetAutoGenFilterType(IWineD3DTexture *iface) +{ + return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } static void WINAPI IWineD3DTextureImpl_GenerateMipSubLevels(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index a69049d..3d02895 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -220,8 +220,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetAutoGenFilterType(IWineD3DVol return basetexture_set_autogen_filter_type((IWineD3DBaseTextureImpl *)iface, FilterType); } -static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface) { - return basetexture_get_autogen_filter_type((IWineD3DBaseTexture *)iface); +static WINED3DTEXTUREFILTERTYPE WINAPI IWineD3DVolumeTextureImpl_GetAutoGenFilterType(IWineD3DVolumeTexture *iface) +{ + return basetexture_get_autogen_filter_type((IWineD3DBaseTextureImpl *)iface); } static void WINAPI IWineD3DVolumeTextureImpl_GenerateMipSubLevels(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8647e8..23d1fd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1915,7 +1915,7 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; -WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; +WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_level_count(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; DWORD basetexture_get_lod(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture,

1 0