September 2011 - Wine-Commits

Francois Gouget : taskmgr: Fix the name of a couple of process priority levels.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_material() const.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 9ae5d06e7786297afc87ca01ee31aa7a5ad481cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ae5d06e7786297afc87ca01e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 4 22:43:52 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_material() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6b74a82..966beb5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2336,7 +2336,7 @@ HRESULT CDECL wined3d_device_set_material(struct wined3d_device *device, const W return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_material(struct wined3d_device *device, WINED3DMATERIAL *material) +HRESULT CDECL wined3d_device_get_material(const struct wined3d_device *device, WINED3DMATERIAL *material) { TRACE("device %p, material %p.\n", device, material); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6f7503c..f25a0f5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2224,7 +2224,7 @@ void __cdecl wined3d_device_get_gamma_ramp(struct wined3d_device *device, UINT s HRESULT __cdecl wined3d_device_get_index_buffer(struct wined3d_device *device, struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable); -HRESULT __cdecl wined3d_device_get_material(struct wined3d_device *device, WINED3DMATERIAL *material); +HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, WINED3DMATERIAL *material); float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device, UINT palette_idx, PALETTEENTRY *entries);

1 0

Alexandre Julliard : ntdll: Add support for asmv1 namespace prefix in xml elements.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 4b27371392e1b594eede01c08e18ff1526744d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b27371392e1b594eede01c08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 4 19:40:51 2011 +0200 ntdll: Add support for asmv1 namespace prefix in xml elements. --- dlls/ntdll/actctx.c | 80 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 51 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b27371392e1b594eede0…

1 0

Henri Verbeet : wined3d: Get rid of the rect checks for present in IWineD3DSurfaceImpl_BltOverride( ).
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 3346fc747c6ca7842a6cd8cc12f9793cb39ae701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3346fc747c6ca7842a6cd8cc1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 4 22:43:50 2011 +0200 wined3d: Get rid of the rect checks for present in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 55 +---------------------------------------------- 1 files changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b8ff92d..de97735 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5321,61 +5321,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa /* Half-Life does a Blt from the back buffer to the front buffer, * Full surface size, no flags... Use present instead * - * This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer - */ - - /* Check rects - wined3d_swapchain_present() doesn't handle them. */ + * This path will only be entered for d3d7 and ddraw apps, because + * d3d8/9 offer no way to blit to the front buffer. */ for (;;) { - TRACE("Looking if a Present can be done...\n"); - /* Source Rectangle must be full surface */ - if (src_rect->left || src_rect->top - || src_rect->right != src_surface->resource.width - || src_rect->bottom != src_surface->resource.height) - { - TRACE("No, Source rectangle doesn't match\n"); - break; - } - - /* No stretching may occur */ - if (src_rect->right != dst_rect->right - dst_rect->left - || src_rect->bottom != dst_rect->bottom - dst_rect->top) - { - TRACE("No, stretching is done\n"); - break; - } - - /* Destination must be full surface or match the clipping rectangle */ - if (dst_surface->clipper && dst_surface->clipper->hWnd) - { - RECT cliprect; - POINT pos[2]; - GetClientRect(dst_surface->clipper->hWnd, &cliprect); - pos[0].x = dst_rect->left; - pos[0].y = dst_rect->top; - pos[1].x = dst_rect->right; - pos[1].y = dst_rect->bottom; - MapWindowPoints(GetDesktopWindow(), dst_surface->clipper->hWnd, pos, 2); - - if (pos[0].x != cliprect.left || pos[0].y != cliprect.top - || pos[1].x != cliprect.right || pos[1].y != cliprect.bottom) - { - TRACE("No, dest rectangle doesn't match(clipper)\n"); - TRACE("Clip rect at %s\n", wine_dbgstr_rect(&cliprect)); - TRACE("Blt dest: %s\n", wine_dbgstr_rect(dst_rect)); - break; - } - } - else if (dst_rect->left || dst_rect->top - || dst_rect->right != dst_surface->resource.width - || dst_rect->bottom != dst_surface->resource.height) - { - TRACE("No, dest rectangle doesn't match(surface size)\n"); - break; - } - - TRACE("Yes\n"); - /* These flags are unimportant for the flag check, remove them */ if (!(flags & ~(WINEDDBLT_DONOTWAIT | WINEDDBLT_WAIT))) {

1 0

Alexandre Julliard : libwine: Disable debug output when stderr goes to /dev /null.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 794b9313a4ba288273f38a9d9d4de021af3e96fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=794b9313a4ba288273f38a9d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 4 23:08:10 2011 +0200 libwine: Disable debug output when stderr goes to /dev/null. --- libs/wine/debug.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 12dbeb8..a38abf4 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -26,6 +26,9 @@ #include <stdarg.h> #include <string.h> #include <ctype.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include "wine/debug.h" #include "wine/library.h" @@ -186,9 +189,19 @@ static void debug_usage(void) static void debug_init(void) { char *wine_debug; + struct stat st1, st2; if (nb_debug_options != -1) return; /* already initialized */ nb_debug_options = 0; + + /* check for stderr pointing to /dev/null */ + if (!fstat( 2, &st1 ) && S_ISCHR(st1.st_mode) && + !stat( "/dev/null", &st2 ) && S_ISCHR(st2.st_mode) && + st1.st_rdev == st2.st_rdev) + { + default_flags = 0; + return; + } if ((wine_debug = getenv("WINEDEBUG"))) { if (!strcmp( wine_debug, "help" )) debug_usage();

1 0

Andrew Talbot : winealsa.drv: Remove unneeded address-of operators from function name.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 99b8ee10d166eb66a0c3f36bbad1048070df00a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99b8ee10d166eb66a0c3f36bb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Sep 2 21:48:21 2011 +0100 winealsa.drv: Remove unneeded address-of operators from function name. --- dlls/winealsa.drv/mixer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index e28361c..0541637 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -344,7 +344,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ mline->elem = mastelem; mline->chans = chans(mmixer, mastelem, 0); - snd_mixer_elem_set_callback(mastelem, &elem_callback); + snd_mixer_elem_set_callback(mastelem, elem_callback); snd_mixer_elem_set_callback_private(mastelem, mmixer); } else { MultiByteToWideChar(CP_UNIXCP, 0, "Empty Master Element", -1, mline->name, sizeof(mline->name)/sizeof(WCHAR)); @@ -366,7 +366,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ mline->elem = captelem; mline->chans = chans(mmixer, captelem, 1); - snd_mixer_elem_set_callback(captelem, &elem_callback); + snd_mixer_elem_set_callback(captelem, elem_callback); snd_mixer_elem_set_callback_private(captelem, mmixer); } @@ -397,7 +397,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ mline->chans = chans(mmixer, elem, 1); } - snd_mixer_elem_set_callback(elem, &elem_callback); + snd_mixer_elem_set_callback(elem, elem_callback); snd_mixer_elem_set_callback_private(elem, mmixer); } } @@ -413,7 +413,7 @@ static void filllines_no_master(mixer *mmixer, snd_mixer_elem_t *captelem, int c mline->elem = captelem; mline->chans = chans(mmixer, captelem, 1); - snd_mixer_elem_set_callback(captelem, &elem_callback); + snd_mixer_elem_set_callback(captelem, elem_callback); snd_mixer_elem_set_callback_private(captelem, mmixer); }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_clip_status() const.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 23b4be9155d9eba6473f2eb0a5a45471c6312b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b4be9155d9eba6473f2eb0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 4 22:43:51 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_clip_status() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6ab48f0..6b74a82 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2307,7 +2307,7 @@ HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, cons return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_clip_status(struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status) +HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status) { FIXME("device %p, clip_status %p stub!\n", device, clip_status); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b519348..6f7503c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2209,7 +2209,7 @@ HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UI UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); -HRESULT __cdecl wined3d_device_get_clip_status(struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); +HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *device, WINED3DDEVICE_CREATION_PARAMETERS *creation_parameters); HRESULT __cdecl wined3d_device_get_current_texture_palette(struct wined3d_device *device, UINT *palette_idx);

1 0

Henri Verbeet : wined3d: Don't print the GLSL info log by default on fglrx.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 74b418c9e0a9d40e01b9a22bf9d3b4e652223da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b418c9e0a9d40e01b9a22bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 4 22:43:49 2011 +0200 wined3d: Don't print the GLSL info log by default on fglrx. --- dlls/wined3d/directx.c | 16 +++++++++++++ dlls/wined3d/glsl_shader.c | 49 +++++++++------------------------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 116f1be..11582d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -774,6 +774,12 @@ static BOOL match_broken_rgba16(const struct wined3d_gl_info *gl_info, const cha return size < 16; } +static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, + enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +{ + return gl_vendor == GL_VENDOR_FGLRX; +} + static void quirk_arb_constants(struct wined3d_gl_info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->limits.arb_vs_native_constants); @@ -891,6 +897,11 @@ static void quirk_broken_rgba16(struct wined3d_gl_info *gl_info) gl_info->quirks |= WINED3D_QUIRK_BROKEN_RGBA16; } +static void quirk_infolog_spam(struct wined3d_gl_info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_INFO_LOG_SPAM; +} + struct driver_quirk { BOOL (*match)(const struct wined3d_gl_info *gl_info, const char *gl_renderer, @@ -975,6 +986,11 @@ static const struct driver_quirk quirk_table[] = quirk_broken_rgba16, "True RGBA16 is not available" }, + { + match_fglrx, + quirk_infolog_spam, + "Not printing GLSL infolog" + }, }; /* Certain applications (Steam) complain if we report an outdated driver version. In general, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ee7c3b7..837b7d4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -198,26 +198,9 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA { int infologLength = 0; char *infoLog; - unsigned int i; - BOOL is_spam; - - static const char * const spam[] = - { - "Vertex shader was successfully compiled to run on hardware.\n", /* fglrx */ - "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx, with \n */ - "Fragment shader was successfully compiled to run on hardware.", /* fglrx, no \n */ - "Fragment shader(s) linked, vertex shader(s) linked. \n ", /* fglrx, with \n */ - "Fragment shader(s) linked, vertex shader(s) linked. \n", /* fglrx, with \n */ - "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ - "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ - "Vertex shader(s) linked, no fragment shader(s) defined. \n", /* fglrx, with \n */ - "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ - "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ - "Fragment shader(s) linked, no vertex shader(s) defined. \n", /* fglrx, with \n */ - "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ - }; - if (!TRACE_ON(d3d_shader) && !FIXME_ON(d3d_shader)) return; + if (!WARN_ON(d3d_shader) && !FIXME_ON(d3d_shader)) + return; GL_EXTCALL(glGetObjectParameterivARB(obj, GL_OBJECT_INFO_LOG_LENGTH_ARB, @@ -229,31 +212,23 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA { char *ptr, *line; - /* Fglrx doesn't terminate the string properly, but it tells us the proper length. - * So use HEAP_ZERO_MEMORY to avoid uninitialized bytes - */ - infoLog = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, infologLength); + infoLog = HeapAlloc(GetProcessHeap(), 0, infologLength); + /* The info log is supposed to be zero-terminated, but at least some + * versions of fglrx don't terminate the string properly. The reported + * length does include the terminator, so explicitly set it to zero + * here. */ + infoLog[infologLength - 1] = 0; GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); - is_spam = FALSE; - - for (i = 0; i < sizeof(spam) / sizeof(*spam); ++i) - { - if (!strcmp(infoLog, spam[i])) - { - is_spam = TRUE; - break; - } - } ptr = infoLog; - if (is_spam) + if (gl_info->quirks & WINED3D_QUIRK_INFO_LOG_SPAM) { - TRACE("Spam received from GLSL shader #%u:\n", obj); - while ((line = get_info_log_line(&ptr))) TRACE(" %s\n", line); + WARN("Info log received from GLSL shader #%u:\n", obj); + while ((line = get_info_log_line(&ptr))) WARN(" %s\n", line); } else { - FIXME("Error received from GLSL shader #%u:\n", obj); + FIXME("Info log received from GLSL shader #%u:\n", obj); while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); } HeapFree(GetProcessHeap(), 0, infoLog); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e210ca1..fd2bedc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -52,6 +52,7 @@ #define WINED3D_QUIRK_NV_CLIP_BROKEN 0x00000010 #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 #define WINED3D_QUIRK_BROKEN_RGBA16 0x00000040 +#define WINED3D_QUIRK_INFO_LOG_SPAM 0x00000080 /* Texture format fixups */

1 0

Bruno Jesus : ws2_32: Fix a leak in WS2_AcceptEx.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 733c7f2c72053590da927e562d6fe9b5f943e610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733c7f2c72053590da927e562… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Sep 4 11:16:31 2011 -0300 ws2_32: Fix a leak in WS2_AcceptEx. --- dlls/ws2_32/socket.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a51b921..64abd93 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2046,7 +2046,11 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } SERVER_END_REQ; - if(status != STATUS_PENDING) HeapFree( GetProcessHeap(), 0, wsa ); + if(status != STATUS_PENDING) + { + HeapFree( GetProcessHeap(), 0, wsa->read ); + HeapFree( GetProcessHeap(), 0, wsa ); + } SetLastError( NtStatusToWSAError(status) ); return FALSE;

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 94532dbd08827c80b11459afb451b600728936e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94532dbd08827c80b11459afb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 3 14:57:16 2011 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/d3d.c | 16 ++++++++-------- dlls/ddraw/tests/dsurface.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 68d9604..3f0e8e5 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4382,9 +4382,9 @@ done: static void dump_format(const DDPIXELFORMAT *fmt) { trace("dwFlags %08x, FourCC %08x, dwZBufferBitDepth %u, stencil %08x\n", fmt->dwFlags, fmt->dwFourCC, - fmt->dwZBufferBitDepth, fmt->dwStencilBitDepth); - trace("dwZBitMask %08x, dwStencilBitMask %08x, dwRGBZBitMask %08x\n", fmt->dwZBitMask, - fmt->dwStencilBitMask, fmt->dwRGBZBitMask); + U1(*fmt).dwZBufferBitDepth, U2(*fmt).dwStencilBitDepth); + trace("dwZBitMask %08x, dwStencilBitMask %08x, dwRGBZBitMask %08x\n", U3(*fmt).dwZBitMask, + U4(*fmt).dwStencilBitMask, U5(*fmt).dwRGBZBitMask); } static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) @@ -4430,7 +4430,7 @@ static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - ddsd.ddpfPixelFormat = *fmt; + U4(ddsd).ddpfPixelFormat = *fmt; ddsd.dwWidth = 1024; ddsd.dwHeight = 1024; hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &surface, NULL); @@ -4446,13 +4446,13 @@ static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) /* 24 bit unpadded depth buffers are actually padded(Geforce 9600, Win7, * Radeon 9000M WinXP) */ - if (fmt->dwZBufferBitDepth == 24) expected_pitch = ddsd.dwWidth * 4; - else expected_pitch = ddsd.dwWidth * fmt->dwZBufferBitDepth / 8; + if (U1(*fmt).dwZBufferBitDepth == 24) expected_pitch = ddsd.dwWidth * 4; + else expected_pitch = ddsd.dwWidth * U1(*fmt).dwZBufferBitDepth / 8; /* Some formats(16 bit depth without stencil) return pitch 0 */ - if (ddsd.lPitch != 0 && ddsd.lPitch != expected_pitch) + if (U1(ddsd).lPitch != 0 && U1(ddsd).lPitch != expected_pitch) { - ok(0, "Z buffer pitch is %u, expected %u\n", ddsd.lPitch, expected_pitch); + ok(0, "Z buffer pitch is %u, expected %u\n", U1(ddsd).lPitch, expected_pitch); dump_format(fmt); } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b93dd14..38f579c 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3949,9 +3949,9 @@ static void no_ddsd_caps_test(void) static void dump_format(const DDPIXELFORMAT *fmt) { trace("dwFlags %08x, FourCC %08x, dwZBufferBitDepth %u, stencil %u\n", fmt->dwFlags, fmt->dwFourCC, - fmt->dwZBufferBitDepth, fmt->dwStencilBitDepth); - trace("dwZBitMask %08x, dwStencilBitMask %08x, dwRGBZBitMask %08x\n", fmt->dwZBitMask, - fmt->dwStencilBitMask, fmt->dwRGBZBitMask); + U1(*fmt).dwZBufferBitDepth, U2(*fmt).dwStencilBitDepth); + trace("dwZBitMask %08x, dwStencilBitMask %08x, dwRGBZBitMask %08x\n", U3(*fmt).dwZBitMask, + U4(*fmt).dwStencilBitMask, U5(*fmt).dwRGBZBitMask); } static void zbufferbitdepth_test(void) @@ -4031,7 +4031,7 @@ static void zbufferbitdepth_test(void) ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd.dwWidth = 256; ddsd.dwHeight = 256; - ddsd.dwZBufferBitDepth = test_data[i].depth; + U2(ddsd).dwZBufferBitDepth = test_data[i].depth; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); if (test_data[i].supported == ZFMT_SUPPORTED_ALWAYS) @@ -4066,11 +4066,11 @@ static void zbufferbitdepth_test(void) ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd.dwWidth = 256; ddsd.dwHeight = 256; - ddsd.dwZBufferBitDepth = 24; + U2(ddsd).dwZBufferBitDepth = 24; ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); ddsd.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - ddsd.ddpfPixelFormat.dwZBufferBitDepth = 16; - ddsd.ddpfPixelFormat.dwZBitMask = 0x0000ffff; + U1(ddsd.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(ddsd.ddpfPixelFormat).dwZBitMask = 0x0000ffff; surface = NULL; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); @@ -4080,12 +4080,12 @@ static void zbufferbitdepth_test(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr); IDirectDrawSurface_Release(surface); - ok(ddsd.ddpfPixelFormat.dwZBufferBitDepth == 16, "Expected a 16bpp depth buffer, got %ubpp\n", - ddsd.ddpfPixelFormat.dwZBufferBitDepth); + ok(U1(ddsd.ddpfPixelFormat).dwZBufferBitDepth == 16, "Expected a 16bpp depth buffer, got %ubpp\n", + U1(ddsd.ddpfPixelFormat).dwZBufferBitDepth); ok(ddsd.dwFlags & DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH is not set\n"); ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); - ok(ddsd.dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", - ddsd.dwZBufferBitDepth); + ok(U2(ddsd).dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", + U2(ddsd).dwZBufferBitDepth); /* DDSD_PIXELFORMAT vs invalid ZBUFFERBITDEPTH */ reset_ddsd(&ddsd); @@ -4093,11 +4093,11 @@ static void zbufferbitdepth_test(void) ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd.dwWidth = 256; ddsd.dwHeight = 256; - ddsd.dwZBufferBitDepth = 40; + U2(ddsd).dwZBufferBitDepth = 40; ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); ddsd.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - ddsd.ddpfPixelFormat.dwZBufferBitDepth = 16; - ddsd.ddpfPixelFormat.dwZBitMask = 0x0000ffff; + U1(ddsd.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(ddsd.ddpfPixelFormat).dwZBitMask = 0x0000ffff; surface = NULL; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed, hr %#x.\n", hr); @@ -4111,8 +4111,8 @@ static void zbufferbitdepth_test(void) ddsd.dwHeight = 256; ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); ddsd.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - ddsd.ddpfPixelFormat.dwZBufferBitDepth = 16; - ddsd.ddpfPixelFormat.dwZBitMask = 0x0000ffff; + U1(ddsd.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(ddsd.ddpfPixelFormat).dwZBitMask = 0x0000ffff; surface = NULL; hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr); @@ -4120,12 +4120,12 @@ static void zbufferbitdepth_test(void) hr = IDirectDrawSurface_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr); IDirectDrawSurface_Release(surface); - ok(ddsd.ddpfPixelFormat.dwZBufferBitDepth == 16, "Expected a 16bpp depth buffer, got %ubpp\n", - ddsd.ddpfPixelFormat.dwZBufferBitDepth); + ok(U1(ddsd.ddpfPixelFormat).dwZBufferBitDepth == 16, "Expected a 16bpp depth buffer, got %ubpp\n", + U1(ddsd.ddpfPixelFormat).dwZBufferBitDepth); ok(ddsd.dwFlags & DDSD_ZBUFFERBITDEPTH, "DDSD_ZBUFFERBITDEPTH is not set\n"); ok(!(ddsd.dwFlags & DDSD_PIXELFORMAT), "DDSD_PIXELFORMAT is set\n"); - ok(ddsd.dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", - ddsd.dwZBufferBitDepth); + ok(U2(ddsd).dwZBufferBitDepth == 16, "Expected dwZBufferBitDepth=16, got %u\n", + U2(ddsd).dwZBufferBitDepth); } static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const char *name) @@ -4211,7 +4211,7 @@ static void pixelformat_flag_test(void) ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_ZBUFFERBITDEPTH; ddsd.dwWidth = 64; ddsd.dwHeight = 64; - ddsd.dwZBufferBitDepth = 16; + U2(ddsd).dwZBufferBitDepth = 16; ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; test_ddsd(&ddsd, FALSE, TRUE, "Z buffer"); }

1 0