system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation with gcc 2.95.

Browse source
This commit is contained in:
Francois Gouget 2006-10-18 21:24:50 +02:00 committed by Alexandre Julliard
parent a34e04eaf4
commit 22288de732
4 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/crypt32/cert.c
View file

@ -19,6 +19,8 @@
#include <assert.h>
#include <stdarg.h>
#define NONAMELESSUNION
#include "windef.h"
#include "winbase.h"
#include "wincrypt.h"
@ -1241,7 +1243,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV hCryptProv, DWORD dwKeySpec,
{
if (!hCryptProv)
hCryptProv = CRYPT_GetDefaultProvider();
ret = CryptCreateHash(hCryptProv, info->Algid, 0, 0, &hHash);
ret = CryptCreateHash(hCryptProv, info->u.Algid, 0, 0, &hHash);
if (ret)
{
ret = CryptHashData(hHash, pbEncodedToBeSigned,
@ -1261,7 +1263,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTPROV hCryptProv, DWORD dwKeySpec,
}
else
{
ret = CryptCreateHash(hCryptProv, info->Algid, 0, 0, &hHash);
ret = CryptCreateHash(hCryptProv, info->u.Algid, 0, 0, &hHash);
if (ret)
{
ret = CryptHashData(hHash, pbEncodedToBeSigned,
@ -1365,7 +1367,7 @@ static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV hCryptProv,
}
if (info->dwGroupId == CRYPT_PUBKEY_ALG_OID_GROUP_ID)
{
switch (info->Algid)
switch (info->u.Algid)
{
case CALG_RSA_KEYX:
pubKeyID = CALG_RSA_SIGN;
@ -1382,7 +1384,7 @@ static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV hCryptProv,
}
else
{
hashID = info->Algid;
hashID = info->u.Algid;
if (info->ExtraInfo.cbData >= sizeof(ALG_ID))
pubKeyID = *(ALG_ID *)info->ExtraInfo.pbData;
else

8
dlls/d3d9/tests/stateblock.c
View file

@ -786,10 +786,10 @@ static inline void print_matrix(
const char* name, const D3DMATRIX* matrix) {
trace("%s Matrix = {\n", name);
trace(" %f %f %f %f\n", matrix->m[0][0], matrix->m[1][0], matrix->m[2][0], matrix->m[3][0]);
trace(" %f %f %f %f\n", matrix->m[0][1], matrix->m[1][1], matrix->m[2][1], matrix->m[3][1]);
trace(" %f %f %f %f\n", matrix->m[0][2], matrix->m[1][2], matrix->m[2][2], matrix->m[3][2]);
trace(" %f %f %f %f\n", matrix->m[0][3], matrix->m[1][3], matrix->m[2][3], matrix->m[3][3]);
trace(" %f %f %f %f\n", U(*matrix).m[0][0], U(*matrix).m[1][0], U(*matrix).m[2][0], U(*matrix).m[3][0]);
trace(" %f %f %f %f\n", U(*matrix).m[0][1], U(*matrix).m[1][1], U(*matrix).m[2][1], U(*matrix).m[3][1]);
trace(" %f %f %f %f\n", U(*matrix).m[0][2], U(*matrix).m[1][2], U(*matrix).m[2][2], U(*matrix).m[3][2]);
trace(" %f %f %f %f\n", U(*matrix).m[0][3], U(*matrix).m[1][3], U(*matrix).m[2][3], U(*matrix).m[3][3]);
trace("}\n");
}

8
dlls/ole32/tests/hglobalstream.c
View file

@ -57,8 +57,8 @@ static void test_streamonhglobal(IStream *pStream)
ok(read == sizeof(data), "IStream_Read returned read %d\n", read);
/* ignores HighPart */
ull.HighPart = -1;
ull.LowPart = 0;
ull.u.HighPart = -1;
ull.u.LowPart = 0;
hr = IStream_SetSize(pStream, ull);
ok_ole_success(hr, "IStream_SetSize");
@ -76,8 +76,8 @@ static void test_streamonhglobal(IStream *pStream)
ok(statstg.type == STGTY_STREAM, "statstg.type should have been STGTY_STREAM instead of %d\n", statstg.type);
/* test OOM condition */
ull.HighPart = -1;
ull.LowPart = -1;
ull.u.HighPart = -1;
ull.u.LowPart = -1;
hr = IStream_SetSize(pStream, ull);
todo_wine {
ok(hr == E_OUTOFMEMORY, "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr);

11
dlls/shell32/recyclebin.c
View file

@ -21,6 +21,7 @@
#include "config.h"
#define COBJMACROS
#define NONAMELESSUNION
#include <stdarg.h>
@ -312,8 +313,8 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID
TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName);
TRASH_UnpackItemID(&pidl->mkid, NULL, &data);
pName->uType = STRRET_WSTR;
pName->pOleStr = StrDupW(PathFindFileNameW(data.cFileName));
if (pName->pOleStr == NULL)
pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName));
if (pName->u.pOleStr == NULL)
return E_OUTOFMEMORY;
return S_OK;
@ -407,7 +408,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS
{
pDetails->str.uType = STRRET_WSTR;
LoadStringW(shell32_hInstance, RecycleBinColumns[iColumn].column_name_id, buffer, MAX_PATH);
return SHStrDupW(buffer, &pDetails->str.pOleStr);
return SHStrDupW(buffer, &pDetails->str.u.pOleStr);
}
if (iColumn == COLUMN_NAME)
@ -438,8 +439,8 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS
}
pDetails->str.uType = STRRET_WSTR;
pDetails->str.pOleStr = StrDupW(buffer);
return (pDetails->str.pOleStr != NULL ? S_OK : E_OUTOFMEMORY);
pDetails->str.u.pOleStr = StrDupW(buffer);
return (pDetails->str.u.pOleStr != NULL ? S_OK : E_OUTOFMEMORY);
}
static HRESULT WINAPI RecycleBin_MapColumnToSCID(IShellFolder2 *iface, UINT iColumn, SHCOLUMNID *pscid)