October 2009 - Wine-commits

Henri Verbeet : d3d8/tests: Properly release the first device in test_depth_stencil_reset().
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 50f5c9253e3c4af9094ecbcad68efac4838cbd55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50f5c9253e3c4af9094ecbcad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 10:26:08 2009 +0200 d3d8/tests: Properly release the first device in test_depth_stencil_reset(). --- dlls/d3d8/tests/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2a6a10e..900fbb7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1350,6 +1350,7 @@ static void test_depth_stencil_reset(void) IDirect3DSurface8 *surface; IDirect3DDevice8 *device = NULL; IDirect3D8 *d3d8; + UINT refcount; HRESULT hr; HWND hwnd; @@ -1408,7 +1409,10 @@ static void test_depth_stencil_reset(void) ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); ok(surface == NULL, "Depth stencil should be NULL\n"); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); device = NULL; + IDirect3D8_GetAdapterDisplayMode( d3d8, D3DADAPTER_DEFAULT, &display_mode ); ZeroMemory( &present_parameters, sizeof(present_parameters) ); @@ -1450,7 +1454,7 @@ static void test_depth_stencil_reset(void) cleanup: if (device) { - UINT refcount = IDirect3DDevice8_Release(device); + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } if (d3d8) IDirect3D8_Release(d3d8);

1 0

Henri Verbeet : d3d9/tests: Release the IDirect3D9Ex interface in test_qi_ex_to_base().
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: fff8b09fb406960ad116b2cdaca5b5dbfb708ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff8b09fb406960ad116b2cda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 23 10:26:09 2009 +0200 d3d9/tests: Release the IDirect3D9Ex interface in test_qi_ex_to_base(). --- dlls/d3d9/tests/d3d9ex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 595cb81..36520f2 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -178,6 +178,7 @@ static void test_qi_ex_to_base(void) IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d9); + IDirect3D9Ex_Release(d3d9ex); out: DestroyWindow(window);

1 0

Erik Inge Bolsø : wine.inf: Fix NT4 SP6a registry key.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 2832eab22746d828e628829532b825140faf5cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2832eab22746d828e62882953… Author: Erik Inge Bolsø <knan-wine(a)anduin.net> Date: Fri Oct 23 01:30:48 2009 +0200 wine.inf: Fix NT4 SP6a registry key. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 6e2df39..ceccec5 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -408,7 +408,7 @@ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Fonts,,,"" -HKLM,%CurrentVersionNT%\Q246009,"Installed",,"1" +HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld"

1 0

Alexandre Julliard : msvcrt: Implement __lconv_init.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 1f4febdb55e1573d70ea3538d01832396746d711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4febdb55e1573d70ea3538d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 22 22:26:45 2009 +0200 msvcrt: Implement __lconv_init. --- dlls/msvcrt/locale.c | 66 ++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 3e15abd..b216838 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" +#include <limits.h> #include <locale.h> #include <stdarg.h> #include <stdio.h> @@ -47,6 +48,7 @@ LCID MSVCRT_current_lc_all_lcid = 0; int MSVCRT___lc_codepage = 0; int MSVCRT___lc_collate_cp = 0; HANDLE MSVCRT___lc_handle[MSVCRT_LC_MAX - MSVCRT_LC_MIN + 1] = { 0 }; +unsigned char charmax = CHAR_MAX; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); @@ -571,33 +573,40 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i /********************************************************************* * localeconv (MSVCRT.@) */ -struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) { - - struct lconv *ylconv; - static struct MSVCRT_lconv xlconv; - - ylconv = localeconv(); - -#define X(x) xlconv.x = ylconv->x; - X(decimal_point); - X(thousands_sep); - X(grouping); - X(int_curr_symbol); - X(currency_symbol); - X(mon_decimal_point); - X(mon_thousands_sep); - X(mon_grouping); - X(positive_sign); - X(negative_sign); - X(int_frac_digits); - X(frac_digits); - X(p_cs_precedes); - X(p_sep_by_space); - X(n_cs_precedes); - X(n_sep_by_space); - X(p_sign_posn); - X(n_sign_posn); - return &xlconv; +struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) +{ + static struct MSVCRT_lconv xlconv; + struct lconv *ylconv = localeconv(); + + xlconv.decimal_point = ylconv->decimal_point; + xlconv.thousands_sep = ylconv->thousands_sep; + xlconv.grouping = ylconv->grouping; /* FIXME: fixup charmax here too */ + xlconv.int_curr_symbol = ylconv->int_curr_symbol; + xlconv.currency_symbol = ylconv->currency_symbol; + xlconv.mon_decimal_point = ylconv->mon_decimal_point; + xlconv.mon_thousands_sep = ylconv->mon_thousands_sep; + xlconv.mon_grouping = ylconv->mon_grouping; + xlconv.positive_sign = ylconv->positive_sign; + xlconv.negative_sign = ylconv->negative_sign; + xlconv.int_frac_digits = ylconv->int_frac_digits; + xlconv.frac_digits = ylconv->frac_digits; + xlconv.p_cs_precedes = ylconv->p_cs_precedes; + xlconv.p_sep_by_space = ylconv->p_sep_by_space; + xlconv.n_cs_precedes = ylconv->n_cs_precedes; + xlconv.n_sep_by_space = ylconv->n_sep_by_space; + xlconv.p_sign_posn = ylconv->p_sign_posn; + xlconv.n_sign_posn = ylconv->n_sign_posn; + + if (ylconv->int_frac_digits == CHAR_MAX) xlconv.int_frac_digits = charmax; + if (ylconv->frac_digits == CHAR_MAX) xlconv.frac_digits = charmax; + if (ylconv->p_cs_precedes == CHAR_MAX) xlconv.p_cs_precedes = charmax; + if (ylconv->p_sep_by_space == CHAR_MAX) xlconv.p_sep_by_space = charmax; + if (ylconv->n_cs_precedes == CHAR_MAX) xlconv.n_cs_precedes = charmax; + if (ylconv->n_sep_by_space == CHAR_MAX) xlconv.n_sep_by_space = charmax; + if (ylconv->p_sign_posn == CHAR_MAX) xlconv.p_sign_posn = charmax; + if (ylconv->n_sign_posn == CHAR_MAX) xlconv.n_sign_posn = charmax; + + return &xlconv; } /********************************************************************* @@ -605,7 +614,8 @@ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) { */ void CDECL __lconv_init(void) { - FIXME(" stub\n"); + /* this is used to make chars unsigned */ + charmax = 255; } /*********************************************************************

1 0

Juan Lang : wintrust: Test the pgKnownSubject field of WINTRUST_FILE_INFO.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: cd084ff1f910b839cb983a43ef4045a5e5dabb68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd084ff1f910b839cb983a43e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 3 18:49:36 2009 -0800 wintrust: Test the pgKnownSubject field of WINTRUST_FILE_INFO. --- dlls/wintrust/tests/softpub.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 3e4347d..31a51a2 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -266,6 +266,8 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) PROVDATA_SIP provDataSIP = { 0 }; static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; + static GUID bogusGuid = { 0xdeadbeef, 0xbaad, 0xf00d, { 0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00 } }; ret = funcs->pfnObjectTrust(&data); ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); @@ -317,6 +319,28 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) ok(provDataSIP.psSipSubjectInfo != NULL, "Expected a subject info\n"); } + /* Specifying the GUID results in that GUID being the subject GUID */ + fileInfo.pgKnownSubject = &bogusGuid; + ret = funcs->pfnObjectTrust(&data); + ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_NOSIGNATURE || + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); + if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_NOSIGNATURE) + { + ok(!memcmp(&provDataSIP.gSubject, &bogusGuid, sizeof(bogusGuid)), + "unexpected subject GUID\n"); + } + /* Specifying a bogus GUID pointer crashes */ + if (0) + { + fileInfo.pgKnownSubject = (GUID *)0xdeadbeef; + ret = funcs->pfnObjectTrust(&data); + } funcs->pfnFree(data.padwTrustStepErrors); } }

1 0

Damjan Jovanovic : winemenubuilder: Ignore Windows MIME types without a slash.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: df4b68b77221fc878b2904341449b19e9e32f7a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4b68b77221fc878b2904341… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Oct 22 19:38:37 2009 +0200 winemenubuilder: Ignore Windows MIME types without a slash. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ba6fa64..fb13878 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1941,7 +1941,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package if (mimeTypeA == NULL) { - if (contentTypeW != NULL) + if (contentTypeW != NULL && strchrW(contentTypeW, '/')) mimeTypeA = wchars_to_utf8_chars(contentTypeW); else mimeTypeA = heap_printf("application/x-wine-extension-%s", &extensionA[1]);

1 0

Paul Vriens : advapi32/tests: Fix some test failures on several platforms.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: f555aef2691afc3a017f802121a2a598023d2e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f555aef2691afc3a017f80212… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 22 20:57:21 2009 +0200 advapi32/tests: Fix some test failures on several platforms. --- dlls/advapi32/tests/crypt.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 0b3f90f..d408f96 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -988,15 +988,21 @@ static void test_rc2_keylen(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, 0, &hkey); - ok(!ret && GetLastError() == NTE_BAD_DATA, - "expected NTE_BAD_DATA, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == NTE_BAD_DATA || + GetLastError() == NTE_BAD_LEN || /* Win7 */ + GetLastError() == NTE_BAD_TYPE || /* W2K */ + GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */ + "unexpected error %08x\n", GetLastError()); /* but importing an 8-bit (7-byte) key does.. */ key_blob.key_size = 7; SetLastError(0xdeadbeef); ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, 0, &hkey); - ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_TYPE) || /* W2K */ + broken(!ret && GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */ + "CryptAcquireContext error %08x\n", GetLastError()); pCryptDestroyKey(hkey); /* as does importing a 16-byte key with the base provider when * CRYPT_IPSEC_HMAC_KEY is specified.

1 0

Juan Lang : advapi32: Fix a comment typo.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: 18ba0ae59fb34f03e0816dd8db320c161bbfd428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ba0ae59fb34f03e0816dd8d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 22 12:06:32 2009 -0700 advapi32: Fix a comment typo. --- dlls/advapi32/tests/crypt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index d408f96..131e605 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -993,7 +993,7 @@ static void test_rc2_keylen(void) GetLastError() == NTE_BAD_TYPE || /* W2K */ GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */ "unexpected error %08x\n", GetLastError()); - /* but importing an 8-bit (7-byte) key does.. */ + /* but importing an 56-bit (7-byte) key does.. */ key_blob.key_size = 7; SetLastError(0xdeadbeef); ret = pCryptImportKey(provider, (BYTE*)&key_blob,

1 0

Juan Lang : wintrust: Make sure item size is at least the min size, and only align sizes that are greater.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: a5087e605158a2fa427e64718f6b41f494aad380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5087e605158a2fa427e64718… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 22 12:42:39 2009 -0700 wintrust: Make sure item size is at least the min size, and only align sizes that are greater. --- dlls/wintrust/asn.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 6a525eb..69c9dd3 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1525,8 +1525,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, : NULL, &items[i].size); if (ret) { - /* Account for alignment padding */ - items[i].size = ALIGN_DWORD_PTR(items[i].size); + if (items[i].size < items[i].minSize) + items[i].size = items[i].minSize; + else if (items[i].size > items[i].minSize) + { + /* Account for alignment padding */ + items[i].size = ALIGN_DWORD_PTR(items[i].size); + } TRACE("item %d size: %d\n", i, items[i].size); if (nextData && items[i].hasPointer && items[i].size > items[i].minSize)

1 0

Juan Lang : crypt32: Make sure item size is at least the min size, and only align sizes that are greater.
by Alexandre Julliard 23 Oct '09

23 Oct '09

Module: wine Branch: master Commit: c593173d153d5fcde304a9285b1f930ede647c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c593173d153d5fcde304a9285… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 22 13:31:00 2009 -0700 crypt32: Make sure item size is at least the min size, and only align sizes that are greater. --- dlls/crypt32/decode.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 32e61cc..fa1cc63 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -357,8 +357,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], : NULL, &items[i].size, &itemDecoded); if (ret) { - /* Account for alignment padding */ - items[i].size = ALIGN_DWORD_PTR(items[i].size); + if (items[i].size < items[i].minSize) + items[i].size = items[i].minSize; + else if (items[i].size > items[i].minSize) + { + /* Account for alignment padding */ + items[i].size = ALIGN_DWORD_PTR(items[i].size); + } TRACE("item %d size: %d\n", i, items[i].size); if (nextData && items[i].hasPointer && items[i].size > items[i].minSize)

1 0