wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

James Hawkins : kernel32: Fix a few failing tests in win2k.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: a4f733ab0b558bca9db51bfe6c7ea3882604faee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f733ab0b558bca9db51bfe6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:37:09 2008 -0500 kernel32: Fix a few failing tests in win2k. --- dlls/kernel32/tests/environ.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index fb33304..c7737d0 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -364,6 +364,8 @@ static void test_GetComputerNameExA(void) LPSTR name; DWORD error; + static const int MAX_COMP_NAME = 32767; + if (!pGetComputerNameExA) { skip("GetComputerNameExA function not implemented\n"); @@ -373,8 +375,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameDnsDomain, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("domain size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsDomain, name, &size); @@ -385,8 +390,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("fully qualified hostname size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, name, &size); @@ -397,8 +405,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameDnsHostname, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("hostname size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsHostname, name, &size); @@ -409,8 +420,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameNetBIOS, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("NetBIOS size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameNetBIOS, name, &size);

1 0

James Hawkins : kernel32: Split the GetComputerName/ Ex tests into their own test functions.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 25c02c884f68e15bd2db84fec7f5aac7757f59f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c02c884f68e15bd2db84fec… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:36:09 2008 -0500 kernel32: Split the GetComputerName/Ex tests into their own test functions. --- dlls/kernel32/tests/environ.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 958da24..fb33304 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -25,6 +25,17 @@ #include "winbase.h" #include "winerror.h" +static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); +static BOOL (WINAPI *pGetComputerNameExW)(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD); + +static void init_functionpointers(void) +{ + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + + pGetComputerNameExA = (void *)GetProcAddress(hkernel32, "GetComputerNameExA"); + pGetComputerNameExW = (void *)GetProcAddress(hkernel32, "GetComputerNameExW"); +} + static void test_GetSetEnvironmentVariableA(void) { char buf[256]; @@ -291,9 +302,6 @@ static void test_ExpandEnvironmentStringsA(void) SetEnvironmentVariableA("EnvVar", NULL); } -static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); -static BOOL (WINAPI *pGetComputerNameExW)(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD); - static void test_GetComputerName(void) { DWORD size; @@ -347,11 +355,18 @@ static void test_GetComputerName(void) ok(ret, "GetComputerNameW failed with error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, nameW); } +} + +static void test_GetComputerNameExA(void) +{ + DWORD size; + BOOL ret; + LPSTR name; + DWORD error; - pGetComputerNameExA = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExA"); if (!pGetComputerNameExA) { - skip("GetComputerNameExA function not implemented, so not testing\n"); + skip("GetComputerNameExA function not implemented\n"); return; } @@ -402,11 +417,18 @@ static void test_GetComputerName(void) ok(ret, "GetComputerNameExA(ComputerNameNetBIOS) failed with error %d\n", GetLastError()); trace("NetBIOS name is \"%s\"\n", name); HeapFree(GetProcessHeap(), 0, name); +} + +static void test_GetComputerNameExW(void) +{ + DWORD size; + BOOL ret; + LPWSTR nameW; + DWORD error; - pGetComputerNameExW = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "GetComputerNameExW"); if (!pGetComputerNameExW) { - skip("GetComputerNameExW function not implemented, so not testing\n"); + skip("GetComputerNameExW function not implemented\n"); return; } @@ -453,8 +475,12 @@ static void test_GetComputerName(void) START_TEST(environ) { + init_functionpointers(); + test_GetSetEnvironmentVariableA(); test_GetSetEnvironmentVariableW(); test_ExpandEnvironmentStringsA(); test_GetComputerName(); + test_GetComputerNameExA(); + test_GetComputerNameExW(); }

1 0

James Hawkins : user32: Fix a test that fails in XP and win2k3.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: b8bdb1304b503007a819c7fca1044904c0eb4155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bdb1304b503007a819c7fca… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:33:31 2008 -0500 user32: Fix a test that fails in XP and win2k3. --- dlls/user32/tests/sysparams.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 320bd04..7623a67 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2554,11 +2554,13 @@ static void test_EnumDisplaySettings(void) num = 1; while (1) { - SetLastError (0xdeadbeef); - if (!EnumDisplaySettings(NULL, num++, &devmode)) { - DWORD le = GetLastError(); - ok (le == ERROR_NO_MORE_FILES, "Last error on EnumDisplaySettings was %d, expected ERROR_NO_MORE_FILES\n", le); - break; + SetLastError (0xdeadbeef); + if (!EnumDisplaySettings(NULL, num++, &devmode)) { + DWORD le = GetLastError(); + ok(le == ERROR_NO_MORE_FILES || + le == 0xdeadbeef, /* XP, 2003 */ + "Expected ERROR_NO_MORE_FILES or 0xdeadbeef, got %d\n", le); + break; } } }

1 0

Rob Shearman : msi: Fix the value parameter of IWineMsiRemotePackage:: FormatRecord to have the right level of indirection for an [out] parameter.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 4a75b8bf092fe4f7b2bf8afe6693ad566cb1b22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a75b8bf092fe4f7b2bf8afe6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Apr 16 17:22:52 2008 +0100 msi: Fix the value parameter of IWineMsiRemotePackage::FormatRecord to have the right level of indirection for an [out] parameter. Remove the redundant size parameter and simplify the client code such that the remote function is only called once, with the value being automatically allocated. Add corresponding code on the server side to automatically allocate said value. --- dlls/msi/format.c | 17 +---------------- dlls/msi/msiserver.idl | 2 +- dlls/msi/package.c | 13 +++++++++++-- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index f58f517..454142a 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -921,28 +921,13 @@ UINT WINAPI MsiFormatRecordW( MSIHANDLE hInstall, MSIHANDLE hRecord, HRESULT hr; IWineMsiRemotePackage *remote_package; BSTR value = NULL; - DWORD len; awstring wstr; remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); if (remote_package) { - len = 0; hr = IWineMsiRemotePackage_FormatRecord( remote_package, hRecord, - NULL, &len ); - if (FAILED(hr)) - goto done; - - len++; - value = SysAllocStringLen( NULL, len ); - if (!value) - { - r = ERROR_OUTOFMEMORY; - goto done; - } - - hr = IWineMsiRemotePackage_FormatRecord( remote_package, hRecord, - value, &len ); + &value ); if (FAILED(hr)) goto done; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index d5b47ac..37aa91e 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -70,7 +70,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetComponentState( [in] BSTR component, [in] INSTALLSTATE state ); HRESULT GetLanguage( [out] LANGID *language ); HRESULT SetInstallLevel( [in] int level ); - HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR value, [out] DWORD *size ); + HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR *value ); HRESULT EvaluateCondition( [in] BSTR condition ); } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a587a63..f11b068 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1812,10 +1812,19 @@ static HRESULT WINAPI mrp_SetInstallLevel( IWineMsiRemotePackage *iface, int lev } static HRESULT WINAPI mrp_FormatRecord( IWineMsiRemotePackage *iface, MSIHANDLE record, - BSTR value, DWORD *size ) + BSTR *value) { + DWORD size = 0; msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); - UINT r = MsiFormatRecordW(This->package, record, (LPWSTR)value, size); + UINT r = MsiFormatRecordW(This->package, record, NULL, &size); + if (r == ERROR_SUCCESS) + { + *value = SysAllocStringLen(NULL, size); + if (!*value) + return E_OUTOFMEMORY; + size++; + r = MsiFormatRecordW(This->package, record, *value, &size); + } return HRESULT_FROM_WIN32(r); }

1 0

Aric Stewart : imm32: Create the IME UI window with the IME instance so the registered class can be found .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 1eece6eee65e18ffda46113b310d9c37997f03dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eece6eee65e18ffda46113b3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 16 14:30:13 2008 -0500 imm32: Create the IME UI window with the IME instance so the registered class can be found. --- dlls/imm32/imm.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4eac53a..c267a70 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -92,7 +92,6 @@ typedef struct _tagIMMThreadData { HWND hwndDefault; } IMMThreadData; -static HANDLE hImeInst; static DWORD tlsIndex = 0; static struct list ImmHklList = LIST_INIT(ImmHklList); @@ -294,7 +293,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - hImeInst = hInstDLL; IMM_RegisterMessages(); tlsIndex = TlsAlloc(); IMM_InitThreadData(); @@ -1800,8 +1798,8 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { /* create the ime window */ data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, - data->immKbd->imeClassName, - NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, hImeInst, 0); + data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, + 0, data->immKbd->hIME, 0); SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data); IMM_GetThreadData()->hwndDefault = data->imeWnd; }

1 0

ByeongSik Jeon : imm32: Implement ImmSetConversionStatus.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 511753196f4ec733dd40196a209baf3cb40193ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=511753196f4ec733dd40196a2… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 16 19:01:29 2008 +0900 imm32: Implement ImmSetConversionStatus. --- dlls/imm32/imm.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c03d6fd..4eac53a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1761,16 +1761,27 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - static int shown = 0; + InputContextData *data = (InputContextData*)hIMC; - if (!shown) { - FIXME("(%p, %d, %d): stub\n", - hIMC, fdwConversion, fdwSentence - ); - shown = 1; - } - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); + + if (!data) + return FALSE; + + if ( fdwConversion != data->IMC.fdwConversion ) + { + data->IMC.fdwConversion = fdwConversion; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCONVERSIONMODE); + ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); + } + if ( fdwSentence != data->IMC.fdwSentence ) + { + data->IMC.fdwSentence = fdwSentence; + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSENTENCEMODE); + ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); + } + + return TRUE; } /***********************************************************************

1 0

ByeongSik Jeon : winex11: Add VK_HANGUL, VK_HANJA for Korean Native IME.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 917164720403c39835076d3a3f90136c997f434a URL: http://source.winehq.org/git/wine.git/?a=commit;h=917164720403c39835076d3a3… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 16 15:55:46 2008 +0900 winex11: Add VK_HANGUL, VK_HANJA for Korean Native IME. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6aa613f..5d48ce7 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -968,7 +968,7 @@ static const WORD nonchar_key_vkey[256] = /* unused */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF20 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF28 */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FF30 */ + 0, VK_HANGUL, 0, 0, VK_HANJA, 0, 0, 0, /* FF30 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF38 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF40 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF48 */

1 0

Alexandre Julliard : comdlg32: CDM_GETSPEC and CDM_GETFILEPATH should preserve double quotes in file lists .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 24fc87286f656a8cbcdf2f4b40d31d55e6eaf622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fc87286f656a8cbcdf2f4b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 18:05:25 2008 +0200 comdlg32: CDM_GETSPEC and CDM_GETFILEPATH should preserve double quotes in file lists. --- dlls/comdlg32/filedlg.c | 108 ++++++++++++++--------------------------------- 1 files changed, 32 insertions(+), 76 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 3e662ec..f64fca7 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -196,7 +196,7 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd); static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd); /* Functions used by the EDIT box */ -static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator); +static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed); /* Functions used by the filetype combo box */ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd); @@ -858,11 +858,10 @@ LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) return hook_result; } -static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer) +static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result) { - UINT sizeUsed = 0, n, total; - LPWSTR lpstrFileList = NULL; - WCHAR lpstrCurrentDir[MAX_PATH]; + UINT len, total; + WCHAR *p, *buffer; FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("CDM_GETFILEPATH:\n"); @@ -871,79 +870,29 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer return -1; /* get path and filenames */ - COMDLG32_GetDisplayNameOf(fodInfos->ShellInfos.pidlAbsCurrent, lpstrCurrentDir); - n = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' '); - - TRACE("path >%s< filespec >%s< %d files\n", - debugstr_w(lpstrCurrentDir),debugstr_w(lpstrFileList),n); - - if( fodInfos->unicode ) - { - LPWSTR bufW = buffer; - total = lstrlenW(lpstrCurrentDir) + 1 + sizeUsed; - - /* Prepend the current path */ - n = lstrlenW(lpstrCurrentDir) + 1; - memcpy( bufW, lpstrCurrentDir, min(n,size) * sizeof(WCHAR)); - if(n<size) - { - /* 'n' includes trailing \0 */ - bufW[n-1] = '\\'; - lstrcpynW( &bufW[n], lpstrFileList, size - n ); - } - TRACE("returned -> %s\n",debugstr_wn(bufW, total)); - } - else + len = SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0 ); + buffer = HeapAlloc( GetProcessHeap(), 0, (len + 2 + MAX_PATH) * sizeof(WCHAR) ); + COMDLG32_GetDisplayNameOf( fodInfos->ShellInfos.pidlAbsCurrent, buffer ); + if (len) { - LPSTR bufA = buffer; - total = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1, - NULL, 0, NULL, NULL); - total += WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, - NULL, 0, NULL, NULL); - - /* Prepend the current path */ - n = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1, - bufA, size, NULL, NULL); - - if(n<size) - { - /* 'n' includes trailing \0 */ - bufA[n-1] = '\\'; - WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, - &bufA[n], size-n, NULL, NULL); - } - - TRACE("returned -> %s\n",debugstr_an(bufA, total)); + p = buffer + strlenW(buffer); + *p++ = '\\'; + SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, len + 1, (LPARAM)p ); } - MemFree(lpstrFileList); - - return total; -} - -static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer) -{ - UINT sizeUsed = 0; - LPWSTR lpstrFileList = NULL; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); - - TRACE("CDM_GETSPEC:\n"); - - FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' '); - if( fodInfos->unicode ) + if (fodInfos->unicode) { - lstrcpynW( buffer, lpstrFileList, size ); + total = strlenW( buffer) + 1; + if (result) lstrcpynW( result, buffer, size ); + TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_w(result)); } else { - LPSTR bufA = buffer; - DWORD sizeA = WideCharToMultiByte( CP_ACP, 0, lpstrFileList, sizeUsed, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, bufA, size, NULL, NULL); - if (size && size < sizeA) bufA[size - 1] = 0; - sizeUsed = sizeA; + total = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL ); + if (total <= size) WideCharToMultiByte( CP_ACP, 0, buffer, -1, result, size, NULL, NULL ); + TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_a(result)); } - MemFree(lpstrFileList); - - return sizeUsed; + HeapFree( GetProcessHeap(), 0, buffer ); + return total; } /*********************************************************************** @@ -980,7 +929,15 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM break; case CDM_GETSPEC: - retval = FILEDLG95_Handle_GetFileSpec(hwnd, (UINT)wParam, (LPSTR)lParam); + TRACE("CDM_GETSPEC:\n"); + retval = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0) + 1; + if (lParam) + { + if (fodInfos->unicode) + SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, wParam, lParam); + else + SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, wParam, lParam); + } break; case CDM_SETCONTROLTEXT: @@ -1797,7 +1754,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) TRACE("hwnd=%p\n", hwnd); /* get the files from the edit control */ - nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, '\0'); + nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed); /* try if the user selected a folder in the shellview */ if(nFileCount == 0) @@ -3204,7 +3161,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPI * The delimiter is specified by the parameter 'separator', * usually either a space or a nul */ -static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator) +static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed) { FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); UINT nStrCharCount = 0; /* index in src buffer */ @@ -3238,7 +3195,7 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount]; nStrCharCount++; } - (*lpstrFileList)[nFileIndex++] = separator; + (*lpstrFileList)[nFileIndex++] = 0; nFileCount++; } nStrCharCount++; @@ -3253,7 +3210,6 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U } /* trailing \0 */ - if (nFileIndex && separator) nFileIndex--; /* remove trailing separator */ (*lpstrFileList)[nFileIndex++] = '\0'; *sizeUsed = nFileIndex;

1 0

Kusanagi Kouichi : winex11.drv: Fix Solaris build error.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 75e40229d2f7b00139923e7648038f3481164ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e40229d2f7b00139923e764… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Wed Apr 16 00:34:54 2008 +0900 winex11.drv: Fix Solaris build error. Solaris doesn't define XICCallback. --- configure | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 +++ dlls/winex11.drv/xim.c | 20 +++++---- include/config.h.in | 3 + 4 files changed, 129 insertions(+), 9 deletions(-) diff --git a/configure b/configure index b66a40a..01fdf19 100755 --- a/configure +++ b/configure @@ -10686,6 +10686,115 @@ esac fi + { echo "$as_me:$LINENO: checking for XICCallback.callback" >&5 +echo $ECHO_N "checking for XICCallback.callback... $ECHO_C" >&6; } +if test "${ac_cv_member_XICCallback_callback+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_X11_XLIB_H +#include <X11/Xlib.h> +#endif + +int +main () +{ +static XICCallback ac_aggr; +if (ac_aggr.callback) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_XICCallback_callback=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_X11_XLIB_H +#include <X11/Xlib.h> +#endif + +int +main () +{ +static XICCallback ac_aggr; +if (sizeof ac_aggr.callback) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_XICCallback_callback=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_XICCallback_callback=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_XICCallback_callback" >&5 +echo "${ECHO_T}$ac_cv_member_XICCallback_callback" >&6; } +if test $ac_cv_member_XICCallback_callback = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_XICCALLBACK_CALLBACK 1 +_ACEOF + + +fi + + opengl_msg="" if test "x$with_opengl" != "xno" diff --git a/configure.ac b/configure.ac index e9dadee..b5c4bf2 100644 --- a/configure.ac +++ b/configure.ac @@ -698,6 +698,12 @@ then WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"], [libxcomposite development files not found, Xcomposite won't be supported.]) + dnl *** Check for XICCallback struct + AC_CHECK_MEMBERS([XICCallback.callback],,, +[#ifdef HAVE_X11_XLIB_H +#include <X11/Xlib.h> +#endif]) + dnl *** End of X11/Xlib.h check dnl Check for the presence of OpenGL diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..e8bf3bb 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -35,6 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +#ifndef HAVE_XICCALLBACK_CALLBACK +#define XICCallback XIMCallback +#define XICProc XIMProc +#endif + BOOL ximInComposeMode=FALSE; /* moved here from imm32 for dll separation */ @@ -501,11 +506,8 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XVaNestedList preedit = NULL; XVaNestedList status = NULL; XIC xic; - XICCallback destroy = {(XPointer)data, X11DRV_DestroyIC}; - XIMCallback P_StartCB; - XIMCallback P_DoneCB; - XIMCallback P_DrawCB; - XIMCallback P_CaretCB; + XICCallback destroy = {(XPointer)data, (XICProc)X11DRV_DestroyIC}; + XICCallback P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); Window win = data->whole_window; @@ -531,13 +533,13 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) /* create callbacks */ P_StartCB.client_data = NULL; - P_StartCB.callback = (XIMProc)XIMPreEditStartCallback; P_DoneCB.client_data = NULL; - P_DoneCB.callback = (XIMProc)XIMPreEditDoneCallback; P_DrawCB.client_data = NULL; - P_DrawCB.callback = (XIMProc)XIMPreEditDrawCallback; P_CaretCB.client_data = NULL; - P_CaretCB.callback = (XIMProc)XIMPreEditCaretCallback; + P_StartCB.callback = (XICProc)XIMPreEditStartCallback; + P_DoneCB.callback = (XICProc)XIMPreEditDoneCallback; + P_DrawCB.callback = (XICProc)XIMPreEditDrawCallback; + P_CaretCB.callback = (XICProc)XIMPreEditCaretCallback; if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) { diff --git a/include/config.h.in b/include/config.h.in index ac464db..f867662 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -945,6 +945,9 @@ /* Define to 1 if you have the <X11/Xutil.h> header file. */ #undef HAVE_X11_XUTIL_H +/* Define to 1 if `callback' is member of `XICCallback'. */ +#undef HAVE_XICCALLBACK_CALLBACK + /* Define if you have the XKB extension */ #undef HAVE_XKB

1 0

Maarten Lankhorst : quartz: Add a Disconnect function to the parser and use it to clean up allocated memory in avisplitter .
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 6165d87fc5d1a2147deba22e802ed41885e48635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6165d87fc5d1a2147deba22e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 15 20:39:36 2008 -0700 quartz: Add a Disconnect function to the parser and use it to clean up allocated memory in avisplitter. --- dlls/quartz/avisplit.c | 141 +++++++++++++++++++++++++++++----------------- dlls/quartz/mpegsplit.c | 8 ++- dlls/quartz/parser.c | 10 ++- dlls/quartz/parser.h | 5 +- dlls/quartz/waveparser.c | 8 ++- 5 files changed, 114 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6165d87fc5d1a2147deba…

1 0

Maarten Lankhorst : quartz: Parse old style avi index.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: aa623d2eff75e03d6269bbb3c75bd296210c6181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa623d2eff75e03d6269bbb3c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 17:58:47 2008 -0700 quartz: Parse old style avi index. --- dlls/quartz/avisplit.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 7a7baff..0d15c75 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -147,8 +147,9 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample) switch (This->CurrentChunk.fcc) { + case ckidAVIOLDINDEX: /* Should not be popping up here! */ + ERR("There should be no index in the stream data!\n"); case ckidAVIPADDING: - case ckidAVIOLDINDEX: /* Index is not handled */ /* silently ignore */ if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE)) bMoreData = FALSE; @@ -633,6 +634,8 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) LONGLONG pos = 0; /* in bytes */ BYTE * pBuffer; RIFFCHUNK * pCurrentChunk; + LONGLONG total, avail; + AVISplitterImpl * pAviSplit = (AVISplitterImpl *)This->pin.pinInfo.pFilter; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); @@ -709,6 +712,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType == ckidINFO)) { pos += sizeof(RIFFCHUNK) + list.cb; + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } @@ -723,13 +727,90 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) return E_FAIL; } + IAsyncReader_Length(This->pReader, &total, &avail); + + /* FIXME: AVIX files are added ("eXtended") beyond the "AVI " length, and thus won't be played here */ if (hr == S_OK) { - pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); - pAviSplit->EndOfFile = MEDIATIME_FROM_BYTES(pos + list.cb + sizeof(RIFFLIST)); + This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); + pos += list.cb + sizeof(RIFFCHUNK); + + pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); + if (pos > total) + { + ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); + return E_FAIL; + } + hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); } + /* Now peek into the idx1 index, if available */ + if (hr == S_OK && (total - pos) > sizeof(RIFFCHUNK)) + { + memset(&list, 0, sizeof(list)); + + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); + if (list.fcc == ckidAVIOLDINDEX) + { + int x = 0; + AVIOLDINDEX * pAviOldIndex = CoTaskMemAlloc(list.cb + sizeof(RIFFCHUNK)); + if (!pAviOldIndex) + return E_OUTOFMEMORY; + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(RIFFCHUNK) + list.cb, (BYTE *)pAviOldIndex); + if (hr == S_OK) + { + for (x = 0; x < list.cb / sizeof(pAviOldIndex->aIndex[0]); ++x) + { + DWORD temp, temp2, offset, chunkid; + ULONGLONG mov_pos = BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset) - sizeof(DWORD); + BOOL relative; + + offset = pAviOldIndex->aIndex[x].dwOffset; + chunkid = pAviOldIndex->aIndex[x].dwChunkId; + + IAsyncReader_SyncRead(This->pReader, offset, sizeof(DWORD), (BYTE *)&temp); + relative = (chunkid != temp); + + if (chunkid == mmioFOURCC('7','F','x','x') + && ((char *)&temp)[0] == 'i' && ((char *)&temp)[1] == 'x') + relative = FALSE; + + if (relative) + { + if (offset + mov_pos < BYTES_FROM_MEDIATIME(pAviSplit->EndOfFile)) + hr = IAsyncReader_SyncRead(This->pReader, offset + mov_pos, sizeof(DWORD), (BYTE *)&temp2); + else hr = S_FALSE; + + if (hr == S_OK && chunkid == mmioFOURCC('7','F','x','x') + && ((char *)&temp2)[0] == 'i' && ((char *)&temp2)[1] == 'x') + { + /* Do nothing, all is great */ + } + else if (hr == S_OK && temp2 != chunkid) + { + ERR("Faulty index or bug in handling: Wanted FOURCC: %s, Absolute FOURCC: %s (@ %u), Relative FOURCC: %s (@ %lld)\n", + debugstr_an((char *)&chunkid, 4), debugstr_an((char *)&temp, 4), offset, debugstr_an((char *)&temp2, 4), mov_pos + offset); + } + else if (hr != S_OK) + { + TRACE("hr: %08x\n", hr); + } + } + + TRACE("Scanned dwChunkId: %s\n", debugstr_an((char *)&temp, 4)); + TRACE("dwChunkId: %.4s\n", (char *)&chunkid); + TRACE("dwFlags: %08x\n", pAviOldIndex->aIndex[x].dwFlags); + TRACE("dwOffset (%s): %08x\n", relative ? "relative" : "absolute", offset); + TRACE("dwSize: %08x\n", pAviOldIndex->aIndex[x].dwSize); + } + } + + CoTaskMemFree(pAviOldIndex); + } + hr = S_OK; + } + if (hr != S_OK) return E_FAIL;

1 0

Maarten Lankhorst : quartz: Make the avi splitter skip index headers.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: f66ad4dbe0433b6679d61f6a147b2cb5e3712fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66ad4dbe0433b6679d61f6a1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 16:40:56 2008 -0700 quartz: Make the avi splitter skip index headers. --- dlls/quartz/avisplit.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ce44f95..7a7baff 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -138,6 +138,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample) WORD streamId; Parser_OutputPin * pOutputPin; BOOL bSyncPoint = TRUE; + BYTE *fcc = (BYTE *)&This->CurrentChunk.fcc; if (This->CurrentChunkOffset >= tStart) offset_src = (long)BYTES_FROM_MEDIATIME(This->CurrentChunkOffset - tStart) + sizeof(RIFFCHUNK); @@ -196,6 +197,13 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample) #endif } + if (fcc[0] == 'i' && fcc[1] == 'x') + { + if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE)) + bMoreData = FALSE; + continue; + } + streamId = StreamFromFOURCC(This->CurrentChunk.fcc); if (streamId > This->Parser.cStreams)

1 0

Maarten Lankhorst : quartz: Dump opendml indexes and header.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 64be38a5b20b5fe64d52e4c2464434e6b5a313d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64be38a5b20b5fe64d52e4c24… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 14:02:26 2008 -0700 quartz: Dump opendml indexes and header. --- dlls/quartz/avisplit.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 135 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ee002ce..ce44f95 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -3,6 +3,7 @@ * * Copyright 2003 Robert Shearman * Copyright 2004-2005 Christian Costa + * Copyright 2008 Maarten Lankhorst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -340,6 +341,60 @@ static HRESULT AVISplitter_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_FALSE; } +static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, LONGLONG qwOffset, DWORD cb) +{ + AVISTDINDEX *pIndex; + int x; + long rest; + + if (cb < sizeof(AVISTDINDEX)) + { + FIXME("size %u too small\n", cb); + return E_INVALIDARG; + } + + pIndex = CoTaskMemAlloc(cb); + if (!pIndex) + return E_OUTOFMEMORY; + + IAsyncReader_SyncRead(((PullPin *)This->Parser.ppPins[0])->pReader, qwOffset, cb, (BYTE *)pIndex); + pIndex = CoTaskMemRealloc(pIndex, pIndex->cb); + if (!pIndex) + return E_OUTOFMEMORY; + + IAsyncReader_SyncRead(((PullPin *)This->Parser.ppPins[0])->pReader, qwOffset, pIndex->cb, (BYTE *)pIndex); + rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + + TRACE("wLongsPerEntry: %hd\n", pIndex->wLongsPerEntry); + TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); + TRACE("bIndexType: %hd\n", pIndex->bIndexType); + TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse); + TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId); + TRACE("qwBaseOffset: %x%08x\n", (DWORD)(pIndex->qwBaseOffset >> 32), (DWORD)pIndex->qwBaseOffset); + TRACE("dwReserved_3: %u\n", pIndex->dwReserved_3); + + if (pIndex->bIndexType != AVI_INDEX_OF_CHUNKS + || pIndex->wLongsPerEntry != 2 + || rest < (pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry) + || (pIndex->bIndexSubType != AVI_INDEX_SUB_DEFAULT)) + { + FIXME("Invalid index chunk encountered\n"); + return E_INVALIDARG; + } + + for (x = 0; x < pIndex->nEntriesInUse; ++x) + { + BOOL keyframe = !(pIndex->aIndex[x].dwOffset >> 31); + DWORDLONG offset = pIndex->qwBaseOffset + (pIndex->aIndex[x].dwOffset & ~(1<<31)); + TRACE("dwOffset: %x%08x\n", (DWORD)(offset >> 32), (DWORD)offset); + TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); + TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); + } + + CoTaskMemFree(pIndex); + return S_OK; +} + static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE * pData, DWORD cb) { PIN_INFO piOutput; @@ -388,6 +443,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE amt.formattype = FORMAT_WaveFormatEx; break; default: + FIXME("fccType %.4s not handled yet\n", (char *)&pStrHdr->fccType); amt.formattype = FORMAT_None; } amt.majortype = MEDIATYPE_Video; @@ -456,6 +512,48 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE case ckidAVIPADDING: TRACE("JUNK chunk ignored\n"); break; + case ckidAVISUPERINDEX: + { + const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk; + int x; + long rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + + if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) + { + FIXME("%u < %u?!\n", pIndex->cb, sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)); + break; + } + + TRACE("wLongsPerEntry: %hd\n", pIndex->wLongsPerEntry); + TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); + TRACE("bIndexType: %hd\n", pIndex->bIndexType); + TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse); + TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId); + if (pIndex->dwReserved[0]) + TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); + if (pIndex->dwReserved[2]) + TRACE("dwReserved[1]: %u\n", pIndex->dwReserved[1]); + if (pIndex->dwReserved[2]) + TRACE("dwReserved[2]: %u\n", pIndex->dwReserved[2]); + + if (pIndex->bIndexType != AVI_INDEX_OF_INDEXES + || pIndex->wLongsPerEntry != 4 + || rest < (pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry) + || (pIndex->bIndexSubType != AVI_INDEX_SUB_2FIELD && pIndex->bIndexSubType != AVI_INDEX_SUB_DEFAULT)) + { + FIXME("Invalid index chunk encountered\n"); + break; + } + for (x = 0; x < pIndex->nEntriesInUse; ++x) + { + TRACE("qwOffset: %x%08x\n", (DWORD)(pIndex->aIndex[x].qwOffset >> 32), (DWORD)pIndex->aIndex[x].qwOffset); + TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); + AVISplitter_ProcessIndex(This, pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); + + TRACE("dwDuration: %u (unreliable)\n", pIndex->aIndex[x].dwDuration); + } + break; + } default: FIXME("unknown chunk type \"%.04s\" ignored\n", (LPCSTR)&pChunk->fcc); } @@ -482,6 +580,42 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE return hr; } +static HRESULT AVISplitter_ProcessODML(AVISplitterImpl * This, const BYTE * pData, DWORD cb) +{ + const RIFFCHUNK * pChunk; + + for (pChunk = (const RIFFCHUNK *)pData; + ((const BYTE *)pChunk >= pData) && ((const BYTE *)pChunk + sizeof(RIFFCHUNK) < pData + cb) && (pChunk->cb > 0); + pChunk = (const RIFFCHUNK *)((const BYTE*)pChunk + sizeof(RIFFCHUNK) + pChunk->cb) + ) + { + switch (pChunk->fcc) + { + case ckidAVIEXTHEADER: + { + int x; + const AVIEXTHEADER * pExtHdr = (const AVIEXTHEADER *)pChunk; + + TRACE("processing extension header\n"); + if (pExtHdr->cb != sizeof(AVIEXTHEADER) - sizeof(RIFFCHUNK)) + { + FIXME("Size: %u, other size: %u\n", pExtHdr->cb, sizeof(AVIEXTHEADER) - sizeof(RIFFCHUNK)); + break; + } + TRACE("dwGrandFrames: %u\n", pExtHdr->dwGrandFrames); + for (x = 0; x < 61; ++x) + if (pExtHdr->dwFuture[x]) + FIXME("dwFuture[%i] = %u (0x%08x)\n", x, pExtHdr->dwFuture[x], pExtHdr->dwFuture[x]); + break; + } + default: + FIXME("unknown chunk type \"%.04s\" ignored\n", (LPCSTR)&pChunk->fcc); + } + } + + return S_OK; +} + /* FIXME: fix leaks on failure here */ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) { @@ -542,7 +676,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) hr = AVISplitter_ProcessStreamList(pAviSplit, (BYTE *)pCurrentChunk + sizeof(RIFFLIST), pCurrentChunk->cb + sizeof(RIFFCHUNK) - sizeof(RIFFLIST)); break; case ckidODML: - FIXME("process ODML header\n"); + hr = AVISplitter_ProcessODML(pAviSplit, (BYTE *)pCurrentChunk + sizeof(RIFFLIST), pCurrentChunk->cb + sizeof(RIFFCHUNK) - sizeof(RIFFLIST)); break; } break;

1 0

Marcus Meissner : rpcrt4: Handle exit path where bind not allocated yet.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: bd38e2b0ed4b7ec522ccb00d8e73e9a05de51935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd38e2b0ed4b7ec522ccb00d8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 16 08:37:26 2008 +0200 rpcrt4: Handle exit path where bind not allocated yet. --- dlls/rpcrt4/rpc_binding.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index d670a88..87ac413 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -725,8 +725,8 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingA( RPC_CSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingA(&bind, FALSE, (char*)Protseq); - if (ret == RPC_S_OK) - ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret != RPC_S_OK) return ret; + ret = RPCRT4_SetBindingObject(bind, &Uuid); if (ret == RPC_S_OK) ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); @@ -764,8 +764,8 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( RPC_WSTR StringBinding, RPC_BIND if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingW(&bind, FALSE, Protseq); - if (ret == RPC_S_OK) - ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret != RPC_S_OK) return ret; + ret = RPCRT4_SetBindingObject(bind, &Uuid); if (ret == RPC_S_OK) ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options);

1 0

Tomasz Jezierski : hhctrl.ocx: Apparently it is possible to have chm file without #STRINGS in it, so we should not stop processing file at it.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 7a5e3d3c04c77cc9e3c8e7daca8ba096f47fee4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5e3d3c04c77cc9e3c8e7dac… Author: Tomasz Jezierski <developers(a)tefnet.pl> Date: Mon Apr 14 23:07:59 2008 +0200 hhctrl.ocx: Apparently it is possible to have chm file without #STRINGS in it, so we should not stop processing file at it. --- dlls/hhctrl.ocx/chm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index ece05f0..f02866f 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -229,7 +229,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) info->WinType.cbStruct=sizeof(info->WinType); info->WinType.fUniCodeStrings=TRUE; info->WinType.pszType=strdupW(defaultwinW); - info->WinType.pszToc = strdupW(info->pCHMInfo->defToc); + info->WinType.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); info->WinType.pszIndex = strdupW(null); info->WinType.fsValidMembers=0; info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; @@ -391,7 +391,7 @@ CHMInfo *OpenCHM(LPCWSTR szFile) &ret->strings_stream); if(FAILED(hres)) { WARN("Could not open #STRINGS stream: %08x\n", hres); - return CloseCHM(ret); + /* It's not critical, so we pass */ } if(!ReadChmSystem(ret)) {

1 0

Michael Stefaniuc : fonts: Add the Romanian glyphs SsTt with "comma below" to the tahoma font.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: adc78836b1239dbb8747b6f63bdab1f5eeaf53a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc78836b1239dbb8747b6f63… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 16 00:47:05 2008 +0200 fonts: Add the Romanian glyphs SsTt with "comma below" to the tahoma font. --- fonts/tahoma.sfd | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++---- fonts/tahoma.ttf | Bin 84400 -> 85116 bytes 2 files changed, 124 insertions(+), 10 deletions(-) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index c62946f..27eb125 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -12,13 +12,13 @@ UnderlinePosition: -170 UnderlineWidth: 130 Ascent: 1638 Descent: 410 -XUID: [1021 135 1692684408 1110817] +XUID: [1021 135 1692684408 1110822] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1169210120 -ModificationTime: 1206566066 +ModificationTime: 1208293008 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -94,7 +94,7 @@ NameList: Adobe Glyph List DisplaySize: 16 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 28 11 +WinInfo: 336 28 11 BeginPrivate: 10 BlueValues 27 [-30 0 1120 1177 1522 1522] OtherBlues 11 [-426 -426] @@ -108,7 +108,7 @@ SnapStemV 9 [184 203] ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65537 425 +BeginChars: 65537 430 StartChar: .notdef Encoding: 0 0 0 Width: 2048 @@ -9179,8 +9179,62 @@ Fore 936 1671 l 1 EndSplineSet EndChar +StartChar: uni0326 +Encoding: 806 806 425 +Width: 1118 +Flags: W +HStem: -411 276<447 524> +VStem: 361 308 +Fore +361 -411 m 1 + 447 -135 l 1 + 669 -135 l 1 + 524 -411 l 5 + 361 -411 l 1 +EndSplineSet +EndChar +StartChar: Scommaaccent +Encoding: 536 536 426 +Width: 1141 +Flags: W +HStem: -411 276<447 524> -17 164<338.667 837.867> 1369 163<435.993 753.733> +VStem: 89 206<1023.33 1289.2> 361 308 886 211<181.933 591> +Fore +Refer: 425 806 S 1 0 0 1 0 0 2 +Refer: 52 83 N 1 0 0 1 0 0 2 +EndChar +StartChar: uni021A +Encoding: 538 538 427 +Width: 1196 +Flags: W +HStem: -410 276<482 559> 0 21<498 701> 1318 171<3 498 701 1198> +VStem: 396 308 498 203<0 1318> +Fore +Refer: 425 806 S 1 0 0 1 35 1 2 +Refer: 53 84 N 1 0 0 1 0 0 2 +EndChar +StartChar: scommaaccent +Encoding: 537 537 428 +Width: 913 +Flags: W +HStem: -410 276<373 450> -41 154<298.856 587.533> 981 154<342.2 643.267> +VStem: 76 178<740.8 952.933> 287 308 696 189<143.6 347.133> +Fore +Refer: 425 806 S 1 0 0 1 -74 1 2 +Refer: 84 115 N 1 0 0 1 0 0 2 +EndChar +StartChar: uni021B +Encoding: 539 539 429 +Width: 684 +Flags: W +HStem: -410 276<303 380> 0 154<426 719> 977 143<20 155 340 719> +VStem: 155 185<274.336 977 1120 1438> 217 308 +Fore +Refer: 425 806 S 1 0 0 1 -144 1 2 +Refer: 85 116 N 1 0 0 1 0 0 2 +EndChar EndChars -BitmapFont: 9 425 7 2 1 +BitmapFont: 9 430 7 2 1 BDFChar: 0 0 9 1 7 0 6 rdo`RJqEt% BDFChar: 1 32 3 0 0 0 0 @@ -10031,8 +10085,18 @@ BDFChar: 423 371 5 0 4 -2 4 OH>QcE"Eid BDFChar: 424 175 5 0 3 7 7 n,NFg +BDFChar: 425 806 5 3 3 -1 -1 +J,fQL +BDFChar: 426 536 5 0 4 -2 6 +G^t<`#RKo"+92BA +BDFChar: 427 538 5 0 4 -2 6 +p`L\%+<Vd,+92BA +BDFChar: 428 537 4 0 2 -2 4 +@":Kb^]6V" +BDFChar: 429 539 3 0 1 -2 5 +JA?\cJ3X*b EndBitmapFont -BitmapFont: 11 425 9 2 1 FontForge +BitmapFont: 11 430 9 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--11-80-96-96-P-62-ISO10646-1" FONTBOUNDINGBOX 1 "15 11 0 -2" @@ -10918,8 +10982,18 @@ BDFChar: 423 371 6 0 4 -2 5 LkpkCLj0IJ BDFChar: 424 175 6 0 5 9 9 qu?]s +BDFChar: 425 806 6 2 3 -2 -1 +5_&h7 +BDFChar: 426 536 6 0 4 -3 7 +G^t<`#RC_*!$FN, +BDFChar: 427 538 6 0 4 -3 7 +p`L\%+<VdL!$FN, +BDFChar: 428 537 5 0 3 -3 5 +E.G_X&E!O25QCca +BDFChar: 429 539 4 0 2 -3 7 +J:QR.J:N/X!'l&7 EndBitmapFont -BitmapFont: 12 425 10 2 1 FontForge +BitmapFont: 12 430 10 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--12-90-96-96-P-70-ISO10646-1" FONTBOUNDINGBOX 1 "16 12 0 -2" @@ -11601,8 +11675,18 @@ BDFChar: 423 371 7 0 5 -2 6 KS5#3KT(!Y$ig8- BDFChar: 424 175 7 0 6 9 9 rVuou +BDFChar: 425 806 7 2 3 -2 -1 +5_&h7 +BDFChar: 426 536 7 0 5 -3 8 +G_CTtGQ\/&GQ89t +BDFChar: 427 538 7 0 6 -3 8 +rX]VP&.fBa&-*7a +BDFChar: 428 537 5 0 3 -3 6 +E.EIH&.mb"+@#o, +BDFChar: 429 539 4 0 3 -3 8 +5X=g(5X7S"0E<4\ EndBitmapFont -BitmapFont: 13 425 10 3 1 FontForge +BitmapFont: 13 430 10 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--13-100-96-96-P-73-ISO10646-1" FONTBOUNDINGBOX 1 "15 13 0 -3" @@ -12284,8 +12368,18 @@ BDFChar: 423 371 7 0 5 -2 6 KS5#3KT(!Y$ig8- BDFChar: 424 175 7 0 6 10 10 rVuou +BDFChar: 425 806 7 2 3 -2 -1 +5_&h7 +BDFChar: 426 536 7 0 6 -3 8 +I"Hm!HiaA$HiO^3 +BDFChar: 427 538 8 0 6 -3 8 +rX]VP&.fBa&-*7a +BDFChar: 428 537 6 0 4 -3 6 +E/9$`#`*F"+CG0L +BDFChar: 429 539 4 0 3 -3 8 +5X=g(5X7S"0E<4\ EndBitmapFont -BitmapFont: 15 425 12 3 1 FontForge +BitmapFont: 15 430 12 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--15-110-96-96-P-85-ISO10646-1" FONTBOUNDINGBOX 1 "19 15 0 -3" @@ -12967,8 +13061,18 @@ BDFChar: 423 371 8 0 6 -2 7 JqAT+JqA`'"9ni+ BDFChar: 424 175 8 0 7 12 12 rr<$! +BDFChar: 425 806 8 2 4 -3 -2 +@))aB +BDFChar: 426 536 8 0 6 -3 10 +4@4RK5WAlJ!ebdu#T*OA +BDFChar: 427 538 9 0 8 -3 10 +s*t@T#QP,1#QP,1#QP,1#QP,1#QOi)#QP\A +BDFChar: 428 537 7 0 5 -3 7 +G_CTT(^,M:!"^ga +BDFChar: 429 539 5 0 4 -3 9 +5X>*05X7S"5WA`T0E;(Q EndBitmapFont -BitmapFont: 16 425 13 3 1 FontForge +BitmapFont: 16 430 13 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--16-120-96-96-P-93-ISO10646-1" FONTBOUNDINGBOX 1 "21 16 0 -3" @@ -13650,5 +13754,15 @@ BDFChar: 423 371 9 0 7 -3 8 JUrB'JUrA>4TY`g BDFChar: 424 175 9 0 8 13 14 !!*%L +BDFChar: 425 806 9 2 4 -4 -2 +?pK5B +BDFChar: 426 536 9 0 7 -3 11 +5!a^LJ8bu!!<Ie"!!jDA +BDFChar: 427 538 9 0 8 -3 11 +s*t@T#QP,1#QP,1#QP,1#QP,1#QP,1!!!9)(]XO9 +BDFChar: 428 537 7 0 5 -3 8 +G_CTtGQ\/&GQ8:/ +BDFChar: 429 539 5 0 4 -3 11 +5X7U05X7S"5X7Ro!"^ga EndBitmapFont EndSplineFont diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index e54313c..08ce349 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ

1 0

Dan Hipschman : qmgr/tests: Fix minor potential memory leaks.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: cacd1c448e633852c77bfa87572aa12895d7e86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacd1c448e633852c77bfa875… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 15 11:08:48 2008 -0700 qmgr/tests: Fix minor potential memory leaks. --- dlls/qmgr/tests/enum_jobs.c | 3 +++ dlls/qmgr/tests/job.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c index 2b73631..f95404c 100644 --- a/dlls/qmgr/tests/enum_jobs.c +++ b/dlls/qmgr/tests/enum_jobs.c @@ -209,6 +209,7 @@ static void test_Next_walkList_2(void) if(hres != S_OK) { skip("Unable to get file from test_enumJobs\n"); + HeapFree(GetProcessHeap(), 0, jobs); return; } ok(fetched == test_jobCountB, "Next returned the incorrect number of jobs: %08x\n", hres); @@ -219,6 +220,8 @@ static void test_Next_walkList_2(void) if (jobs[i]) IBackgroundCopyFile_Release(jobs[i]); } + + HeapFree(GetProcessHeap(), 0, jobs); } /* Test Next Error conditions */ diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 52d4e82..36201f8 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -416,6 +416,8 @@ static void test_CompleteLocalURL(void) if (!urlA || !urlB) { skip("Unable to allocate memory for URLs\n"); + HeapFree(GetProcessHeap(), 0, urlA); + HeapFree(GetProcessHeap(), 0, urlB); return; } @@ -428,6 +430,8 @@ static void test_CompleteLocalURL(void) if (hres != S_OK) { skip("Unable to add file to job\n"); + HeapFree(GetProcessHeap(), 0, urlA); + HeapFree(GetProcessHeap(), 0, urlB); return; } @@ -435,6 +439,8 @@ static void test_CompleteLocalURL(void) if (hres != S_OK) { skip("Unable to add file to job\n"); + HeapFree(GetProcessHeap(), 0, urlA); + HeapFree(GetProcessHeap(), 0, urlB); return; }

1 0

Andrew Talbot : dmime: Remove unused variables.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: a73ab629e9cc5877060411d38cf82405009dbe91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73ab629e9cc5877060411d38… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 21:33:30 2008 +0100 dmime: Remove unused variables. --- dlls/dmime/graph.c | 7 +++---- dlls/dmime/performance.c | 3 +-- dlls/dmime/segment.c | 16 ++++++---------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 7d0363a..79ff823 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -108,7 +108,6 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_StampPMsg (LPDIREC static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_InsertTool (LPDIRECTMUSICGRAPH iface, IDirectMusicTool* pTool, DWORD* pdwPChannels, DWORD cPChannels, LONG lIndex) { ICOM_THIS_MULTI(IDirectMusicGraphImpl, GraphVtbl, iface); - HRESULT hr; struct list* pEntry = NULL; struct list* pPrevEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; @@ -142,14 +141,14 @@ static HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_InsertTool (LPDIRE pNewTool->pTool = pTool; pNewTool->dwIndex = lIndex; IDirectMusicTool8_AddRef(pTool); - hr = IDirectMusicTool8_Init(pTool, iface); + IDirectMusicTool8_Init(pTool, iface); list_add_tail (pPrevEntry->next, &pNewTool->entry); #if 0 DWORD dwNum = 0; - hr = IDirectMusicTool8_GetMediaTypes(pTool, &dwNum); + IDirectMusicTool8_GetMediaTypes(pTool, &dwNum); #endif - + return DS_OK; } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 9730104..ad3d740 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -222,8 +222,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC This->pDirectSound = pDirectSound; IDirectSound_AddRef(This->pDirectSound); } else { - HRESULT hr; - hr = DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); + DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); if (!This->pDirectSound) return DSERR_NODRIVER; if (NULL != hWnd) { diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index a90bd4c..6b7243a 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -822,9 +822,9 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST /*ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface);*/ HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, StreamCount, ListSize[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ - + DMUS_IO_TRACK_HEADER track_hdr; DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; IDirectMusicTrack* pTrack = NULL; @@ -869,7 +869,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackForm (LPPERSIST IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { LPSTREAM pClonedStream = NULL; @@ -982,7 +981,7 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, ListSize[3], ListCount[3]; LARGE_INTEGER liMove; /* used when skipping chunks */ if (pChunk->fccID != DMUS_FOURCC_TRACK_LIST) { @@ -1002,7 +1001,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseTrackList (LPPERSIST IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; switch (Chunk.fccID) { case DMUS_FOURCC_TRACK_FORM: { TRACE_(dmfile)(": TRACK form\n"); @@ -1192,14 +1190,13 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadWave (LPPERSISTSTREAM static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - + HRESULT hr; DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount; + DWORD StreamSize; /*DWORD ListSize[3], ListCount[3];*/ LARGE_INTEGER liMove; /* used when skipping chunks */ - - + TRACE("(%p, %p): Loading\n", This, pStm); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); @@ -1208,7 +1205,6 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; switch (Chunk.fccID) { case DMUS_FOURCC_SEGMENT_FORM: { TRACE_(dmfile)(": segment form\n");

1 0

Andrew Talbot : comctl32: Remove unused variables.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 161d3322d697d330ac8e1a7f4fa2cfd3991162e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=161d3322d697d330ac8e1a7f4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 22:19:12 2008 +0100 comctl32: Remove unused variables. --- dlls/comctl32/syslink.c | 8 +++----- dlls/comctl32/toolbar.c | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 02a0385..a1b8aff 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -967,16 +967,14 @@ static HFONT SYSLINK_SetFont (SYSLINK_INFO *infoPtr, HFONT hFont, BOOL bRedraw) */ static LRESULT SYSLINK_SetText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { - int textlen; - /* clear the document */ SYSLINK_ClearDoc(infoPtr); - - if(Text == NULL || (textlen = lstrlenW(Text)) == 0) + + if(Text == NULL || *Text == 0) { return TRUE; } - + /* let's parse the string and create a document */ if(SYSLINK_ParseText(infoPtr, Text) > 0) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9991683..5746928 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5778,7 +5778,6 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) POINT pt; INT nHit; INT nOldIndex = -1; - BOOL bSendMessage = TRUE; NMHDR hdr; NMMOUSE nmmouse; NMTOOLBARA nmtb; @@ -5865,8 +5864,6 @@ TOOLBAR_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam) if (btnPtr->fsStyle & BTNS_GROUP) { nOldIndex = TOOLBAR_GetCheckedGroupButtonIndex (infoPtr, nHit); - if (nOldIndex == nHit) - bSendMessage = FALSE; if ((nOldIndex != nHit) && (nOldIndex != -1)) infoPtr->buttons[nOldIndex].fsState &= ~TBSTATE_CHECKED;

1 0

Andrew Talbot : dinput: Fix handle leak.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 6657cfe70de94bf6ebd345800ef2eec8d4e04bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6657cfe70de94bf6ebd345800… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 22:54:03 2008 +0100 dinput: Fix handle leak. --- dlls/dinput/joystick_linux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index e9b8790..5e87a02 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -151,6 +151,8 @@ static INT find_joystick_devices(void) if ((fd = open(device_name, O_RDONLY)) < 0) continue; } + close(fd); + if (!(str = HeapAlloc(GetProcessHeap(), 0, len))) break; memcpy(str, device_name, len);

1 0

Andrew Talbot : browseui: Fix handle leak.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 160945e217bee92db266c8d8f19466978384f577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=160945e217bee92db266c8d8f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 15 22:11:26 2008 +0100 browseui: Fix handle leak. --- dlls/browseui/progressdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index c5465a3..c65a097 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -324,6 +324,7 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, hThread = CreateThread(NULL, 0, dialog_thread, &params, 0, NULL); WaitForSingleObject(params.hEvent, INFINITE); + CloseHandle(hThread); This->hwndDisabledParent = NULL; if (hwndParent && (dwFlags & PROGDLG_MODAL)) {

1 0

Rob Shearman : widl: Change alls calls to error in the parser to error_loc so that line number information is printed .
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 4b56ff7238b6a2bc12489694693d6ac3c301f775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b56ff7238b6a2bc124896946… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 21:52:35 2008 +0100 widl: Change alls calls to error in the parser to error_loc so that line number information is printed. --- tools/widl/parser.y | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fba941e..45471bb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1190,7 +1190,7 @@ static expr_t *make_expr1(enum expr_type type, expr_t *expr) { expr_t *e; if (type == EXPR_ADDRESSOF && expr->type != EXPR_IDENTIFIER) - error("address-of operator applied to invalid expression\n"); + error_loc("address-of operator applied to invalid expression\n"); e = xmalloc(sizeof(expr_t)); e->type = type; e->ref = expr; @@ -1394,7 +1394,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ } } else if (!arr && ptr_attr) - error("%s: pointer attribute applied to non-pointer type\n", v->name); + error_loc("%s: pointer attribute applied to non-pointer type\n", v->name); } if (pident && pident->is_func) { @@ -1416,7 +1416,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry) { if (sizeless) - error("%s: only the first array dimension can be unspecified\n", v->name); + error_loc("%s: only the first array dimension can be unspecified\n", v->name); if (dim->is_const) { @@ -1424,10 +1424,10 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ size_t size = type_memsize(v->type, &align); if (dim->cval <= 0) - error("%s: array dimension must be positive\n", v->name); + error_loc("%s: array dimension must be positive\n", v->name); if (0xffffffffuL / size < (unsigned long) dim->cval) - error("%s: total array size is too large\n", v->name); + error_loc("%s: total array size is too large\n", v->name); else if (0xffffuL < size * dim->cval) v->type = make_type(RPC_FC_LGFARRAY, v->type); else @@ -1453,10 +1453,10 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ atype = *ptype = duptype(*ptype, 0); if (atype->type == RPC_FC_SMFARRAY || atype->type == RPC_FC_LGFARRAY) - error("%s: cannot specify size_is for a fixed sized array\n", v->name); + error_loc("%s: cannot specify size_is for a fixed sized array\n", v->name); if (atype->type != RPC_FC_CARRAY && !is_ptr(atype)) - error("%s: size_is attribute applied to illegal type\n", v->name); + error_loc("%s: size_is attribute applied to illegal type\n", v->name); atype->type = RPC_FC_CARRAY; atype->size_is = dim; @@ -1464,7 +1464,7 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ ptype = &(*ptype)->ref; if (*ptype == NULL) - error("%s: too many expressions in size_is attribute\n", v->name); + error_loc("%s: too many expressions in size_is attribute\n", v->name); } ptype = &v->type; @@ -1482,14 +1482,14 @@ static void set_type(var_t *v, type_t *type, const pident_t *pident, array_dims_ else if (atype->type == RPC_FC_CARRAY) atype->type = RPC_FC_CVARRAY; else - error("%s: length_is attribute applied to illegal type\n", v->name); + error_loc("%s: length_is attribute applied to illegal type\n", v->name); atype->length_is = dim; } ptype = &(*ptype)->ref; if (*ptype == NULL) - error("%s: too many expressions in length_is attribute\n", v->name); + error_loc("%s: too many expressions in length_is attribute\n", v->name); } if (has_varconf && !last_array(v->type))

1 0

Rob Shearman : rpcrt4: Test and fix I_RpcExceptionFilter.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 4efff322911b224e727dc6df932c357d0e6a279a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4efff322911b224e727dc6df9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 21:50:14 2008 +0100 rpcrt4: Test and fix I_RpcExceptionFilter. --- dlls/rpcrt4/rpcrt4_main.c | 10 ++++++++-- dlls/rpcrt4/tests/rpc.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 02e1dcd..0fddc28 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -944,8 +944,14 @@ int WINAPI I_RpcExceptionFilter(ULONG ExceptionCode) TRACE("0x%x\n", ExceptionCode); switch (ExceptionCode) { - case EXCEPTION_ACCESS_VIOLATION: - case EXCEPTION_ILLEGAL_INSTRUCTION: + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_BREAKPOINT: + case STATUS_ACCESS_VIOLATION: + case STATUS_ILLEGAL_INSTRUCTION: + case STATUS_PRIVILEGED_INSTRUCTION: + case STATUS_INSTRUCTION_MISALIGNMENT: + case STATUS_STACK_OVERFLOW: + case STATUS_POSSIBLE_DEADLOCK: return EXCEPTION_CONTINUE_SEARCH; default: return EXCEPTION_EXECUTE_HANDLER; diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index ace8aff..9fd9993 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -610,6 +610,46 @@ static void test_RpcStringBindingParseA(void) ok(options == NULL, "options was %p instead of NULL\n", options); } +static void test_I_RpcExceptionFilter(void) +{ + ULONG exception; + int retval; + int (WINAPI *pI_RpcExceptionFilter)(ULONG) = (void *)GetProcAddress(GetModuleHandle("rpcrt4.dll"), "I_RpcExceptionFilter"); + + if (!pI_RpcExceptionFilter) + { + skip("I_RpcExceptionFilter not exported\n"); + return; + } + + for (exception = 0; exception < STATUS_REG_NAT_CONSUMPTION; exception++) + { + /* skip over uninteresting bits of the number space */ + if (exception == 2000) exception = 0x40000000; + if (exception == 0x40000005) exception = 0x80000000; + if (exception == 0x80000005) exception = 0xc0000000; + + retval = pI_RpcExceptionFilter(exception); + switch (exception) + { + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_BREAKPOINT: + case STATUS_ACCESS_VIOLATION: + case STATUS_ILLEGAL_INSTRUCTION: + case STATUS_PRIVILEGED_INSTRUCTION: + case 0xc00000aa /* STATUS_INSTRUCTION_MISALIGNMENT */: + case STATUS_STACK_OVERFLOW: + case 0xc0000194 /* STATUS_POSSIBLE_DEADLOCK */: + ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_CONTINUE_SEARCH, retval); + break; + default: + ok(retval == EXCEPTION_EXECUTE_HANDLER, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", + exception, EXCEPTION_EXECUTE_HANDLER, retval); + } + } +} + START_TEST( rpc ) { trace ( " ** Uuid Conversion and Comparison Tests **\n" ); @@ -620,4 +660,5 @@ START_TEST( rpc ) test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); + test_I_RpcExceptionFilter(); }

1 0

Rob Shearman : ole32: Add tests for clipboard' s implementation of IDataObject_GetData.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 51158a2f9c54b4680e0b3d453e2b3ec90dd741c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51158a2f9c54b4680e0b3d453… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 18:29:41 2008 +0100 ole32: Add tests for clipboard's implementation of IDataObject_GetData. --- dlls/ole32/tests/clipboard.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index c6371cd..e365ee8 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -58,6 +58,7 @@ typedef struct EnumFormatImpl { } EnumFormatImpl; static BOOL expect_DataObjectImpl_QueryGetData = TRUE; +static ULONG DataObjectImpl_GetData_calls = 0; static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); @@ -196,6 +197,8 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor { DataObjectImpl *This = (DataObjectImpl*)iface; + DataObjectImpl_GetData_calls++; + if(pformatetc->lindex != -1) return DV_E_LINDEX; @@ -326,6 +329,7 @@ static void test_get_clipboard(void) HRESULT hr; IDataObject *data_obj; FORMATETC fmtetc; + STGMEDIUM stgmedium; hr = OleGetClipboard(NULL); ok(hr == E_INVALIDARG, "OleGetClipboard(NULL) should return E_INVALIDARG instead of 0x%08x\n", hr); @@ -333,6 +337,8 @@ static void test_get_clipboard(void) hr = OleGetClipboard(&data_obj); ok(hr == S_OK, "OleGetClipboard failed with error 0x%08x\n", hr); + /* test IDataObject_QueryGetData */ + /* clipboard's IDataObject_QueryGetData shouldn't defer to our IDataObject_QueryGetData */ expect_DataObjectImpl_QueryGetData = FALSE; @@ -367,6 +373,45 @@ static void test_get_clipboard(void) expect_DataObjectImpl_QueryGetData = TRUE; + /* test IDataObject_GetData */ + + DataObjectImpl_GetData_calls = 0; + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); + ReleaseStgMedium(&stgmedium); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.dwAspect = 0xdeadbeef; + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); + ReleaseStgMedium(&stgmedium); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.dwAspect = DVASPECT_THUMBNAIL; + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); + ReleaseStgMedium(&stgmedium); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.lindex = 256; + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + todo_wine + ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.cfFormat = CF_RIFF; + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.tymed = TYMED_FILE; + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); + + ok(DataObjectImpl_GetData_calls == 6, "DataObjectImpl_GetData should have been called 6 times instead of %d times\n", DataObjectImpl_GetData_calls); + IDataObject_Release(data_obj); }

1 0

Rob Shearman : ole32: Fix OLEClipbrd_IDataObject_QueryGetData to conform to the tests.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 2cd4117f81cb93da8a5b4ad13573d132e8118fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd4117f81cb93da8a5b4ad13… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Apr 15 18:29:32 2008 +0100 ole32: Fix OLEClipbrd_IDataObject_QueryGetData to conform to the tests. --- dlls/ole32/clipboard.c | 33 ++++++--------------------------- dlls/ole32/tests/clipboard.c | 11 ++++++----- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index ad15219..a74e71a 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1312,42 +1312,21 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_QueryGetData( IDataObject* iface, LPFORMATETC pformatetc) { - /* - * Declare "This" pointer - */ - OLEClipbrd *This = (OLEClipbrd *)iface; - TRACE("(%p, %p)\n", iface, pformatetc); - /* - * If we have a data source placed on the clipboard (via OleSetClipboard) - * simply delegate to the source object's QueryGetData - */ - if ( This->pIDataObjectSrc ) - { - return IDataObject_QueryGetData(This->pIDataObjectSrc, pformatetc); - } - if (!pformatetc) return E_INVALIDARG; -/* - if ( pformatetc->dwAspect != DVASPECT_CONTENT ) - return DV_E_DVASPECT; -*/ - if ( pformatetc->lindex != -1 ) - return DV_E_LINDEX; - /* TODO: Handle TYMED_IStorage media which were put on the clipboard - * by copying the storage into global memory. We must convert this - * TYMED_HGLOBAL back to TYMED_IStorage. - */ - if ( pformatetc->tymed != TYMED_HGLOBAL ) - return DV_E_TYMED; + if ( pformatetc->dwAspect != DVASPECT_CONTENT ) + return DV_E_FORMATETC; + + if ( pformatetc->lindex != -1 ) + return DV_E_FORMATETC; /* * Delegate to the Windows clipboard function IsClipboardFormatAvailable */ - return (IsClipboardFormatAvailable(pformatetc->cfFormat)) ? S_OK : DV_E_FORMATETC; + return (IsClipboardFormatAvailable(pformatetc->cfFormat)) ? S_OK : DV_E_CLIPFORMAT; } /************************************************************************ diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index aa2f622..c6371cd 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -226,7 +226,7 @@ static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC BOOL foundFormat = FALSE; if (!expect_DataObjectImpl_QueryGetData) - todo_wine ok(0, "unexpected call to DataObjectImpl_QueryGetData\n"); + ok(0, "unexpected call to DataObjectImpl_QueryGetData\n"); if(pformatetc->lindex != -1) return DV_E_LINDEX; @@ -343,25 +343,26 @@ static void test_get_clipboard(void) InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.dwAspect = 0xdeadbeef; hr = IDataObject_QueryGetData(data_obj, &fmtetc); - todo_wine + ok(hr == DV_E_FORMATETC, "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + + InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); + fmtetc.dwAspect = DVASPECT_THUMBNAIL; + hr = IDataObject_QueryGetData(data_obj, &fmtetc); ok(hr == DV_E_FORMATETC, "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.lindex = 256; hr = IDataObject_QueryGetData(data_obj, &fmtetc); - todo_wine ok(hr == DV_E_FORMATETC, "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.cfFormat = CF_RIFF; hr = IDataObject_QueryGetData(data_obj, &fmtetc); - todo_wine ok(hr == DV_E_CLIPFORMAT, "IDataObject_QueryGetData should have failed with DV_E_CLIPFORMAT instead of 0x%08x\n", hr); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.tymed = TYMED_FILE; hr = IDataObject_QueryGetData(data_obj, &fmtetc); - todo_wine ok(hr == S_OK, "IDataObject_QueryGetData failed with error 0x%08x\n", hr); expect_DataObjectImpl_QueryGetData = TRUE;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008