April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : libwine: Only use the last line of the git version description.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 85241fbe5bdd76aaeff8dc74b41a0a3fb2b2c949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85241fbe5bdd76aaeff8dc74b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 17:38:27 2008 +0200 libwine: Only use the last line of the git version description. --- libs/wine/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index ea74396..8b614d7 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -176,7 +176,7 @@ uninstall:: libwine.so.$(SOVERSION) libwine.dylib libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib version-stamp: dummy - (GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -e 's/$.*$/const char wine_build[] = "\1";/' >$@ || ($(RM) $@ && exit 1) + (GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p' >$@ || ($(RM) $@ && exit 1) version.c: version-stamp @cmp -s version-stamp $@ || cp version-stamp $@

1 0

Alexandre Julliard : user32: Fix list_window_parents when run in the desktop process.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: cf4c2e0b5453c0297ea749dd841e7587c99feb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4c2e0b5453c0297ea749dd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 7 20:34:24 2008 +0200 user32: Fix list_window_parents when run in the desktop process. --- dlls/user32/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index aa5bd87..a1f3024 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -274,6 +274,7 @@ static HWND *list_window_parents( HWND hwnd ) } list[pos] = current = win->parent; WIN_ReleasePtr( win ); + if (!current) return list; if (++pos == size - 1) { /* need to grow the list */

1 0

Dmitry Timoshkov : gdi32: Fix lfWidth before caching the font to avoid duplicate entries in the cache .
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: c5d07b7c228e3243e39859669b66a50c8871952b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d07b7c228e3243e39859669… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 21:23:55 2008 +0900 gdi32: Fix lfWidth before caching the font to avoid duplicate entries in the cache. --- dlls/gdi32/freetype.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index be8688a..b00bc71 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3120,6 +3120,8 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) LeaveCriticalSection( &freetype_cs ); return NULL; } + lf.lfWidth = abs(lf.lfWidth); + can_use_bitmap = GetDeviceCaps(dc->hSelf, TEXTCAPS) & TC_RA_ABLE; TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", @@ -3382,7 +3384,7 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->aveWidth = height ? abs(lf.lfWidth) : 0; + ret->aveWidth = height ? lf.lfWidth : 0; if(!face->scalable) { /* Windows uses integer scaling factors for bitmap fonts */

1 0

Dmitry Timoshkov : gdi32: Move negative lfWidth test into a separate body, skip the test if there is no 'x' in the font.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0fdd381f26b6c03008235b4481e9561f7c6a99da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdd381f26b6c03008235b448… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 21:24:47 2008 +0900 gdi32: Move negative lfWidth test into a separate body, skip the test if there is no 'x' in the font. --- dlls/gdi32/tests/font.c | 108 +++++++++++++++++++++++++++++------------------ 1 files changed, 67 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a91adcb..ef250d9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1494,6 +1494,71 @@ else ReleaseDC(0, hdc); } +static void test_negative_width(HDC hdc, const LOGFONTA *lf) +{ + HFONT hfont, hfont_prev; + DWORD ret; + GLYPHMETRICS gm1, gm2; + LOGFONTA lf2 = *lf; + WORD idx; + MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; + + /* negative widths are handled just as positive ones */ + lf2.lfWidth = -lf->lfWidth; + + SetLastError(0xdeadbeef); + hfont = CreateFontIndirectA(lf); + ok(hfont != 0, "CreateFontIndirect error %u\n", GetLastError()); + check_font("original", lf, hfont); + + hfont_prev = SelectObject(hdc, hfont); + + ret = GetGlyphIndicesA(hdc, "x", 1, &idx, GGI_MARK_NONEXISTING_GLYPHS); + if (ret == GDI_ERROR || idx == 0xffff) + { + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + skip("This font doesn't contain 'x', skipping the test\n"); + return; + } + + /* filling with 0xaa causes false pass under WINEDEBUG=warn+heap */ + memset(&gm1, 0xab, sizeof(gm1)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + + SetLastError(0xdeadbeef); + hfont = CreateFontIndirectA(&lf2); + ok(hfont != 0, "CreateFontIndirect error %u\n", GetLastError()); + check_font("negative width", &lf2, hfont); + + hfont_prev = SelectObject(hdc, hfont); + + memset(&gm2, 0xbb, sizeof(gm2)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + + ok(gm1.gmBlackBoxX == gm2.gmBlackBoxX && + gm1.gmBlackBoxY == gm2.gmBlackBoxY && + gm1.gmptGlyphOrigin.x == gm2.gmptGlyphOrigin.x && + gm1.gmptGlyphOrigin.y == gm2.gmptGlyphOrigin.y && + gm1.gmCellIncX == gm2.gmCellIncX && + gm1.gmCellIncY == gm2.gmCellIncY, + "gm1=%d,%d,%d,%d,%d,%d gm2=%d,%d,%d,%d,%d,%d\n", + gm1.gmBlackBoxX, gm1.gmBlackBoxY, gm1.gmptGlyphOrigin.x, + gm1.gmptGlyphOrigin.y, gm1.gmCellIncX, gm1.gmCellIncY, + gm2.gmBlackBoxX, gm2.gmBlackBoxY, gm2.gmptGlyphOrigin.x, + gm2.gmptGlyphOrigin.y, gm2.gmCellIncX, gm2.gmCellIncY); +} + /* PANOSE is 10 bytes in size, need to pack the structure properly */ #include "pshpack2.h" typedef struct @@ -1578,47 +1643,6 @@ static void test_text_metrics(const LOGFONTA *lf) hfont_old = SelectObject(hdc, hfont); - if(lf->lfWidth > 0) { - HFONT hfont2, hfont_prev; - GLYPHMETRICS gm1, gm2; - LOGFONTA lf2 = *lf; - MAT2 mat2 = { {0,1}, {0,0}, {0,0}, {0,1} }; - - /* negative widths are handled just as positive ones */ - lf2.lfWidth *= -1; - - SetLastError(0xdeadbeef); - hfont2 = CreateFontIndirectA(&lf2); - ok(hfont2 != 0, "CreateFontIndirect error %u\n", GetLastError()); - hfont_prev = SelectObject(hdc, hfont2); - - /* filling with 0xaa causes false pass under WINEDEBUG=warn+heap */ - memset(&gm1, 0xab, sizeof(gm1)); - SetLastError(0xdeadbeef); - ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm1, 0, NULL, &mat2); - ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); - - SelectObject(hdc, hfont_prev); - DeleteObject(hfont2); - - memset(&gm2, 0xbb, sizeof(gm2)); - SetLastError(0xdeadbeef); - ret = GetGlyphOutlineA(hdc, 'x', GGO_METRICS, &gm2, 0, NULL, &mat2); - ok(ret != GDI_ERROR, "GetGlyphOutline error 0x%x\n", GetLastError()); - - ok(gm1.gmBlackBoxX == gm2.gmBlackBoxX && - gm1.gmBlackBoxY == gm2.gmBlackBoxY && - gm1.gmptGlyphOrigin.x == gm2.gmptGlyphOrigin.x && - gm1.gmptGlyphOrigin.y == gm2.gmptGlyphOrigin.y && - gm1.gmCellIncX == gm2.gmCellIncX && - gm1.gmCellIncY == gm2.gmCellIncY, - "gm1=%d,%d,%d,%d,%d,%d gm2=%d,%d,%d,%d,%d,%d\n", - gm1.gmBlackBoxX, gm1.gmBlackBoxY, gm1.gmptGlyphOrigin.x, - gm1.gmptGlyphOrigin.y, gm1.gmCellIncX, gm1.gmCellIncY, - gm2.gmBlackBoxX, gm2.gmBlackBoxY, gm2.gmptGlyphOrigin.x, - gm2.gmptGlyphOrigin.y, gm2.gmCellIncX, gm2.gmCellIncY); - } - size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); if (size == GDI_ERROR) { @@ -1711,6 +1735,8 @@ static void test_text_metrics(const LOGFONTA *lf) tmW.tmDigitizedAspectX, ret); } + test_negative_width(hdc, lf); + end_of_test: SelectObject(hdc, hfont_old); DeleteObject(hfont);

1 0

Dmitry Timoshkov : winex11.drv: Do not set window type to utility to avoid a Metacity bug.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 1bf824e0b00d2b179d5f34dd0c7ace83e83bd28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf824e0b00d2b179d5f34dd0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 7 22:17:47 2008 +0900 winex11.drv: Do not set window type to utility to avoid a Metacity bug. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 919879a..09ef8de 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -947,7 +947,9 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); +#if 0 /* many window managers don't handle utility windows very well */ else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); +#endif XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0

Marcus Meissner : adjusted my entry in who
by Jeremy Newman 07 Apr '08

07 Apr '08

Module: website Branch: master Commit: 0f5a96951700cb243e3e2c8a3aa97dce9330b22c URL: http://source.winehq.org/git/website.git/?a=commit;h=0f5a96951700cb243e3e2c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 6 19:36:03 2008 +0200 adjusted my entry in who --- templates/en/who.template | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/en/who.template b/templates/en/who.template index 76cb502..70fe288 100644 --- a/templates/en/who.template +++ b/templates/en/who.template @@ -347,8 +347,8 @@ Please email additions, corrections, and flames to <h3>Marcus Meissner</h3><blockquote> <table border="0"><tr> - <td width="300"><b>Location:</b> Erlangen, Germany<br /></td> - <td><b>IRC Nick:</b> _marcus_</td></tr> + <td width="300"><b>Location:</b> Nürnberg, Germany<br /></td> + <td><b>IRC Nick:</b> _Marcus_</td></tr> <tr><td> <b>Email:</b> marcus -at- jet dot franken dot de </td> <td><b>Interview:</b> <a href="http://www.winehq.org/?interview=3">#3</a></td></tr></table> @@ -357,14 +357,15 @@ Please email additions, corrections, and flames to of patches and bugfixes. He is personally to blame for the first revisions of reading and saving the Registry, starting the DirectX implementation, doing the second OLE out of process COM support - implementation, and more. + implementation, and more. In these times he is taking care that + the SUSE Wine RPMs get build and some small bug fixes. </p><p> Marcus studied computer science at the University of Erlangen and graduated in 1997. After doing civil duty, he started working as Senior Developer for Caldera Systems in 1999, working on distribution development. After Caldera closed its development office - in 2002 he started and is now working for the SuSE Linux AG as a - Developer in the PowerPC group. + in 2002 he started and is now working for the SUSE Linux Products GmbH as a + Teamlead of the Security Team. </p></blockquote> <h3>Andreas Mohr</h3><blockquote>

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8a18e0e43a1b7e5acddc5ed9aa76fcc7f07d9a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a18e0e43a1b7e5acddc5ed9a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 13:01:02 2008 +0200 Assorted spelling fixes. --- dlls/kernel32/nls/rmc.nls | 2 +- dlls/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/vartest.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/user32/tests/winstation.c | 4 ++-- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/ati_fragment_shader.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 4 ++-- dlls/winedos/int31.c | 2 +- dlls/wineoss.drv/midi.c | 2 +- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 8 ++++---- programs/cmd/directory.c | 2 +- programs/notepad/dialog.c | 2 +- programs/notepad/main.c | 2 +- programs/services/services.c | 4 ++-- programs/taskmgr/taskmgr.h | 2 +- programs/winecfg/libraries.c | 4 ++-- programs/winedbg/be_cpu.h | 6 +++--- programs/winedbg/be_i386.c | 2 +- programs/winedbg/winedbg.c | 2 +- programs/xcopy/xcopy.c | 2 +- server/atom.c | 2 +- server/change.c | 2 +- tools/wrc/genres.c | 2 +- 26 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a18e0e43a1b7e5acddc5…

1 0

Francois Gouget : fusion/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e1ee7a3b8b17f56fd282d89c89017a6b981b6d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ee7a3b8b17f56fd282d89c8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:32 2008 +0200 fusion/tests: Fix compilation on systems that don't support nameless unions. --- dlls/fusion/tests/asmcache.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index eac2109..75b71dc 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -809,16 +809,16 @@ static void create_assembly(LPCSTR file) DWORD written; /* nameless unions initialized here */ - assembly.tableshdr.MaskValid.HighPart = 0x101; - assembly.tableshdr.MaskValid.LowPart = 0x00000005; - assembly.tableshdr.MaskSorted.HighPart = 0x1600; - assembly.tableshdr.MaskSorted.LowPart = 0x3301FA00; - assembly.labelres.Name = 0x10; - assembly.labelres.OffsetToData = 0x80000018; - assembly.label11res.Name = 0x1; - assembly.label11res.OffsetToData = 0x80000030; - assembly.label10res.Name = 0x0; - assembly.label10res.OffsetToData = 0x48; + assembly.tableshdr.MaskValid.u.HighPart = 0x101; + assembly.tableshdr.MaskValid.u.LowPart = 0x00000005; + assembly.tableshdr.MaskSorted.u.HighPart = 0x1600; + assembly.tableshdr.MaskSorted.u.LowPart = 0x3301FA00; + U1(assembly.labelres).Name = 0x10; + U2(assembly.labelres).OffsetToData = 0x80000018; + U1(assembly.label11res).Name = 0x1; + U2(assembly.label11res).OffsetToData = 0x80000030; + U1(assembly.label10res).Name = 0x0; + U2(assembly.label10res).OffsetToData = 0x48; hfile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0);

1 0

Andrew Talbot : advapi32: Do not call MIDL_user_free() with pointer to stack memory.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2ae8e87616d58fbcce647a013679b8b48dc35e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ae8e87616d58fbcce647a013… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 5 23:46:41 2008 +0100 advapi32: Do not call MIDL_user_free() with pointer to stack memory. --- dlls/advapi32/service.c | 16 ++++++++++------ dlls/advapi32/tests/service.c | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 77dc30b..78d057d 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1352,15 +1352,19 @@ done: static DWORD move_string_to_buffer(BYTE **buf, LPWSTR *string_ptr) { DWORD cb; - WCHAR empty_str[] = {0}; if (!*string_ptr) - *string_ptr = empty_str; - - cb = (strlenW(*string_ptr) + 1)*sizeof(WCHAR); + { + cb = sizeof(WCHAR); + memset(*buf, 0, cb); + } + else + { + cb = (strlenW(*string_ptr) + 1)*sizeof(WCHAR); + memcpy(*buf, *string_ptr, cb); + MIDL_user_free(*string_ptr); + } - memcpy(*buf, *string_ptr, cb); - MIDL_user_free(*string_ptr); *string_ptr = (LPWSTR)*buf; *buf += cb; diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 5eaf2f4..d299d2d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -857,12 +857,12 @@ static void test_sequence(void) SetLastError(0xdeadbeef); ret = QueryServiceConfigA(svc_handle, config, given, &needed); ok(ret, "Expected success\n"); - todo_wine - { ok(GetLastError() == ERROR_SUCCESS /* W2K3 */|| GetLastError() == 0xdeadbeef /* NT4, XP, Vista */ || GetLastError() == ERROR_IO_PENDING /* W2K */, "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + todo_wine + { ok(given == needed, "Expected the given (%d) and needed (%d) buffersizes to be equal\n", given, needed); } ok(config->lpBinaryPathName && config->lpLoadOrderGroup && config->lpDependencies && config->lpServiceStartName &&

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 0d0c4a355b06fecf5860b1c1d51335b61de9f8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0c4a355b06fecf5860b1c1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 7 11:03:27 2008 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 41d6062..b63231b 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1733,13 +1733,13 @@ static void p8_surface_fill_rect(IDirectDrawSurface *dest, UINT x, UINT y, UINT hr = IDirectDrawSurface_Lock(dest, NULL, &ddsd, DDLOCK_WRITEONLY | DDLOCK_WAIT, NULL); ok(hr==DD_OK, "IDirectDrawSurface_Lock returned: %x\n", hr); - p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + p = (BYTE *)ddsd.lpSurface + U1(ddsd).lPitch * y + x; for (i = 0; i < h; i++) { for (i1 = 0; i1 < w; i1++) { p[i1] = colorindex; } - p += ddsd.lPitch; + p += U1(ddsd).lPitch; } hr = IDirectDrawSurface_Unlock(dest, NULL); @@ -1956,11 +1956,11 @@ static void p8_primary_test() for (i = 0; i < 256; i++) { unsigned x = (i % 128) * 4; unsigned y = (i / 128) * 4; - BYTE *p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + BYTE *p = (BYTE *)ddsd.lpSurface + U1(ddsd).lPitch * y + x; for (i1 = 0; i1 < 4; i1++) { p[0] = p[1] = p[2] = p[3] = i; - p += ddsd.lPitch; + p += U1(ddsd).lPitch; } } @@ -2007,7 +2007,7 @@ static void p8_primary_test() for (i = 0; i < 256; i++) { unsigned x = (i % 128) * 4 + 1; unsigned y = (i / 128) * 4 + 1; - BYTE *p = (BYTE *)ddsd.lpSurface + ddsd.lPitch * y + x; + BYTE *p = (BYTE *)ddsd.lpSurface + U1(ddsd).lPitch * y + x; if (*p != i) differences++; } @@ -2086,24 +2086,24 @@ static void cubemap_test(IDirect3DDevice7 *device) memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; ddsd.dwWidth = 16; ddsd.dwHeight = 16; ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES | DDSCAPS2_TEXTUREMANAGE; - ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; - ddsd.ddpfPixelFormat.dwRGBBitCount = 32; - ddsd.ddpfPixelFormat.dwRBitMask = 0x00FF0000; - ddsd.ddpfPixelFormat.dwGBitMask = 0x0000FF00; - ddsd.ddpfPixelFormat.dwBBitMask = 0x000000FF; + U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; + U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; + U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &cubemap, NULL); ok(hr == DD_OK, "IDirectDraw7_CreateSurface returned %08x\n", hr); IDirectDraw7_Release(ddraw); /* Positive X */ - DDBltFx.dwFillColor = 0x00ff0000; + U5(DDBltFx).dwFillColor = 0x00ff0000; hr = IDirectDrawSurface7_Blt(cubemap, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); @@ -2112,35 +2112,35 @@ static void cubemap_test(IDirect3DDevice7 *device) caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x0000ffff; + U5(DDBltFx).dwFillColor = 0x0000ffff; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x0000ff00; + U5(DDBltFx).dwFillColor = 0x0000ff00; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x000000ff; + U5(DDBltFx).dwFillColor = 0x000000ff; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x00ffff00; + U5(DDBltFx).dwFillColor = 0x00ffff00; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); caps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY; hr = IDirectDrawSurface_GetAttachedSurface(cubemap, &caps, &surface); ok(hr == DD_OK, "IDirectDrawSurface7_Lock returned %08x\n", hr); - DDBltFx.dwFillColor = 0x00ff00ff; + U5(DDBltFx).dwFillColor = 0x00ff00ff; hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL, &DDBltFx); ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr);

1 0