August 2009 - Wine-Commits - list.winehq.org

Francois Gouget : ddrawex: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: a07195bb72bf56737fd769d1108c8b086f504d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07195bb72bf56737fd769d11… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:53:08 2009 +0200 ddrawex: Fix compilation on systems that don't support nameless unions. --- dlls/ddrawex/ddraw.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 6607c78..4c757ec 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -15,10 +15,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" #define COBJMACROS +#define NONAMELESSUNION +#include <stdarg.h> +#include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -26,6 +28,7 @@ #include "d3d.h" #include "ddrawex_private.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ddrawex); @@ -426,21 +429,21 @@ void DDSD_to_DDSD2(const DDSURFACEDESC *in, DDSURFACEDESC2 *out) out->dwFlags = in->dwFlags; if(in->dwFlags & DDSD_WIDTH) out->dwWidth = in->dwWidth; if(in->dwFlags & DDSD_HEIGHT) out->dwHeight = in->dwHeight; - if(in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->ddpfPixelFormat; + if(in->dwFlags & DDSD_PIXELFORMAT) out->u4.ddpfPixelFormat = in->ddpfPixelFormat; if(in->dwFlags & DDSD_CAPS) out->ddsCaps.dwCaps = in->ddsCaps.dwCaps; - if(in->dwFlags & DDSD_PITCH) out->lPitch = in->lPitch; + if(in->dwFlags & DDSD_PITCH) out->u1.lPitch = in->u1.lPitch; if(in->dwFlags & DDSD_BACKBUFFERCOUNT) out->dwBackBufferCount = in->dwBackBufferCount; - if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->dwMipMapCount = in->dwZBufferBitDepth; /* same union */ + if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->u2.dwMipMapCount = in->u2.dwZBufferBitDepth; /* same union */ if(in->dwFlags & DDSD_ALPHABITDEPTH) out->dwAlphaBitDepth = in->dwAlphaBitDepth; /* DDraw(native, and wine) does not set the DDSD_LPSURFACE, so always copy */ out->lpSurface = in->lpSurface; - if(in->dwFlags & DDSD_CKDESTOVERLAY) out->ddckCKDestOverlay = in->ddckCKDestOverlay; + if(in->dwFlags & DDSD_CKDESTOVERLAY) out->u3.ddckCKDestOverlay = in->ddckCKDestOverlay; if(in->dwFlags & DDSD_CKDESTBLT) out->ddckCKDestBlt = in->ddckCKDestBlt; if(in->dwFlags & DDSD_CKSRCOVERLAY) out->ddckCKSrcOverlay = in->ddckCKSrcOverlay; if(in->dwFlags & DDSD_CKSRCBLT) out->ddckCKSrcBlt = in->ddckCKSrcBlt; - if(in->dwFlags & DDSD_MIPMAPCOUNT) out->dwMipMapCount = in->dwMipMapCount; - if(in->dwFlags & DDSD_REFRESHRATE) out->dwRefreshRate = in->dwRefreshRate; - if(in->dwFlags & DDSD_LINEARSIZE) out->dwLinearSize = in->dwLinearSize; + if(in->dwFlags & DDSD_MIPMAPCOUNT) out->u2.dwMipMapCount = in->u2.dwMipMapCount; + if(in->dwFlags & DDSD_REFRESHRATE) out->u2.dwRefreshRate = in->u2.dwRefreshRate; + if(in->dwFlags & DDSD_LINEARSIZE) out->u1.dwLinearSize = in->u1.dwLinearSize; /* Does not exist in DDSURFACEDESC: * DDSD_TEXTURESTAGE, DDSD_FVF, DDSD_SRCVBHANDLE, */ @@ -453,21 +456,21 @@ void DDSD2_to_DDSD(const DDSURFACEDESC2 *in, DDSURFACEDESC *out) out->dwFlags = in->dwFlags; if(in->dwFlags & DDSD_WIDTH) out->dwWidth = in->dwWidth; if(in->dwFlags & DDSD_HEIGHT) out->dwHeight = in->dwHeight; - if(in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->ddpfPixelFormat; + if(in->dwFlags & DDSD_PIXELFORMAT) out->ddpfPixelFormat = in->u4.ddpfPixelFormat; if(in->dwFlags & DDSD_CAPS) out->ddsCaps.dwCaps = in->ddsCaps.dwCaps; - if(in->dwFlags & DDSD_PITCH) out->lPitch = in->lPitch; + if(in->dwFlags & DDSD_PITCH) out->u1.lPitch = in->u1.lPitch; if(in->dwFlags & DDSD_BACKBUFFERCOUNT) out->dwBackBufferCount = in->dwBackBufferCount; - if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->dwZBufferBitDepth = in->dwMipMapCount; /* same union */ + if(in->dwFlags & DDSD_ZBUFFERBITDEPTH) out->u2.dwZBufferBitDepth = in->u2.dwMipMapCount; /* same union */ if(in->dwFlags & DDSD_ALPHABITDEPTH) out->dwAlphaBitDepth = in->dwAlphaBitDepth; /* DDraw(native, and wine) does not set the DDSD_LPSURFACE, so always copy */ out->lpSurface = in->lpSurface; - if(in->dwFlags & DDSD_CKDESTOVERLAY) out->ddckCKDestOverlay = in->ddckCKDestOverlay; + if(in->dwFlags & DDSD_CKDESTOVERLAY) out->ddckCKDestOverlay = in->u3.ddckCKDestOverlay; if(in->dwFlags & DDSD_CKDESTBLT) out->ddckCKDestBlt = in->ddckCKDestBlt; if(in->dwFlags & DDSD_CKSRCOVERLAY) out->ddckCKSrcOverlay = in->ddckCKSrcOverlay; if(in->dwFlags & DDSD_CKSRCBLT) out->ddckCKSrcBlt = in->ddckCKSrcBlt; - if(in->dwFlags & DDSD_MIPMAPCOUNT) out->dwMipMapCount = in->dwMipMapCount; - if(in->dwFlags & DDSD_REFRESHRATE) out->dwRefreshRate = in->dwRefreshRate; - if(in->dwFlags & DDSD_LINEARSIZE) out->dwLinearSize = in->dwLinearSize; + if(in->dwFlags & DDSD_MIPMAPCOUNT) out->u2.dwMipMapCount = in->u2.dwMipMapCount; + if(in->dwFlags & DDSD_REFRESHRATE) out->u2.dwRefreshRate = in->u2.dwRefreshRate; + if(in->dwFlags & DDSD_LINEARSIZE) out->u1.dwLinearSize = in->u1.dwLinearSize; /* Does not exist in DDSURFACEDESC: * DDSD_TEXTURESTAGE, DDSD_FVF, DDSD_SRCVBHANDLE, */

1 0

Francois Gouget : d3dx9_36: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 74b5da9a47eb817e317550d69a30979783c5dcef URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b5da9a47eb817e317550d69… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:53:11 2009 +0200 d3dx9_36: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx9_36/mesh.c | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 251bb40..91116b2 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -20,10 +20,12 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" + +#define NONAMELESSUNION #include "windef.h" #include "wingdi.h" #include "d3dx9.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -260,22 +262,22 @@ BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *p0, CONST D3DXVECTOR3 *p1, CONST D3DXMATRIX m; D3DXVECTOR4 vec; - m.m[0][0] = p1->x - p0->x; - m.m[1][0] = p2->x - p0->x; - m.m[2][0] = -praydir->x; - m.m[3][0] = 0.0f; - m.m[0][1] = p1->y - p0->z; - m.m[1][1] = p2->y - p0->z; - m.m[2][1] = -praydir->y; - m.m[3][1] = 0.0f; - m.m[0][2] = p1->z - p0->z; - m.m[1][2] = p2->z - p0->z; - m.m[2][2] = -praydir->z; - m.m[3][2] = 0.0f; - m.m[0][3] = 0.0f; - m.m[1][3] = 0.0f; - m.m[2][3] = 0.0f; - m.m[3][3] = 1.0f; + m.u.m[0][0] = p1->x - p0->x; + m.u.m[1][0] = p2->x - p0->x; + m.u.m[2][0] = -praydir->x; + m.u.m[3][0] = 0.0f; + m.u.m[0][1] = p1->y - p0->z; + m.u.m[1][1] = p2->y - p0->z; + m.u.m[2][1] = -praydir->y; + m.u.m[3][1] = 0.0f; + m.u.m[0][2] = p1->z - p0->z; + m.u.m[1][2] = p2->z - p0->z; + m.u.m[2][2] = -praydir->z; + m.u.m[3][2] = 0.0f; + m.u.m[0][3] = 0.0f; + m.u.m[1][3] = 0.0f; + m.u.m[2][3] = 0.0f; + m.u.m[3][3] = 1.0f; vec.x = praypos->x - p0->x; vec.y = praypos->y - p0->y;

1 0

Francois Gouget : wintrust/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 6cfce78c7da55d1cddd24aba121dd2a5cbf98952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfce78c7da55d1cddd24aba1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:12 2009 +0200 wintrust/tests: Fix compilation on systems that don't support nameless unions. --- dlls/wintrust/tests/asn.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 96bca50..2fa45c6 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -842,7 +842,7 @@ static void test_encodeSpOpusInfo(void) ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); moreInfo.dwLinkChoice = SPC_URL_LINK_CHOICE; - moreInfo.pwszUrl = winehq; + U(moreInfo).pwszUrl = winehq; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); @@ -910,7 +910,7 @@ static void test_decodeSpOpusInfo(void) { ok(info->pMoreInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, "unexpected link choice %d\n", info->pMoreInfo->dwLinkChoice); - ok(!lstrcmpW(info->pMoreInfo->pwszUrl, winehq), + ok(!lstrcmpW(U(*info->pMoreInfo).pwszUrl, winehq), "unexpected link value\n"); } ok(!info->pPublisherInfo, "expected NULL\n"); @@ -931,7 +931,7 @@ static void test_decodeSpOpusInfo(void) ok(info->pPublisherInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, "unexpected link choice %d\n", info->pPublisherInfo->dwLinkChoice); - ok(!lstrcmpW(info->pPublisherInfo->pwszUrl, winehq), + ok(!lstrcmpW(U(*info->pPublisherInfo).pwszUrl, winehq), "unexpected link value\n"); } LocalFree(info);

1 0

Francois Gouget : d3d10core: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 3c80cf52108cd41a75701886fb133ec41871d72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c80cf52108cd41a75701886f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:53:14 2009 +0200 d3d10core: Fix compilation on systems that don't support nameless unions. --- dlls/d3d10core/device.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 030ed39..d51e302 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#define NONAMELESSUNION #include "d3d10core_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); @@ -783,14 +784,14 @@ static HRESULT d3d10_device_set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DE if (texture_desc.ArraySize == 1) { desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE1D; - desc->Texture1D.MipSlice = 0; + desc->u.Texture1D.MipSlice = 0; } else { desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE1DARRAY; - desc->Texture1DArray.MipSlice = 0; - desc->Texture1DArray.FirstArraySlice = 0; - desc->Texture1DArray.ArraySize = 1; + desc->u.Texture1DArray.MipSlice = 0; + desc->u.Texture1DArray.FirstArraySlice = 0; + desc->u.Texture1DArray.ArraySize = 1; } return S_OK; @@ -817,7 +818,7 @@ static HRESULT d3d10_device_set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DE if (texture_desc.SampleDesc.Count == 1) { desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; - desc->Texture2D.MipSlice = 0; + desc->u.Texture2D.MipSlice = 0; } else { @@ -829,15 +830,15 @@ static HRESULT d3d10_device_set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DE if (texture_desc.SampleDesc.Count == 1) { desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DARRAY; - desc->Texture2DArray.MipSlice = 0; - desc->Texture2DArray.FirstArraySlice = 0; - desc->Texture2DArray.ArraySize = 1; + desc->u.Texture2DArray.MipSlice = 0; + desc->u.Texture2DArray.FirstArraySlice = 0; + desc->u.Texture2DArray.ArraySize = 1; } else { desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY; - desc->Texture2DMSArray.FirstArraySlice = 0; - desc->Texture2DMSArray.ArraySize = 1; + desc->u.Texture2DMSArray.FirstArraySlice = 0; + desc->u.Texture2DMSArray.ArraySize = 1; } } @@ -861,9 +862,9 @@ static HRESULT d3d10_device_set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DE desc->Format = texture_desc.Format; desc->ViewDimension = D3D10_RTV_DIMENSION_TEXTURE3D; - desc->Texture3D.MipSlice = 0; - desc->Texture3D.FirstWSlice = 0; - desc->Texture3D.WSize = 1; + desc->u.Texture3D.MipSlice = 0; + desc->u.Texture3D.FirstWSlice = 0; + desc->u.Texture3D.WSize = 1; return S_OK; }

1 0

André Hentschel : winemaker: Update usage text.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: d26857c9b4bfc68bd9a26b4e9f5d612ac88fbe0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26857c9b4bfc68bd9a26b4e9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Aug 29 13:11:12 2009 +0200 winemaker: Update usage text. --- tools/winemaker | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 052f180..e077db2 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2531,8 +2531,8 @@ sub usage() print STDERR " [--wine64]\n"; print STDERR " work_directory|project_file|workspace_file\n"; print STDERR "\nWinemaker is designed to recursively convert all the Windows sources found in\n"; - print STDERR "the specified directory so that they can be compiled with Winelib. During this\n"; - print STDERR "process it will modify and rename some of the files in that directory.\n"; + print STDERR "the specified directory or project-file, so that they can be compiled with Winelib.\n"; + print STDERR "During this process it will modify and rename some of the corresponding files.\n"; print STDERR "\tPlease read the manual page before use.\n"; exit (2); }

1 0

André Hentschel : winemaker: Fix dll compiling in project files.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: c0bd2912db6e0dba5445b6cf5c788d6a583bfee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0bd2912db6e0dba5445b6cf5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Aug 29 13:10:01 2009 +0200 winemaker: Fix dll compiling in project files. --- tools/winemaker | 193 +++++++++++++++++++++++++------------------------------ 1 files changed, 88 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0bd2912db6e0dba5445b…

1 0

Francois Gouget : iphlpapi: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 11f7b5ba5a74100c4c8b286308a39678372ced08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f7b5ba5a74100c4c8b28630… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:53:04 2009 +0200 iphlpapi: Fix compilation on systems that don't support nameless structs or unions. --- dlls/iphlpapi/iphlpapi_main.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4415cf6..522d1d5 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -42,6 +42,8 @@ # include <resolv.h> #endif +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -653,8 +655,8 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL DWORD buflen, type, status; memset(aa, 0, sizeof(IP_ADAPTER_ADDRESSES)); - aa->Length = sizeof(IP_ADAPTER_ADDRESSES); - aa->IfIndex = index; + aa->u.s.Length = sizeof(IP_ADAPTER_ADDRESSES); + aa->u.s.IfIndex = index; getInterfaceNameByIndex(index, name); memcpy(ptr, name, IF_NAMESIZE); @@ -675,16 +677,16 @@ static ULONG adapterAddressesFromIndex(DWORD index, IP_ADAPTER_ADDRESSES *aa, UL for (i = 0; i < num_addrs; i++) { memset(ua, 0, sizeof(IP_ADAPTER_UNICAST_ADDRESS)); - ua->Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); + ua->u.s.Length = sizeof(IP_ADAPTER_UNICAST_ADDRESS); ua->Address.iSockaddrLength = sizeof(struct sockaddr_in); - ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->Length); + ua->Address.lpSockaddr = (SOCKADDR *)((char *)ua + ua->u.s.Length); sa = (struct sockaddr_in *)ua->Address.lpSockaddr; sa->sin_family = AF_INET; sa->sin_addr.s_addr = addrs[i]; sa->sin_port = 0; - ptr += ua->Length + ua->Address.iSockaddrLength; + ptr += ua->u.s.Length + ua->Address.iSockaddrLength; if (i < num_addrs - 1) { ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr;

1 0

Francois Gouget : rpcrt4: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 891d3ef525ed4e87131df5d972f22b86779b595a URL: http://source.winehq.org/git/wine.git/?a=commit;h=891d3ef525ed4e87131df5d97… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:53:00 2009 +0200 rpcrt4: Fix compilation on systems that don't support nameless unions. --- dlls/rpcrt4/ndr_marshall.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9846d9e..d1b57fd 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -32,6 +32,7 @@ #include <string.h> #include <limits.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -4379,15 +4380,15 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M if (level != 1) return RPC_S_INVALID_ARG; - memset(&umi->Level1, 0, sizeof(umi->Level1)); + memset(&umi->u1.Level1, 0, sizeof(umi->u1.Level1)); umi->InformationLevel = level; if (umcb->Signature != USER_MARSHAL_CB_SIGNATURE) return RPC_S_INVALID_ARG; - umi->Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; - umi->Level1.pfnFree = umcb->pStubMsg->pfnFree; - umi->Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; + umi->u1.Level1.pfnAllocate = umcb->pStubMsg->pfnAllocate; + umi->u1.Level1.pfnFree = umcb->pStubMsg->pfnFree; + umi->u1.Level1.pRpcChannelBuffer = umcb->pStubMsg->pRpcChannelBuffer; switch (umcb->CBType) { @@ -4403,8 +4404,8 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M umcb->pStubMsg->Buffer > buffer_end) return ERROR_INVALID_USER_BUFFER; - umi->Level1.Buffer = umcb->pStubMsg->Buffer; - umi->Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; + umi->u1.Level1.Buffer = umcb->pStubMsg->Buffer; + umi->u1.Level1.BufferSize = buffer_end - umcb->pStubMsg->Buffer; break; } case USER_MARSHAL_CB_BUFFER_SIZE:

1 0

Francois Gouget : d3d10core/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 64e419ab6ca98a4b16a3419fd9e8a42bbc5dd255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e419ab6ca98a4b16a3419fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:54 2009 +0200 d3d10core/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3d10core/tests/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 9c05398..fb166ec 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -161,8 +161,8 @@ static void test_create_rendertarget_view(ID3D10Device *device) rtv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER; - rtv_desc.Buffer.ElementOffset = 0; - rtv_desc.Buffer.ElementWidth = 64; + U(rtv_desc).Buffer.ElementOffset = 0; + U(rtv_desc).Buffer.ElementWidth = 64; hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x\n", hr); @@ -193,7 +193,7 @@ static void test_create_rendertarget_view(ID3D10Device *device) ok(rtv_desc.Format == texture_desc.Format, "Expected format %#x, got %#x\n", texture_desc.Format, rtv_desc.Format); ok(rtv_desc.ViewDimension == D3D10_RTV_DIMENSION_TEXTURE2D, "Expected view dimension D3D10_RTV_DIMENSION_TEXTURE2D, got %#x\n", rtv_desc.ViewDimension); - ok(rtv_desc.Texture2D.MipSlice == 0, "Expected mip slice 0, got %#x\n", rtv_desc.Texture2D.MipSlice); + ok(U(rtv_desc).Texture2D.MipSlice == 0, "Expected mip slice 0, got %#x\n", U(rtv_desc).Texture2D.MipSlice); ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(texture);

1 0

Francois Gouget : windowscodecs: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Aug. 31, 2009

Aug. 31, 2009

Module: wine Branch: master Commit: 2dd9b1d0279b4d35f4423792c45b86cd628adc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd9b1d0279b4d35f4423792c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 31 11:52:57 2009 +0200 windowscodecs: Fix compilation on systems that don't support nameless unions. --- dlls/windowscodecs/stream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index ba1b2a6..5672ff5 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -138,7 +138,7 @@ static HRESULT WINAPI StreamOnMemory_Seek(IStream *iface, if (NewPosition.QuadPart > This->dwMemsize) return E_INVALIDARG; if (NewPosition.QuadPart < 0) return E_INVALIDARG; - This->dwCurPos = NewPosition.LowPart; + This->dwCurPos = NewPosition.u.LowPart; if(plibNewPosition) plibNewPosition->QuadPart = This->dwCurPos; return S_OK;

1 0