May 2007 - Wine-commits - list.winehq.org

Damjan Jovanovic : wine.inf: Move explorer to the windows directory.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: b76a77b3bf237076d52fef4ff87d842575a16c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76a77b3bf237076d52fef4ff… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 7 08:28:51 2007 +0200 wine.inf: Move explorer to the windows directory. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 9b061ef..ee6a287 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2153,6 +2153,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wintrust.dll,1 [FakeDllsSection] +10,,explorer.exe 10,,notepad.exe 10,,regedit.exe 10,,winebrowser.exe @@ -2173,7 +2174,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ddraw.dll 11,,dsound.dll 11,,dsound.vxd -11,,explorer.exe 11,,gdi32.dll 11,,hhctrl.ocx 11,,imaadp32.acm

1 0

Stefan Dösinger : ddraw: Fix reported caps on compressed surfaces.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 2ecacc619f1ea4931c3c654d80ba1aead4527ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecacc619f1ea4931c3c654d8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 6 23:40:19 2007 +0200 ddraw: Fix reported caps on compressed surfaces. Compressed surfaces in ddraw do not have a pitch, instead the full surface size is reported. Also adds tests for the extact behavior and surface flags set. --- dlls/ddraw/ddraw.c | 35 +++- dlls/ddraw/surface.c | 8 +- dlls/ddraw/tests/dsurface.c | 408 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 441 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ecacc619f1ea4931c3c6…

1 0

Andrew Talbot : kernel32: Exclude unused headers.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 072e7d0438c546e1acf2e7e6c174983328b081db URL: http://source.winehq.org/git/wine.git/?a=commit;h=072e7d0438c546e1acf2e7e6c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:20 2007 +0100 kernel32: Exclude unused headers. --- dlls/kernel32/except.c | 1 - dlls/kernel32/file.c | 1 - dlls/kernel32/global16.c | 1 - dlls/kernel32/heap.c | 1 - dlls/kernel32/instr.c | 1 - dlls/kernel32/ne_module.c | 1 - 6 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index fb2a5d5..32305cb 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -44,7 +44,6 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "winternl.h" #include "wingdi.h" #include "winuser.h" diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 6b2fb49..b3cf323 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -43,7 +43,6 @@ #include "kernel_private.h" #include "wine/exception.h" -#include "excpt.h" #include "wine/unicode.h" #include "wine/debug.h" #include "thread.h" diff --git a/dlls/kernel32/global16.c b/dlls/kernel32/global16.c index 91d739c..2031525 100644 --- a/dlls/kernel32/global16.c +++ b/dlls/kernel32/global16.c @@ -43,7 +43,6 @@ #include "kernel_private.h" #include "kernel16_private.h" #include "wine/debug.h" -#include "winerror.h" WINE_DEFAULT_DEBUG_CHANNEL(global); diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 610cff0..98552ca 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -60,7 +60,6 @@ #include "winerror.h" #include "winnt.h" #include "winternl.h" -#include "excpt.h" #include "wine/exception.h" #include "wine/debug.h" diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c index a7e60f1..8a37a47 100644 --- a/dlls/kernel32/instr.c +++ b/dlls/kernel32/instr.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "wine/winuser16.h" #include "excpt.h" #include "thread.h" diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 9e464e4..93f8f8e 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -37,7 +37,6 @@ #include "wownt32.h" #include "winternl.h" #include "toolhelp.h" -#include "excpt.h" #include "kernel_private.h" #include "kernel16_private.h" #include "wine/exception.h"

1 0

Andrew Talbot : kernel32: Exclude unused headers.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: fe933b022a555a411b24738ed40781cc2c53ddde URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe933b022a555a411b24738ed… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:23 2007 +0100 kernel32: Exclude unused headers. --- dlls/kernel32/oldconfig.c | 2 -- dlls/kernel32/process.c | 1 - dlls/kernel32/resource.c | 2 -- dlls/kernel32/selector.c | 1 - dlls/kernel32/stress.c | 1 - dlls/kernel32/string.c | 1 - 6 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index cf892e8..09e407b 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -44,9 +44,7 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winternl.h" -#include "winioctl.h" #include "ntddscsi.h" #include "wine/library.h" #include "wine/unicode.h" diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8e5999f..036730f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -45,7 +45,6 @@ #define WIN32_NO_STATUS #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "winioctl.h" #include "winternl.h" #include "kernel_private.h" #include "wine/exception.h" diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 2b1bdf4..66e8adc 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -32,10 +32,8 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "wownt32.h" #include "wine/winbase16.h" #include "wine/debug.h" -#include "excpt.h" #include "wine/exception.h" #include "wine/unicode.h" #include "wine/list.h" diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index 53ad5b4..db3a47e 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -23,7 +23,6 @@ #include <string.h> -#include "winerror.h" #include "wine/winbase16.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/dlls/kernel32/stress.c b/dlls/kernel32/stress.c index c722631..c97a1b2 100644 --- a/dlls/kernel32/stress.c +++ b/dlls/kernel32/stress.c @@ -19,7 +19,6 @@ #include <stdarg.h> #include "windef.h" -#include "winbase.h" #include "wine/windef16.h" #include "wine/debug.h" diff --git a/dlls/kernel32/string.c b/dlls/kernel32/string.c index 6201d2f..ecac281 100644 --- a/dlls/kernel32/string.c +++ b/dlls/kernel32/string.c @@ -30,7 +30,6 @@ #define WINE_NO_INLINE_STRING #include "windef.h" #include "winbase.h" -#include "excpt.h" #include "wine/winbase16.h" #include "wine/unicode.h" #include "wine/exception.h"

1 0

Andrew Talbot : kernel32: Exclude unused headers.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 7919badd70c0d7992e98b0d384307952f522c81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7919badd70c0d7992e98b0d38… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:26 2007 +0100 kernel32: Exclude unused headers. --- dlls/kernel32/system.c | 1 - dlls/kernel32/thread.c | 1 - dlls/kernel32/toolhelp16.c | 1 - dlls/kernel32/virtual.c | 1 - dlls/kernel32/volume.c | 1 - dlls/kernel32/windebug.c | 1 - 6 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/system.c b/dlls/kernel32/system.c index d0b7963..ab38467 100644 --- a/dlls/kernel32/system.c +++ b/dlls/kernel32/system.c @@ -24,7 +24,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "wownt32.h" diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index cdbe1e1..59cbfdf 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -34,7 +34,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winnls.h" #include "thread.h" #include "wine/winbase16.h" #include "wine/exception.h" diff --git a/dlls/kernel32/toolhelp16.c b/dlls/kernel32/toolhelp16.c index fdb611f..c6931d2 100644 --- a/dlls/kernel32/toolhelp16.c +++ b/dlls/kernel32/toolhelp16.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" -#include "winerror.h" #include "wine/winbase16.h" #include "toolhelp.h" diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index d2b473e..9bb13f1 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -40,7 +40,6 @@ #include "winternl.h" #include "winerror.h" #include "wine/exception.h" -#include "excpt.h" #include "wine/debug.h" #include "kernel_private.h" diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 536fcfa..0f4c5da 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -36,7 +36,6 @@ #include "winnls.h" #include "winternl.h" #include "winioctl.h" -#include "ntddstor.h" #include "ntddcdrm.h" #include "kernel_private.h" #include "wine/library.h" diff --git a/dlls/kernel32/windebug.c b/dlls/kernel32/windebug.c index 665508d..7b913b2 100644 --- a/dlls/kernel32/windebug.c +++ b/dlls/kernel32/windebug.c @@ -22,7 +22,6 @@ #include <string.h> #include <stdlib.h> #include "windef.h" -#include "winbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dll);

1 0

Mounir IDRASSI : wincrypt.h: Add missing definitions.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 12f4acce0472ba3ccfe70fd0a75528588082e871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f4acce0472ba3ccfe70fd0a… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon May 7 18:35:48 2007 +0200 wincrypt.h: Add missing definitions. --- include/wincrypt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 2219bd5..c580d84 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1613,6 +1613,11 @@ static const WCHAR MS_SCARD_PROV_W[] = { 'M','i','c','r','o','s','o',' #define PP_KEYSPEC 39 #define PP_ENUMEX_SIGNING_PROT 40 +/* Values returned by CryptGetProvParam of PP_KEYSTORAGE */ +#define CRYPT_SEC_DESCR 0x00000001 +#define CRYPT_PSTORE 0x00000002 +#define CRYPT_UI_PROMPT 0x00000004 + /* Crypt{Get/Set}KeyParam */ #define KP_IV 1 #define KP_SALT 2

1 0

Mounir IDRASSI : rsaenh: Fix read_key_container bug that prevents CryptAcquireContext from correctly loading the keys .
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: a7d897d76a8111622726694cce6bf2d6530a0c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d897d76a8111622726694cc… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon May 7 18:53:30 2007 +0200 rsaenh: Fix read_key_container bug that prevents CryptAcquireContext from correctly loading the keys. --- dlls/rsaenh/rsaenh.c | 13 ++++++++----- dlls/rsaenh/tests/rsaenh.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2ace2d5..66fa9f5 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1050,7 +1050,8 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTa KEYCONTAINER *pKeyContainer; HCRYPTPROV hKeyContainer; DATA_BLOB blobIn, blobOut; - + HCRYPTKEY hCryptKey; + sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); if (dwFlags & CRYPT_MACHINE_KEYSET) { @@ -1089,8 +1090,9 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTa if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, (dwFlags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0, &blobOut)) { - RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, - &pKeyContainer->hKeyExchangeKeyPair); + if(RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, + &hCryptKey)) + pKeyContainer->hKeyExchangeKeyPair = hCryptKey; HeapFree(GetProcessHeap(), 0, blobOut.pbData); } } @@ -1113,8 +1115,9 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTa if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, (dwFlags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0, &blobOut)) { - RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, - &pKeyContainer->hSignatureKeyPair); + if(RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, + &hCryptKey)) + pKeyContainer->hSignatureKeyPair = hCryptKey; HeapFree(GetProcessHeap(), 0, blobOut.pbData); } } diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index fe27f4b..57cf706 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1603,6 +1603,26 @@ static void test_null_provider(void) CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + + + /* test for the bug in accessing the user key in a container + */ + result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + result = CryptGenKey(prov, AT_KEYEXCHANGE, 0, &key); + ok(result, "CryptGenKey with AT_KEYEXCHANGE failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); + CryptReleaseContext(prov,0); + result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL,0); + ok(result, "CryptAcquireContext failed: 0x%08x\n", GetLastError()); + result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); + ok (result, "CryptGetUserKey failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); + + CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + } START_TEST(rsaenh)

1 0

Bernard Ladenthin : browseui: Fixed ClassFactory_LockServer implementation.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 57c8c9e55f30e3ee1cdd31dfb2b1338d6fd8cd47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c8c9e55f30e3ee1cdd31dfb… Author: Bernard Ladenthin <bernard(a)ladenthin.net> Date: Mon May 7 18:13:35 2007 +0200 browseui: Fixed ClassFactory_LockServer implementation. --- dlls/browseui/browseui.h | 4 ---- dlls/browseui/browseui_main.c | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index f8ec194..2f44ac7 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -23,10 +23,6 @@ extern LONG BROWSEUI_refCount; -extern LONG module_ref; -#define LOCK_MODULE() InterlockedIncrement(&module_ref) -#define UNLOCK_MODULE() InterlockedDecrement(&module_ref) - HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); #endif /* __WINE_SHDOCVW_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index c5f9cbe..98b1424 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -43,8 +43,6 @@ LONG BROWSEUI_refCount = 0; HINSTANCE browseui_hinstance = 0; -LONG module_ref = 0; - typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); static const struct { @@ -133,9 +131,9 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) TRACE("(%p)->(%x)\n", This, fLock); if(fLock) - LOCK_MODULE(); + InterlockedIncrement(&BROWSEUI_refCount); else - UNLOCK_MODULE(); + InterlockedDecrement(&BROWSEUI_refCount); return S_OK; }

1 0

Andrew Talbot : infosoft: Exclude unused header.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: fff0ed260200ffdd5cd6c89355fb9d253159d17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff0ed260200ffdd5cd6c8935… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:10 2007 +0100 infosoft: Exclude unused header. --- dlls/infosoft/wordbreaker.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index f656653..514f868 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" #include "ole2.h" #include "indexsrv.h" #include "wine/unicode.h"

1 0

Andrew Talbot : itss: Exclude unused headers.
by Alexandre Julliard 07 May '07

07 May '07

Module: wine Branch: master Commit: 8f7b21e9b7a77b1a1c9cbd2eb65830c7cab24eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7b21e9b7a77b1a1c9cbd2eb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 7 14:15:15 2007 +0100 itss: Exclude unused headers. --- dlls/itss/itss.c | 3 --- dlls/itss/moniker.c | 4 ---- dlls/itss/storage.c | 4 ---- 3 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index cca4f61..711d116 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -31,13 +31,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "winreg.h" #include "ole2.h" #include "advpub.h" -#include "uuids.h" - #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 370a23f..d57f381 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -30,12 +30,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" -#include "winreg.h" #include "ole2.h" -#include "uuids.h" - #include "wine/itss.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index 4163605..97d7755 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -30,12 +30,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" -#include "winreg.h" #include "ole2.h" -#include "uuids.h" - #include "chm_lib.h" #include "itsstor.h"

1 0