October 2007 - Wine-commits

Alex Villacís Lasso : riched20: Fix test crash on WinXP-SP2.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: e7296eaeaab3fbeb5a643287162c42f8069026e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7296eaeaab3fbeb5a6432871… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Oct 28 10:53:45 2007 -0500 riched20: Fix test crash on WinXP-SP2. --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0c259b9..3dfa28e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1087,6 +1087,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); @@ -1101,6 +1103,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem2); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1117,6 +1121,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem3); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1128,6 +1134,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem3alt); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1139,6 +1147,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem4); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1747,6 +1757,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1") == 0, "EM_GETTEXTEX results not what was set by EM_REPLACESEL\n"); @@ -1760,6 +1772,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1779,6 +1793,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1805,6 +1821,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1821,6 +1839,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " ") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1837,6 +1857,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r\r \r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1853,6 +1875,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " \r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1869,6 +1893,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " \r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1885,6 +1911,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\rX\r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1901,6 +1929,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1917,6 +1947,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r\r\r\r\r ") == 0, "EM_GETTEXTEX returned incorrect string\n");

1 0

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: cbf06f4d4877cc2fd0f401d5c706d52b5651f423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf06f4d4877cc2fd0f401d5c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Oct 28 15:46:30 2007 +0000 shell32: Constify some variables. --- dlls/shell32/shfldr.h | 2 +- dlls/shell32/shfldr_fs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 4950254..56f81dd 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -70,7 +70,7 @@ static inline int SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str) } void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags); -BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); +BOOL SHELL_FS_HideExtension(LPCWSTR pwszPath); DEFINE_GUID( CLSID_UnixFolder, 0xcc702eb2, 0x7dc5, 0x11d9, 0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd ); DEFINE_GUID( CLSID_UnixDosFolder, 0x9d20aae8, 0x0625, 0x44b0, 0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9 ); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 0fa690d..0cc08b5 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -712,7 +712,7 @@ static const WCHAR NeverShowExtW[] = { 'N','e','v','e','r','S','h','o','w','E', * TRUE, if the filename's extension should be hidden * FALSE, otherwise. */ -BOOL SHELL_FS_HideExtension(LPWSTR szPath) +BOOL SHELL_FS_HideExtension(LPCWSTR szPath) { HKEY hKey; DWORD dwData; @@ -1170,7 +1170,7 @@ ISFHelper_fnAddFolder (ISFHelper * iface, HWND hwnd, LPCWSTR pwszName, * Builds a list of paths like the one used in SHFileOperation from a table of * PIDLs relative to the given base folder */ -static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls) +static WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, const LPCITEMIDLIST *pidls) { WCHAR *wszPathsList; WCHAR *wszListPos;

1 0

Francois Gouget : cryptnet: Fix compilation on systems that don' t support nameless structs.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 4b6368c0e25e6da5676b308f28818a61622db6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6368c0e25e6da5676b308f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:49:19 2007 +0200 cryptnet: Fix compilation on systems that don't support nameless structs. --- dlls/cryptnet/cryptnet_main.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index b83adb8..487da9d 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -23,6 +23,7 @@ #include <stdio.h> #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "wine/debug.h" @@ -353,7 +354,7 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) if ((ret = GetFileSizeEx(hFile, &size))) { - if (size.HighPart) + if (size.u.HighPart) { WARN("file too big\n"); SetLastError(ERROR_INVALID_DATA); @@ -363,11 +364,11 @@ static BOOL CRYPT_GetObjectFromFile(HANDLE hFile, PCRYPT_BLOB_ARRAY pObject) { CRYPT_DATA_BLOB blob; - blob.pbData = CryptMemAlloc(size.LowPart); + blob.pbData = CryptMemAlloc(size.u.LowPart); if (blob.pbData) { - blob.cbData = size.LowPart; - ret = ReadFile(hFile, blob.pbData, size.LowPart, &blob.cbData, + blob.cbData = size.u.LowPart; + ret = ReadFile(hFile, blob.pbData, size.u.LowPart, &blob.cbData, NULL); if (ret) {

1 0

Francois Gouget : crypt32: Better match the PSDK types and update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 80911c12f45f537561b20edea0868071e66d8843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80911c12f45f537561b20edea… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:49:27 2007 +0200 crypt32: Better match the PSDK types and update win32.api to fix the winapi_check warnings. --- dlls/crypt32/cert.c | 2 +- include/wincrypt.h | 2 +- tools/winapi/win32.api | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 976589b..844b054 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1242,7 +1242,7 @@ typedef BOOL (WINAPI *CertVerifyRevocationFunc)(DWORD, DWORD, DWORD, void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS); BOOL WINAPI CertVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, - DWORD cContext, void *rgpvContext[], DWORD dwFlags, + DWORD cContext, PVOID rgpvContext[], DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { BOOL ret; diff --git a/include/wincrypt.h b/include/wincrypt.h index e913f6b..41b9e2e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3962,7 +3962,7 @@ BOOL WINAPI CertVerifyCTLUsage(DWORD dwEncodingType, DWORD dwSubjectType, PCTL_VERIFY_USAGE_STATUS pVerifyUsageStatus); BOOL WINAPI CertVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, - DWORD cContext, void *rgpvContext[], DWORD dwFlags, + DWORD cContext, PVOID rgpvContext[], DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus); BOOL WINAPI CryptExportPublicKeyInfo(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptProv, DWORD dwKeySpec, diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index c3c33a6..f0a6490 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -115,6 +115,8 @@ PACL * PACTRL_ACCESSW * PACTRL_AUDITW * PBOOL +PCREDENTIALA ** +PCREDENTIALW ** PDWORD PEXPLICIT_ACCESSA PEXPLICIT_ACCESSA * @@ -661,6 +663,12 @@ ULONG PBOOL PCREDUI_INFOW PCtxtHandle +PSTR * +PWSTR * + +%str + +PCSTR %wstr @@ -760,6 +768,8 @@ PCERT_NAME_INFO PCERT_PUBLIC_KEY_INFO PCERT_RDN_ATTR PCERT_RDN_VALUE_BLOB +PCERT_REVOCATION_PARA +PCERT_REVOCATION_STATUS PCMSG_STREAM_INFO PCRL_ENTRY * PCRL_INFO @@ -775,6 +785,7 @@ PFN_CERT_ENUM_SYSTEM_STORE PFN_CRYPT_ENUM_OID_INFO PSYSTEMTIME PVOID +PVOID[] SIP_ADD_NEWPROVIDER * SIP_DISPATCH_INFO * SIP_INDIRECT_DATA * @@ -804,13 +815,17 @@ LPWSTR BOOL DWORD +HCRYPTASYNC %ptr DWORD * LPVOID +LPVOID * PCERT_REVOCATION_PARA PCERT_REVOCATION_STATUS +PCRYPT_CREDENTIALS +PCRYPT_RETRIEVE_AUX_INFO PCRYPT_URL_ARRAY PCRYPT_URL_INFO PVOID[] @@ -819,6 +834,10 @@ PVOID[] LPCSTR +%wstr + +LPCWSTR + %%ctl3d32.dll %long @@ -3220,6 +3239,7 @@ PROCESSINFOCLASS RTL_ATOM SECTION_INFORMATION_CLASS SECTION_INHERIT +SECURITY_DESCRIPTOR_CONTROL SECURITY_IMPERSONATION_LEVEL SECURITY_INFORMATION SEMAPHORE_INFORMATION_CLASS @@ -4989,6 +5009,7 @@ HLINEAPP HPHONE HPHONEAPP HWND +LONG %ptr @@ -5012,6 +5033,7 @@ LPLINEDEVSTATUS LPLINEDIALPARAMS LPLINEEXTENSIONID LPLINEFORWARDLIST +LPLINEINITIALIZEEXPARAMS LPLINEGENERATETONE LPLINEMEDIACONTROLCALLSTATE LPLINEMEDIACONTROLDIGIT @@ -5076,6 +5098,7 @@ UINT %ptr BINDINFO * +CLSID * DWORD * FORMATETC * IBindCtx *

1 0

Francois Gouget : shlwapi: Fix the DeleteMenuWrap() forward.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 5b58407271474e7ffa38715647f022e32fd0ce05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b58407271474e7ffa3871564… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:50:25 2007 +0200 shlwapi: Fix the DeleteMenuWrap() forward. --- dlls/shlwapi/shlwapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index ce44553..fdb061c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -422,7 +422,7 @@ 422 stdcall -noname SHGlobalCounterCreateNamedA(str long) 423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long) 424 stdcall -noname SHGlobalCounterDecrement(long) -425 stdcall -noname DeleteMenuWrap(ptr long long) user32.DeleteMenuW +425 stdcall -noname DeleteMenuWrap(ptr long long) user32.DeleteMenu 426 stdcall -noname DestroyMenuWrap(long) user32.DestroyMenu 427 stdcall -noname TrackPopupMenuWrap(long long long long long long ptr) user32.TrackPopupMenu 428 stdcall -noname TrackPopupMenuExWrap(long long long long long ptr) user32.TrackPopupMenuEx

1 0

Francois Gouget : tapi32: Add prototypes for lineInitializeExA/W().
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 55fe2b26b5e579817d53ff2a708258f79b6404d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fe2b26b5e579817d53ff2a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:50:47 2007 +0200 tapi32: Add prototypes for lineInitializeExA/W(). --- include/tapi.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/tapi.h b/include/tapi.h index 4d7dca0..9c5dc49 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -900,6 +900,9 @@ DWORD WINAPI lineGetTranslateCaps(HLINEAPP,DWORD,LPLINETRANSLATECAPS); DWORD WINAPI lineHandoff(HCALL,LPCSTR,DWORD); DWORD WINAPI lineHold(HCALL); DWORD WINAPI lineInitialize(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCSTR,LPDWORD); +LONG WINAPI lineInitializeExA(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCSTR,LPDWORD,LPDWORD,LPLINEINITIALIZEEXPARAMS); +LONG WINAPI lineInitializeExW(LPHLINEAPP,HINSTANCE,LINECALLBACK,LPCWSTR,LPDWORD,LPDWORD,LPLINEINITIALIZEEXPARAMS); +#define lineInitializeEx WINELIB_NAME_AW(lineInitializeEx) DWORD WINAPI lineMakeCall(HLINE,LPHCALL,LPCSTR,DWORD,LPLINECALLPARAMS); DWORD WINAPI lineMonitorDigits(HCALL,DWORD); DWORD WINAPI lineMonitorMedia(HCALL,DWORD);

1 0

Francois Gouget : d3dx8: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: eb546b3b31da828b3b9ea442478f99a62fd9f330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb546b3b31da828b3b9ea4424… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:49:08 2007 +0200 d3dx8: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx8/tests/math.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 0e70183..11aa776 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -128,12 +128,12 @@ static void D3DXMatrixTest(void) BOOL expected, got; /*____________D3DXMatrixIsIdentity______________*/ - mat.m[0][1] = 0.0f; mat.m[0][2] = 7.0f; mat.m[0][3] = 8.0f; - mat.m[1][0] = 11.0f; mat.m[1][2] = 0.0f; mat.m[1][3] = 0.0f; - mat.m[2][0] = 0.0f; mat.m[2][1] = 0.0f; mat.m[2][3] = 0.0f; - mat.m[3][0] = 0.0f; mat.m[3][1] = 0.0f; mat.m[3][2] = 0.0f; - mat.m[0][0] = 1.0f; mat.m[1][1] = 1.0f; mat.m[2][2] = 1.0f; - mat.m[3][3] = 1.0f; + U(mat).m[0][1] = 0.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; + U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 0.0f; U(mat).m[1][3] = 0.0f; + U(mat).m[2][0] = 0.0f; U(mat).m[2][1] = 0.0f; U(mat).m[2][3] = 0.0f; + U(mat).m[3][0] = 0.0f; U(mat).m[3][1] = 0.0f; U(mat).m[3][2] = 0.0f; + U(mat).m[0][0] = 1.0f; U(mat).m[1][1] = 1.0f; U(mat).m[2][2] = 1.0f; + U(mat).m[3][3] = 1.0f; expected = FALSE; got = D3DXMatrixIsIdentity(&mat); ok(expected == got, "Expected : %d, Got : %d\n", expected, got);

1 0

Francois Gouget : d3dx8: Make sure d3dx8math.inl compiles fine, whether nameless unions are supported or not.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 97f36631b5b4417f1e881dc1d0407a2f589eeb89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f36631b5b4417f1e881dc1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 28 02:49:40 2007 +0200 d3dx8: Make sure d3dx8math.inl compiles fine, whether nameless unions are supported or not. --- include/d3dx8math.inl | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 deletions(-) diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 4df1f9e..22684a0 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -319,26 +319,31 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 } /*__________________D3DXMatrix____________________*/ +#ifdef NONAMELESSUNION +# define D3DX_U(x) (x).u +#else +# define D3DX_U(x) (x) +#endif static inline D3DXMATRIX* D3DXMatrixIdentity(D3DXMATRIX *pout) { if ( !pout ) return NULL; - pout->m[0][1] = 0.0f; - pout->m[0][2] = 0.0f; - pout->m[0][3] = 0.0f; - pout->m[1][0] = 0.0f; - pout->m[1][2] = 0.0f; - pout->m[1][3] = 0.0f; - pout->m[2][0] = 0.0f; - pout->m[2][1] = 0.0f; - pout->m[2][3] = 0.0f; - pout->m[3][0] = 0.0f; - pout->m[3][1] = 0.0f; - pout->m[3][2] = 0.0f; - pout->m[0][0] = 1.0f; - pout->m[1][1] = 1.0f; - pout->m[2][2] = 1.0f; - pout->m[3][3] = 1.0f; + D3DX_U(*pout).m[0][1] = 0.0f; + D3DX_U(*pout).m[0][2] = 0.0f; + D3DX_U(*pout).m[0][3] = 0.0f; + D3DX_U(*pout).m[1][0] = 0.0f; + D3DX_U(*pout).m[1][2] = 0.0f; + D3DX_U(*pout).m[1][3] = 0.0f; + D3DX_U(*pout).m[2][0] = 0.0f; + D3DX_U(*pout).m[2][1] = 0.0f; + D3DX_U(*pout).m[2][3] = 0.0f; + D3DX_U(*pout).m[3][0] = 0.0f; + D3DX_U(*pout).m[3][1] = 0.0f; + D3DX_U(*pout).m[3][2] = 0.0f; + D3DX_U(*pout).m[0][0] = 1.0f; + D3DX_U(*pout).m[1][1] = 1.0f; + D3DX_U(*pout).m[2][2] = 1.0f; + D3DX_U(*pout).m[3][3] = 1.0f; return pout; } @@ -354,11 +359,12 @@ static inline BOOL D3DXMatrixIsIdentity(D3DXMATRIX *pm) { for (j=0; j<4; j++) { - if ( fabs(pm->m[i][j] - testmatrix.m[i][j]) > 0.0001 ) equal = FALSE; + if ( fabs(D3DX_U(*pm).m[i][j] - D3DX_U(testmatrix).m[i][j]) > 0.0001 ) equal = FALSE; } } return equal; } +#undef D3DX_U /*__________________D3DXPLANE____________________*/

1 0

Dmitry Timoshkov : shlwapi: Fix a typo in the previous patch. Spotted by Francois Gouget.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 656a11b152eb753ce7b21f0c4257528001da8f69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=656a11b152eb753ce7b21f0c4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Oct 28 14:34:37 2007 +0800 shlwapi: Fix a typo in the previous patch. Spotted by Francois Gouget. --- dlls/shlwapi/shlwapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index fdb061c..8f8e8aa 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -391,7 +391,7 @@ 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) 392 stdcall -noname EndDialogWrap(ptr ptr) user32.EndDialog 393 stdcall -noname CreateDialogIndirectParamWrapW(long ptr long ptr long) user32.CreateDialogIndirectParamW -394 stdcall -noname SHChangeNotify(long long ptr ptr) +394 stdcall -noname SHChangeNotifyWrap(long long ptr ptr) 395 stub -noname MLWinHelpA 396 stub -noname MLHtmlHelpA 397 stub -noname MLWinHelpW

1 0

Stefan Dösinger : wined3d: Honor pbos when downloading a compressed texture.
by Alexandre Julliard 29 Oct '07

29 Oct '07

Module: wine Branch: master Commit: 58ed14eb52392ee8902863e020d030b9e1bb460b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ed14eb52392ee8902863e02… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 28 14:39:24 2007 +0200 wined3d: Honor pbos when downloading a compressed texture. --- dlls/wined3d/surface.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06d5aa6..43cf3a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,8 +47,17 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", This, This->glDescription.level, This->glDescription.glFormat, This->glDescription.glType, This->resource.allocatedMemory); - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); - checkGLcall("glGetCompressedTexImageARB()"); + if(This->Flags & SFLAG_PBO) { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); + checkGLcall("glGetCompressedTexImageARB()"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); + } else { + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); + checkGLcall("glGetCompressedTexImageARB()"); + } } } else { void *mem;

1 0