February 2009 - Wine-Commits

Paul Vriens : fusion/tests: Fix some typos.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 283e7842a2aad8b1f127a5ee47a97d3a8f9c84a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283e7842a2aad8b1f127a5ee4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 11 11:09:04 2009 +0100 fusion/tests: Fix some typos. --- dlls/fusion/tests/asmname.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 37579a3..b63e6b2 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -413,7 +413,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, NULL, CANOF_SET_DEFAULT_VALUES, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -443,7 +443,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, empty, CANOF_SET_DEFAULT_VALUES, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -474,7 +474,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_SET_DEFAULT_VALUES, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -508,7 +508,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -540,7 +540,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -571,7 +571,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -603,7 +603,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -635,7 +635,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -667,7 +667,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); @@ -742,7 +742,7 @@ static void test_CreateAssemblyNameObject(void) name = NULL; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULLNULL name\n"); + ok(name != NULL, "Expected non-NULL name\n"); size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL);

1 0

Paul Vriens : fusion/tests: Mark test as skipped when we don' t have enough rights.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 39e3bb8dbcefb6dd77a8912baf16208821f1d187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e3bb8dbcefb6dd77a8912ba… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 11 10:59:00 2009 +0100 fusion/tests: Mark test as skipped when we don't have enough rights. --- dlls/fusion/tests/asmcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 58aadf4..fe2b466 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -853,6 +853,8 @@ static BOOL check_dotnet20(void) ret = TRUE; else if (hr == CLDB_E_FILE_OLDVER) win_skip("Tests can't be run on older .NET version (.NET 1.1)\n"); + else if (hr == E_ACCESSDENIED) + skip("Not enough rights to install an assembly\n"); else ok(0, "Expected S_OK, got %08x\n", hr);

1 0

Michael Stefaniuc : ole32: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 0449701c31ce55fc142e0071dc7b7440551ccfae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0449701c31ce55fc142e0071d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 11 10:48:38 2009 +0100 ole32: Remove superfluous pointer casts. --- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/bindctx.c | 2 +- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/clipboard.c | 6 +++--- dlls/ole32/comcat.c | 14 +++++++------- dlls/ole32/compositemoniker.c | 4 ++-- dlls/ole32/datacache.c | 10 +++++----- dlls/ole32/defaulthandler.c | 6 +++--- dlls/ole32/errorinfo.c | 8 ++++---- dlls/ole32/filemoniker.c | 4 ++-- dlls/ole32/ftmarshal.c | 4 ++-- dlls/ole32/git.c | 2 +- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/ifs.c | 4 ++-- dlls/ole32/itemmoniker.c | 2 +- dlls/ole32/marshal.c | 14 +++++++------- dlls/ole32/memlockbytes.c | 2 +- dlls/ole32/moniker.c | 6 +++--- dlls/ole32/ole2.c | 15 +++++---------- dlls/ole32/oleobj.c | 2 +- dlls/ole32/rpc.c | 22 +++++++++++----------- dlls/ole32/stg_prop.c | 20 ++++++++++---------- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage.c | 2 +- dlls/ole32/storage32.c | 32 +++++++++++++------------------- dlls/ole32/stubmanager.c | 2 +- 26 files changed, 90 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0449701c31ce55fc142e0…

1 0

Michael Stefaniuc : wineesd.drv: dwParam1 and dwParam2 have the type DWORD_PTR.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: bcd00b4362759fd98c5bace24fcbf7b1eada04c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd00b4362759fd98c5bace24… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 10 23:31:38 2009 +0100 wineesd.drv: dwParam1 and dwParam2 have the type DWORD_PTR. --- dlls/wineesd.drv/audio.c | 78 ++++++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcd00b4362759fd98c5ba…

1 0

Andrew Talbot : itss: Replace malloc() with HeapAlloc().
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 193b9b89141a5eb3b6b0c0a8d6f13c545a11aa1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=193b9b89141a5eb3b6b0c0a8d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 10 22:18:08 2009 +0000 itss: Replace malloc() with HeapAlloc(). --- dlls/itss/lzx.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/itss/lzx.c b/dlls/itss/lzx.c index b5fdfc7..01a9492 100644 --- a/dlls/itss/lzx.c +++ b/dlls/itss/lzx.c @@ -36,15 +36,17 @@ ***************************************************************************/ #include "lzx.h" +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "windef.h" +#include "winbase.h" + /* sized types */ typedef unsigned char UBYTE; /* 8 bits exactly */ typedef unsigned short UWORD; /* 16 bits (or more) */ -typedef unsigned int ULONG; /* 32 bits (or more) */ -typedef signed int LONG; /* 32 bits (or more) */ /* some constants defined by the LZX specification */ #define LZX_MIN_MATCH (2) @@ -178,10 +180,10 @@ struct LZXstate *LZXinit(int window) if (window < 15 || window > 21) return NULL; /* allocate state and associated window */ - pState = malloc(sizeof(struct LZXstate)); - if (!(pState->window = malloc(wndsize))) + pState = HeapAlloc(GetProcessHeap(), 0, sizeof(struct LZXstate)); + if (!(pState->window = HeapAlloc(GetProcessHeap(), 0, wndsize))) { - free(pState); + HeapFree(GetProcessHeap(), 0, pState); return NULL; } pState->actual_size = wndsize; @@ -217,8 +219,8 @@ void LZXteardown(struct LZXstate *pState) { if (pState) { - free(pState->window); - free(pState); + HeapFree(GetProcessHeap(), 0, pState->window); + HeapFree(GetProcessHeap(), 0, pState); } }

1 0

Eric Pouech : dbghelp: Fix bad call to free() instead of pdb_free().
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: c83039bd6ea4d6d3e3579c934ddb9a6e8ea7c678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83039bd6ea4d6d3e3579c934… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Feb 10 22:29:18 2009 +0100 dbghelp: Fix bad call to free() instead of pdb_free(). --- dlls/dbghelp/msc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index f894afb..f293140 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2477,7 +2477,7 @@ static BOOL pdb_process_internal(const struct process* pcs, else { WARN("wrong header %x expecting 0xeffeeffe\n", *(const DWORD*)files_image); - free(files_image); + pdb_free(files_image); files_image = NULL; } }

1 0

Juan Lang : crypt32: Fix a typo.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 7124467ef4f4be88aab3cfd14c395f51c3b35f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7124467ef4f4be88aab3cfd14… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 10 10:41:32 2009 -0800 crypt32: Fix a typo. --- dlls/crypt32/tests/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 34523b3..67b7e92 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1196,7 +1196,7 @@ static void checkElementStatus(const CERT_TRUST_STATUS *expected, todo_wine ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == - (expected->dwInfoStatus & ignore->dwInfoStatus)), + (expected->dwInfoStatus & ~ignore->dwInfoStatus)), "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus);

1 0

Juan Lang : crypt32: Fix a test failure on Windows 98.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 38c8261135a337ca6e6ebcb6c85395d7c7370c27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c8261135a337ca6e6ebcb6c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 10 11:07:37 2009 -0800 crypt32: Fix a test failure on Windows 98. --- dlls/crypt32/tests/ctl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 2b65ab2..fea7b97 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -146,7 +146,8 @@ static void testCreateCTL(void) sizeof(ctlWithOneEntry)); ok((!ctl && (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */)) || + GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ || + GetLastError() == OSS_DATA_ERROR /* some win98 */)) || broken(ctl != NULL /* some win98 */), "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError());

1 0

Juan Lang : crypt32: Fix a compiler warning.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: d00a85f4ad05353d6a26770c0cfc8f6435f55569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00a85f4ad05353d6a26770c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 10 11:03:11 2009 -0800 crypt32: Fix a compiler warning. --- dlls/crypt32/tests/ctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index ad87632..2b65ab2 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -138,7 +138,7 @@ static void testCreateCTL(void) ok((!ctl && (GetLastError() == ERROR_INVALID_DATA || GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */)) || - broken(ctl /* some win98 */), + broken(ctl != NULL /* some win98 */), "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); @@ -147,7 +147,7 @@ static void testCreateCTL(void) ok((!ctl && (GetLastError() == ERROR_INVALID_DATA || GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */)) || - broken(ctl /* some win98 */), + broken(ctl != NULL /* some win98 */), "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef);

1 0

Juan Lang : crypt32: Relax a test whose results are ignored on Windows anyway.
by Alexandre Julliard Feb. 11, 2009

Feb. 11, 2009

Module: wine Branch: master Commit: 48995094347f858fd642dfbec371ea237ff83c96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48995094347f858fd642dfbec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 10 10:43:31 2009 -0800 crypt32: Relax a test whose results are ignored on Windows anyway. --- dlls/crypt32/tests/chain.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 0e29810..34523b3 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1426,10 +1426,8 @@ static CONST_DATA_BLOB chain9[] = { { sizeof(chain7_1), chain7_1 }, }; static const CERT_TRUST_STATUS elementStatus9[] = { - { CERT_TRUST_NO_ERROR, - CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_INVALID_BASIC_CONSTRAINTS, - CERT_TRUST_HAS_NAME_MATCH_ISSUER | CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_INVALID_BASIC_CONSTRAINTS, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; @@ -1578,8 +1576,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_PARTIAL_CHAIN | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, - 1, simpleStatus9 }, - TODO_INFO }, + 1, simpleStatus9 }, 0 }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 },

1 0