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

Maarten Lankhorst : dsound: Primary buffer isn't an IDirectSoundBuffer8.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 6e9276e970d47d4957c99e142d392c59ebf04f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e9276e970d47d4957c99e142… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun May 13 12:58:36 2007 +0200 dsound: Primary buffer isn't an IDirectSoundBuffer8. --- dlls/dsound/dsound_private.h | 2 +- dlls/dsound/primary.c | 87 +++++++++++------------------------------- dlls/dsound/tests/dsound8.c | 5 ++ 3 files changed, 29 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e9276e970d47d4957c99…

1 0

Maarten Lankhorst : winealsa: Remove dead code.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 645f1efbc3622cb9478e8ee15880771ae82f1b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=645f1efbc3622cb9478e8ee15… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun May 13 12:41:52 2007 +0200 winealsa: Remove dead code. --- dlls/winealsa.drv/dsoutput.c | 5 ----- dlls/winealsa.drv/waveout.c | 23 ----------------------- 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index b8fbea1..1b0c550 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -421,11 +421,6 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, if (wwo->hw_params == NULL || wwo->pcm == NULL) return DSERR_GENERIC; -#if 0 /* Shouldn't be needed */ - /* we need to track down buffer underruns */ - DSDB_CheckXRUN(This); -#endif - state = snd_pcm_state(wwo->pcm); if (state == SND_PCM_STATE_RUNNING) { diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index d7bd6ad..786d3c1 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -276,21 +276,6 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force) * - we hit the beginning of a running loop * - we hit a wavehdr which hasn't finished playing */ -#if 0 - while ((lpWaveHdr = wwo->lpQueuePtr) && - (force || - (lpWaveHdr != wwo->lpPlayPtr && - lpWaveHdr != wwo->lpLoopPtr && - lpWaveHdr->reserved <= wwo->dwPlayedTotal))) { - - wwo->lpQueuePtr = lpWaveHdr->lpNext; - - lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; - lpWaveHdr->dwFlags |= WHDR_DONE; - - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); - } -#else for (;;) { lpWaveHdr = wwo->lpQueuePtr; @@ -308,7 +293,6 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEDEV* wwo, BOOL force) wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); } -#endif return (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr != wwo->lpLoopPtr) ? wodPlayer_NotifyWait(wwo, lpWaveHdr) : INFINITE; } @@ -499,13 +483,6 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEDEV* wwo) wodUpdatePlayedTotal(wwo, NULL); availInQ = snd_pcm_avail_update(wwo->pcm); -#if 0 - /* input queue empty and output buffer with less than one fragment to play */ - if (!wwo->lpPlayPtr && wwo->dwBufferSize < availInQ + wwo->dwFragmentSize) { - TRACE("Run out of wavehdr:s...\n"); - return INFINITE; - } -#endif /* no more room... no need to try to feed */ if (availInQ > 0) { /* Feed from partial wavehdr */

1 0

Mounir IDRASSI : crypt32: Stub implementation of CertGetCertificateChain.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 7abb204a1baca28aedf5edd91b070d474c6cdf88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abb204a1baca28aedf5edd91… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon May 14 02:23:50 2007 +0200 crypt32: Stub implementation of CertGetCertificateChain. --- dlls/crypt32/cert.c | 12 ++++++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 3912447..100abaa 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2275,3 +2275,15 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV hProv, CryptReleaseContext(hProv, 0); return context; } + +BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, + PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, + PCCERT_CHAIN_CONTEXT* ppChainContext) +{ + FIXME(" %p %p %p %p %p 0x%08X %p %p - stub\n",hChainEngine, pCertContext, + pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index d8bb091..a3e3039 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -51,7 +51,7 @@ @ stdcall CertGetCRLContextProperty(ptr long ptr ptr) @ stdcall CertGetCRLFromStore(ptr ptr ptr ptr) @ stdcall CertGetCTLContextProperty(ptr long ptr ptr) -@ stub CertGetCertificateChain +@ stdcall CertGetCertificateChain(ptr ptr ptr ptr ptr long ptr ptr) @ stdcall CertGetCertificateContextProperty(ptr long ptr ptr) @ stdcall CertGetEnhancedKeyUsage(ptr long ptr ptr) @ stub CertGetIntendedKeyUsage

1 0

Mounir IDRASSI : crypt32: Stub implementation of CryptFindLocalizedName.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: e7c2e05f0f15ecaebec76d667857c9c9972c4c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c2e05f0f15ecaebec76d667… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon May 14 01:05:53 2007 +0200 crypt32: Stub implementation of CryptFindLocalizedName. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/oid.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 81e6023..d8bb091 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -113,6 +113,7 @@ @ stub CryptExportPKCS8 @ stdcall CryptExportPublicKeyInfo(long long long ptr ptr) @ stdcall CryptExportPublicKeyInfoEx(long long long str long ptr ptr ptr) +@ stdcall CryptFindLocalizedName(wstr) @ stdcall CryptFindOIDInfo(long ptr long) @ stdcall CryptFormatObject(long long long ptr str ptr long ptr ptr) @ stdcall CryptFreeOIDFunctionAddress(long long) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index bbad491..1865f97 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -839,6 +839,15 @@ BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType, return ret; } +/******************************************************************** + * CryptFindLocalizedName (CRYPT32.@) + */ +LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName) +{ + FIXME(" %s - stub\n",debugstr_w(pwszCryptName)); + return NULL; +} + static CRITICAL_SECTION oidInfoCS; static struct list oidInfo;

1 0

Mounir IDRASSI : crypt32: Fix crash in CertGetCertificateContextProperty when querying length of a hash property .
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: ebe83d561b990343db78728123ac828984494e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe83d561b990343db7872812… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon May 14 00:25:04 2007 +0200 crypt32: Fix crash in CertGetCertificateContextProperty when querying length of a hash property. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/tests/cert.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 884c2da..3912447 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -158,7 +158,7 @@ static BOOL CertContext_GetHashProp(void *context, DWORD dwPropId, { BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, pcbData); - if (ret) + if (ret && pvData) { CRYPT_DATA_BLOB blob = { *pcbData, pvData }; diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index cdc6cfb..c9f7a0a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -294,18 +294,25 @@ static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, BYTE hash[20] = { 0 }, hashProperty[20]; BOOL ret; DWORD size; + DWORD dwSizeWithNull; memset(hash, 0, sizeof(hash)); memset(hashProperty, 0, sizeof(hashProperty)); size = sizeof(hash); ret = CryptHashCertificate(0, algID, 0, data, dataLen, hash, &size); ok(ret, "CryptHashCertificate failed: %08x\n", GetLastError()); + ret = CertGetCertificateContextProperty(context, propID, NULL, + &dwSizeWithNull); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); ret = CertGetCertificateContextProperty(context, propID, hashProperty, &size); ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); ok(!memcmp(hash, hashProperty, size), "Unexpected hash for property %d\n", propID); + ok(size == dwSizeWithNull, "Unexpected length of hash for property: received %d instead of %d\n", + dwSizeWithNull,size); } static WCHAR cspNameW[] = { 'W','i','n','e','C','r','y','p','t','T','e','m','p',0 };

1 0

Rob Shearman : ole32: Don' t lookup the address for the DllGetClassObject function for ole32. dll in the apartment loaded dll list.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: ed79ddab1d8dcc8835020f656cb39302c00230c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79ddab1d8dcc8835020f656… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun May 13 22:18:11 2007 +0100 ole32: Don't lookup the address for the DllGetClassObject function for ole32.dll in the apartment loaded dll list. Call the function directly for a small performance boost. --- dlls/ole32/compobj.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 614b426..b072026 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -594,10 +594,24 @@ void apartment_joinmta(void) static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, REFCLSID rclsid, REFIID riid, void **ppv) { + static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; HRESULT hr = S_OK; BOOL found = FALSE; struct apartment_loaded_dll *apartment_loaded_dll; + if (!strcmpiW(dllpath, wszOle32)) + { + /* we don't need to control the lifetime of this dll, so use the local + * implementation of DllGetClassObject directly */ + TRACE("calling ole32!DllGetClassObject\n"); + hr = DllGetClassObject(rclsid, riid, ppv); + + if (hr != S_OK) + ERR("DllGetClassObject returned error 0x%08x\n", hr); + + return hr; + } + EnterCriticalSection(&apt->cs); LIST_FOR_EACH_ENTRY(apartment_loaded_dll, &apt->loaded_dlls, struct apartment_loaded_dll, entry)

1 0

Rob Shearman : ole32: Fix CoUninitialize to only free libraries that return S_OK from DllCanUnloadNow .
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 70e8842924cfb1121ec325235065daa47f464010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e8842924cfb1121ec325235… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun May 13 22:17:23 2007 +0100 ole32: Fix CoUninitialize to only free libraries that return S_OK from DllCanUnloadNow. --- dlls/ole32/compobj.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7eef76e..614b426 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -187,10 +187,11 @@ static const WCHAR wszAptWinClass[] = {'O','l','e','M','a','i','n','T','h','r',' static LRESULT CALLBACK apartment_wndproc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath, REFCLSID rclsid, REFIID riid, void **ppv); +static void apartment_freeunusedlibraries(struct apartment *apt); static HRESULT COMPOBJ_DllList_Add(LPCWSTR library_name, OpenDll **ret); static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name); -static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry); +static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry, BOOL free_entry); static DWORD COM_RegReadPath(HKEY hkeyroot, const WCHAR *keyname, const WCHAR *valuename, WCHAR * dst, DWORD dstlen); @@ -399,10 +400,16 @@ DWORD apartment_release(struct apartment *apt) if (apt->filter) IUnknown_Release(apt->filter); + /* free as many unused libraries as possible... */ + apartment_freeunusedlibraries(apt); + + /* ... and free the memory for the apartment loaded dll entry and + * release the dll list reference without freeing the library for the + * rest */ while ((cursor = list_head(&apt->loaded_dlls))) { struct apartment_loaded_dll *apartment_loaded_dll = LIST_ENTRY(cursor, struct apartment_loaded_dll, entry); - COMPOBJ_DllList_ReleaseRef(apartment_loaded_dll->dll); + COMPOBJ_DllList_ReleaseRef(apartment_loaded_dll->dll, FALSE); list_remove(cursor); HeapFree(GetProcessHeap(), 0, apartment_loaded_dll); } @@ -643,7 +650,7 @@ static void apartment_freeunusedlibraries(struct apartment *apt) if (entry->dll->DllCanUnloadNow && (entry->dll->DllCanUnloadNow() == S_OK)) { list_remove(&entry->entry); - COMPOBJ_DllList_ReleaseRef(entry->dll); + COMPOBJ_DllList_ReleaseRef(entry->dll, TRUE); HeapFree(GetProcessHeap(), 0, entry); } } @@ -745,9 +752,11 @@ static OpenDll *COMPOBJ_DllList_Get(LPCWSTR library_name) return ret; } -static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry) +/* pass FALSE for free_entry to release a reference without destroying the + * entry if it reaches zero or TRUE otherwise */ +static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry, BOOL free_entry) { - if (!InterlockedDecrement(&entry->refs)) + if (!InterlockedDecrement(&entry->refs) && free_entry) { EnterCriticalSection(&csOpenDllList); list_remove(&entry->entry);

1 0

Frank Richter : credui: Add German translation.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 5c5fc99700ceac1c98c4845c2f5e66e4cfce6f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5fc99700ceac1c98c4845c2… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:00:46 2007 +0200 credui: Add German translation. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_De.rc | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index cc67a3a..7747008 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -24,5 +24,6 @@ #include "winnls.h" #include "credui_resources.h" +#include "credui_De.rc" #include "credui_En.rc" #include "credui_Pl.rc" diff --git a/dlls/credui/credui_De.rc b/dlls/credui/credui_De.rc new file mode 100644 index 0000000..9b7d8ee --- /dev/null +++ b/dlls/credui/credui_De.rc @@ -0,0 +1,36 @@ +/* + * German language resource file for Credentials UI + * + * Copyright 2007 Frank Richter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 220, 82 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Benutzername und Passwort eingeben" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Benutzername:",IDC_STATIC,7,10,72,12,SS_CENTERIMAGE + EDITTEXT IDC_USERNAME,80,10,130,12,ES_AUTOHSCROLL + LTEXT "&Passwort:",IDC_STATIC,7,27,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,27,130,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "&Dom�nenname:",IDC_STATIC,7,44,72,12,SS_CENTERIMAGE + EDITTEXT IDC_DOMAIN,80,44,130,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,7,61,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,67,61,50,14 +END

1 0

Frank Richter : shell32: Update German resources.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 7108412a5383e024f407ee72bc5ce82805112e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7108412a5383e024f407ee72b… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:01:24 2007 +0200 shell32: Update German resources. --- dlls/shell32/shell32_De.rc | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index d6cb815..4ea7a21 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -105,6 +105,19 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Meldung" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Ja", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ja zu &allen", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nein", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Informationen �ber %s"

1 0

Frank Richter : wordpad: Update German translation.
by Alexandre Julliard May 14, 2007

May 14, 2007

Module: wine Branch: master Commit: 8cdfff10f4eb7e5ce2831c72480cf91a8fcc02fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdfff10f4eb7e5ce2831c724… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun May 13 16:29:08 2007 +0200 wordpad: Update German translation. --- programs/wordpad/De.rc | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 1d58b7b..6d973ab 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -66,3 +66,10 @@ BEGIN END END END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rich-Text-Format (*.rtf)" + STRING_TEXT_FILES_TXT, "Textdateien (*.txt)" + STRING_ALL_FILES, "Alle Dokumente (*.*)" +END

1 0