July 2008 - Wine-commits - list.winehq.org

Frans Kool : winhlp32: Fixed Dutch translations.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 9d2e5091b908fd149af3350b406f48fa0bbb8682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2e5091b908fd149af3350b4… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Jul 15 22:07:47 2008 +0200 winhlp32: Fixed Dutch translations. --- programs/winhlp32/Nl.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Nl.rc b/programs/winhlp32/Nl.rc index 4dece1d..78d9a68 100644 --- a/programs/winhlp32/Nl.rc +++ b/programs/winhlp32/Nl.rc @@ -76,6 +76,14 @@ CAPTION "Index" PUSHBUTTON "&Annuleren", IDCANCEL, 120, 170, 50, 12 } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Zoeken" +{ + LTEXT "Nog niet geimplementeerd", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL {

1 0

Frans Kool : regedit: Fixed Dutch translations.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 9eaf4c2890b02a028064339c8478477974b79ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eaf4c2890b02a028064339c8… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Jul 15 21:04:35 2008 +0200 regedit: Fixed Dutch translations. --- programs/regedit/Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index 19de93c..69c5858 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/Nl.rc @@ -293,6 +293,7 @@ BEGIN IDS_TOO_BIG_VALUE "Waarde te groot (%ld)" IDS_DELETE_BOX_TITLE "Waarde verwijderen bevestigen" IDS_DELETE_BOX_TEXT "Weet u zeker dat u de waarde '%s' wilt verwijderen?" + IDS_DELETE_BOX_TEXT_MULTIPLE "Weet u zeker dat u deze waarden wilt verwijderen?" IDS_NEWKEY "Nieuwe sleutel #%d" IDS_NEWVALUE "Nieuwe waarde #%d" IDS_NOTFOUND "Tekenreeks '%s' niet gevonden"

1 0

Frans Kool : shell32: Fixed Dutch translations.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 2860f486758b78936929667ae361a7c15b4f2a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2860f486758b78936929667ae… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Tue Jul 15 17:23:23 2008 +0200 shell32: Fixed Dutch translations. --- dlls/shell32/shell32_Nl.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index f24bc61..e90e78a 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -222,6 +222,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Afsluiten" IDS_SHUTDOWN_PROMPT "Wilt u uw Wine sessie afsluiten?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "Fout tijdens tonen Uitvoeren Bestand venster (interne fout)" + IDS_RUNDLG_BROWSE_ERROR "Fout tijdens tonen Bladeren venster (interne fout)" + IDS_RUNDLG_BROWSE_CAPTION "Bladeren" + IDS_RUNDLG_BROWSE_FILTER "Uitvoerbare bestanden\0*.exe\0Alle bestanden\0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "Start Menu\\Programmas" IDS_PERSONAL "Mijn Documenten"

1 0

Juan Lang : wintrust: Correct error slot for SoftpubLoadSignature.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 88ac766f8b90db7e5ca4d8c3a4811dd6150373e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ac766f8b90db7e5ca4d8c3a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 15 12:11:25 2008 -0700 wintrust: Correct error slot for SoftpubLoadSignature. --- dlls/wintrust/softpub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 5e4e086..c2eb1eb 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -496,7 +496,7 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) else ret = TRUE; if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = GetLastError(); return ret ? S_OK : S_FALSE; }

1 0

Juan Lang : wintrust: Add tests for WinVerifyTrust/WinVerifyTrustEx.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: a3e601ecf0e9d3ac991f993e6d192a6c77b1f691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e601ecf0e9d3ac991f993e6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 15 11:48:31 2008 -0700 wintrust: Add tests for WinVerifyTrust/WinVerifyTrustEx. --- dlls/wintrust/tests/softpub.c | 48 +++++++++++++++++++++++++++++++++++----- 1 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 29390a4..62b115a 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -229,6 +229,17 @@ static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) } } +static void getNotepadPath(WCHAR *notepadPathW, DWORD size) +{ + static const CHAR notepad[] = "\\notepad.exe"; + CHAR notepadPath[MAX_PATH]; + + /* Workaround missing W-functions for win9x */ + GetWindowsDirectoryA(notepadPath, MAX_PATH); + lstrcatA(notepadPath, notepad); + MultiByteToWideChar(0, 0, notepadPath, -1, notepadPathW, size); +} + static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; @@ -251,8 +262,6 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) funcs->pfnAlloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); if (data.padwTrustStepErrors) { - static const CHAR notepad[] = "\\notepad.exe"; - CHAR notepadPath[MAX_PATH]; WCHAR notepadPathW[MAX_PATH]; PROVDATA_SIP provDataSIP = { 0 }; static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, @@ -286,10 +295,7 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) /* Crashes ret = funcs->pfnObjectTrust(&data); */ - /* Workaround missing W-functions for win9x */ - GetWindowsDirectoryA(notepadPath, MAX_PATH); - lstrcatA(notepadPath, notepad); - MultiByteToWideChar(0, 0, notepadPath, -1, notepadPathW, MAX_PATH); + getNotepadPath(notepadPathW, MAX_PATH); fileInfo.pcwszFilePath = notepadPathW; /* pfnObjectTrust now crashes unless both pPDSip and psPfns are set */ U(data).pPDSip = &provDataSIP; @@ -417,7 +423,37 @@ static void test_provider_funcs(void) } } +static void test_wintrust(void) +{ + static GUID generic_action_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; + WINTRUST_DATA wtd; + WINTRUST_FILE_INFO file; + LONG r; + HRESULT hr; + WCHAR notepadPathW[MAX_PATH]; + + memset(&wtd, 0, sizeof(wtd)); + wtd.cbStruct = sizeof(wtd); + wtd.dwUIChoice = WTD_UI_NONE; + wtd.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; + wtd.dwUnionChoice = WTD_CHOICE_FILE; + wtd.pFile = &file; + wtd.dwStateAction = WTD_STATEACTION_VERIFY; + memset(&file, 0, sizeof(file)); + file.cbStruct = sizeof(file); + getNotepadPath(notepadPathW, MAX_PATH); + file.pcwszFilePath = notepadPathW; + r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + todo_wine + ok(r == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", r); + hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + todo_wine + ok(hr == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", + hr); +} + START_TEST(softpub) { test_provider_funcs(); + test_wintrust(); }

1 0

Juan Lang : wintrust: Execute WinVerifyTrust as a sequence of steps, and return the error code from the first failing step of the sequence.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: b871679922efd56777bc24a94bc5c9463110b231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b871679922efd56777bc24a94… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 15 12:09:44 2008 -0700 wintrust: Execute WinVerifyTrust as a sequence of steps, and return the error code from the first failing step of the sequence. --- dlls/wintrust/tests/softpub.c | 2 - dlls/wintrust/wintrust_main.c | 51 +++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 62b115a..aa27333 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -444,10 +444,8 @@ static void test_wintrust(void) getNotepadPath(notepadPathW, MAX_PATH); file.pcwszFilePath = notepadPathW; r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - todo_wine ok(r == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", r); hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - todo_wine ok(hr == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", hr); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 28d5a25..ed6a8ed 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -66,12 +66,35 @@ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert ) return ret; } +typedef HRESULT (WINAPI *wintrust_step_func)(CRYPT_PROVIDER_DATA *data); + +struct wintrust_step +{ + wintrust_step_func func; + DWORD error_index; +}; + +static DWORD WINTRUST_ExecuteSteps(const struct wintrust_step *steps, + DWORD numSteps, CRYPT_PROVIDER_DATA *provData) +{ + DWORD i, err = ERROR_SUCCESS; + + for (i = 0; !err && i < numSteps; i++) + { + err = steps[i].func(provData); + if (err) + err = provData->padwTrustStepErrors[steps[i].error_index]; + } + return err; +} + static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, WINTRUST_DATA *data) { - DWORD err = ERROR_SUCCESS; + DWORD err = ERROR_SUCCESS, numSteps = 0; CRYPT_PROVIDER_DATA *provData; BOOL ret; + struct wintrust_step verifySteps[5]; TRACE("(%p, %s, %p)\n", hwnd, debugstr_guid(actionID), data); @@ -113,30 +136,30 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, if (provData->psPfns->pfnInitialize) { - err = provData->psPfns->pfnInitialize(provData); - if (err) - goto done; + verifySteps[numSteps].func = provData->psPfns->pfnInitialize; + verifySteps[numSteps++].error_index = TRUSTERROR_STEP_FINAL_WVTINIT; } if (provData->psPfns->pfnObjectTrust) { - err = provData->psPfns->pfnObjectTrust(provData); - if (err) - goto done; + verifySteps[numSteps].func = provData->psPfns->pfnObjectTrust; + verifySteps[numSteps++].error_index = TRUSTERROR_STEP_FINAL_OBJPROV; } if (provData->psPfns->pfnSignatureTrust) { - err = provData->psPfns->pfnSignatureTrust(provData); - if (err) - goto done; + verifySteps[numSteps].func = provData->psPfns->pfnSignatureTrust; + verifySteps[numSteps++].error_index = TRUSTERROR_STEP_FINAL_SIGPROV; } if (provData->psPfns->pfnCertificateTrust) { - err = provData->psPfns->pfnCertificateTrust(provData); - if (err) - goto done; + verifySteps[numSteps].func = provData->psPfns->pfnCertificateTrust; + verifySteps[numSteps++].error_index = TRUSTERROR_STEP_FINAL_CERTPROV; } if (provData->psPfns->pfnFinalPolicy) - err = provData->psPfns->pfnFinalPolicy(provData); + { + verifySteps[numSteps].func = provData->psPfns->pfnFinalPolicy; + verifySteps[numSteps++].error_index = TRUSTERROR_STEP_FINAL_POLICYPROV; + } + err = WINTRUST_ExecuteSteps(verifySteps, numSteps, provData); goto done; oom:

1 0

Andrew Talbot : shell32: Remove unneeded address-of operators from array names.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 7f80d8e0c9e7838a6976b9fd753d5f1ddccc96f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f80d8e0c9e7838a6976b9fd7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 14 18:44:17 2008 +0100 shell32: Remove unneeded address-of operators from array names. --- dlls/shell32/control.c | 2 +- dlls/shell32/cpanelfolder.c | 4 ++-- dlls/shell32/debughlp.c | 10 +++++----- dlls/shell32/pidl.c | 10 +++++----- dlls/shell32/shellord.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 2a58f67..dbebbd2 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -335,7 +335,7 @@ static void Control_RegisterRegistryApplets(HWND hWnd, CPanel *panel, HKEY hkey_ DWORD nameLen = MAX_PATH; DWORD valueLen = MAX_PATH; - if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) + if (RegEnumValueW(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)value, &valueLen) != ERROR_SUCCESS) break; Control_LoadApplet(hWnd, value, panel); diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index e3f9ffb..93a79c5 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -241,7 +241,7 @@ static LPITEMIDLIST _ILCreateCPanelApplet(LPCSTR name, LPCSTR displayName, PIDLCPanelStruct *p; LPITEMIDLIST pidl; PIDLDATA tmp; - int size0 = (char*)&tmp.u.cpanel.szName-(char*)&tmp.u.cpanel; + int size0 = (char*)tmp.u.cpanel.szName-(char*)&tmp.u.cpanel; int size = size0; int l; @@ -356,7 +356,7 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDList* list, HKEY hkey_root, L DWORD nameLen = MAX_PATH; DWORD valueLen = MAX_PATH; - if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)&value, &valueLen) != ERROR_SUCCESS) + if (RegEnumValueA(hkey, idx, name, &nameLen, NULL, NULL, (LPBYTE)value, &valueLen) != ERROR_SUCCESS) break; if (SHELL_RegisterCPanelApp(list, value)) diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index 50bf0dc..3223839 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -60,7 +60,7 @@ static LPPIDLDATA _dbg_ILGetDataPointer(LPCITEMIDLIST pidl) { if(pidl && pidl->mkid.cb != 0x00) - return (LPPIDLDATA) &(pidl->mkid.abID); + return (LPPIDLDATA)pidl->mkid.abID; return NULL; } @@ -82,21 +82,21 @@ LPSTR _dbg_ILGetTextPointer(LPCITEMIDLIST pidl) case PT_DRIVE1: case PT_DRIVE2: case PT_DRIVE3: - return (LPSTR)&(pdata->u.drive.szDriveName); + return (LPSTR)pdata->u.drive.szDriveName; case PT_FOLDER: case PT_FOLDER1: case PT_VALUE: case PT_IESPECIAL1: case PT_IESPECIAL2: - return (LPSTR)&(pdata->u.file.szNames); + return (LPSTR)pdata->u.file.szNames; case PT_WORKGRP: case PT_COMP: case PT_NETWORK: case PT_NETPROVIDER: case PT_SHARE: - return (LPSTR)&(pdata->u.network.szNames); + return (LPSTR)pdata->u.network.szNames; } } return NULL; @@ -140,7 +140,7 @@ LPWSTR _dbg_ILGetTextPointerW(LPCITEMIDLIST pidl) return NULL; case PT_VALUEW: - return (LPWSTR)&(pdata->u.file.szNames); + return (LPWSTR)pdata->u.file.szNames; } } return NULL; diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a971067..9a9218e 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1886,7 +1886,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) { if(pidl && pidl->mkid.cb != 0x00) - return (LPPIDLDATA) &(pidl->mkid.abID); + return (LPPIDLDATA)pidl->mkid.abID; return NULL; } @@ -1934,7 +1934,7 @@ LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl) return NULL; case PT_VALUEW: - return (LPWSTR)&(pdata->u.file.szNames); + return (LPWSTR)pdata->u.file.szNames; } return NULL; } @@ -1964,21 +1964,21 @@ LPSTR _ILGetTextPointer(LPCITEMIDLIST pidl) case PT_DRIVE1: case PT_DRIVE2: case PT_DRIVE3: - return (LPSTR)&(pdata->u.drive.szDriveName); + return (LPSTR)pdata->u.drive.szDriveName; case PT_FOLDER: case PT_FOLDER1: case PT_VALUE: case PT_IESPECIAL1: case PT_IESPECIAL2: - return (LPSTR)&(pdata->u.file.szNames); + return (LPSTR)pdata->u.file.szNames; case PT_WORKGRP: case PT_COMP: case PT_NETWORK: case PT_NETPROVIDER: case PT_SHARE: - return (LPSTR)&(pdata->u.network.szNames); + return (LPSTR)pdata->u.network.szNames; } return NULL; } diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5d1666b..0905bf9 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -718,7 +718,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) /* See if we need to do anything. */ datalen = 64; - ret=SHADD_get_policy( "NoRecentDocsHistory", &type, &data, &datalen); + ret=SHADD_get_policy( "NoRecentDocsHistory", &type, data, &datalen); if ((ret > 0) && (ret != ERROR_FILE_NOT_FOUND)) { ERR("Error %d getting policy \"NoRecentDocsHistory\"\n", ret); return;

1 0

Maarten Lankhorst : winemp3: Be more tolerant to what a valid mp3 header is .
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: f53f5ebd8121ee1cdc88ba7db969720857051ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53f5ebd8121ee1cdc88ba7db… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 14 14:20:28 2008 -0700 winemp3: Be more tolerant to what a valid mp3 header is. --- dlls/winemp3.acm/mpegl3.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 1ea19c0..23ba586 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -116,7 +116,7 @@ static DWORD MPEG3_GetFormatIndex(LPWAVEFORMATEX wfx) { if (wfx->nChannels == fmts[i].nChannels && wfx->nSamplesPerSec == fmts[i].rate && - wfx->wBitsPerSample == fmts[i].nBits) + (wfx->wBitsPerSample == fmts[i].nBits || !fmts[i].nBits)) return i; }

1 0

Maarten Lankhorst : quartz: Explicitly handle wave headers in avi splitter.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 3ad7198961d25e30f55c9de333e01f8a2c9ceb48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad7198961d25e30f55c9de33… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 14 14:22:09 2008 -0700 quartz: Explicitly handle wave headers in avi splitter. --- dlls/quartz/avisplit.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 9d00b4d..2bbd8f1 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -724,6 +724,15 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE if (pvi->bmiHeader.biCompression) amt.subtype.Data1 = pvi->bmiHeader.biCompression; } + else if (IsEqualIID(&amt.formattype, &FORMAT_WaveFormatEx)) + { + amt.cbFormat = pChunk->cb; + if (amt.cbFormat < sizeof(WAVEFORMATEX)) + amt.cbFormat = sizeof(WAVEFORMATEX); + amt.pbFormat = CoTaskMemAlloc(amt.cbFormat); + ZeroMemory(amt.pbFormat, amt.cbFormat); + CopyMemory(amt.pbFormat, (const BYTE *)(pChunk + 1), pChunk->cb); + } else { amt.cbFormat = pChunk->cb;

1 0

Kai Blin : secur32: Fix GetComputerObjectName tests for domain members.
by Alexandre Julliard 16 Jul '08

16 Jul '08

Module: wine Branch: master Commit: 84935f5ce0edc5063e1b5708a4d61da174d93866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84935f5ce0edc5063e1b5708a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Jul 15 09:45:49 2008 +0200 secur32: Fix GetComputerObjectName tests for domain members. At least for XP domain members, all EXTENDED_NAME_FORMATS apart from NameSamCompatible return ERROR_ACCESS_DENIED. Given that the function returns an error for all formats on non-members, just ignore ERROR_ACCESS_DENIED as well. --- dlls/secur32/tests/secur32.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index ceacae2..43704a9 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -55,7 +55,8 @@ static void testGetComputerObjectNameA(void) ok(rc || ((formats[i] == NameUnknown) && (GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN), + (GetLastError() == ERROR_NO_SUCH_DOMAIN) || + (GetLastError() == ERROR_ACCESS_DENIED), "GetComputerObjectNameA(%d) failed: %d\n", formats[i], GetLastError()); if (rc) @@ -77,7 +78,8 @@ static void testGetComputerObjectNameW(void) ok(rc || ((formats[i] == NameUnknown) && (GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN), + (GetLastError() == ERROR_NO_SUCH_DOMAIN) || + (GetLastError() == ERROR_ACCESS_DENIED), "GetComputerObjectNameW(%d) failed: %d\n", formats[i], GetLastError()); if (rc) {

1 0