March 2010 - Wine-commits - list.winehq.org

Paul Vriens : gdiplus/tests: Fix a test failure on Win98/WinMe.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 0513eb506efdc89e26ef18e6564275a5d82e3a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0513eb506efdc89e26ef18e65… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 11:00:59 2010 +0100 gdiplus/tests: Fix a test failure on Win98/WinMe. --- dlls/gdiplus/tests/graphics.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b2dc9b2..9dffd52 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2415,7 +2415,10 @@ static void test_GdipGetNearestColor(void) expect(Ok, status); status = GdipGetNearestColor(graphics, &color); expect(Ok, status); - todo_wine expect(0xffa8b8e8, color); + todo_wine + ok(color == 0xffa8b8e8 || + broken(color == 0xffa0b8e0), /* Win98/WinMe */ + "Expected ffa8b8e8, got %.8x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap);

1 0

Nikolay Sivov : ole32: Turn FIXME to TRACE for CoGetTreatAsClass.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 825a63569233abf991e9fd90bbb5e0cf081d9c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825a63569233abf991e9fd90b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 22:51:56 2010 +0300 ole32: Turn FIXME to TRACE for CoGetTreatAsClass. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 583a9cb..12f8314 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2956,7 +2956,7 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) HRESULT res = S_OK; LONG len = sizeof(szClsidNew); - FIXME("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); + TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey);

1 0

David Hedberg : wine.inf: Add key for approved shell extensions.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 990a31975085622c088e37613c7865395bfc7c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=990a31975085622c088e37613… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 16 01:32:44 2010 +0100 wine.inf: Add key for approved shell extensions. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7ad4291..7476df7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -428,6 +428,7 @@ HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" +HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,""

1 0

David Hedberg : shell32: SHCreatePropSheetExtArrayEx should check if the key itself contains the clsid of the shell extension .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 50c7cf5111d581f12d7f34116bd0d7f6ec819531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c7cf5111d581f12d7f34116… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 16 01:32:45 2010 +0100 shell32: SHCreatePropSheetExtArrayEx should check if the key itself contains the clsid of the shell extension. --- dlls/shell32/shellord.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 940633e..9e6425c 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1807,34 +1807,40 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ break; } - dwClsidSize = sizeof(szClsidHandler); - if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) + /* The CLSID is stored either in the key itself or in its default value. */ + if (!SUCCEEDED(lRet = SHCLSIDFromStringW(szHandler, &clsid))) { - /* Force a NULL-termination and convert the string */ - szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; - if (SUCCEEDED(SHCLSIDFromStringW(szClsidHandler, &clsid))) + dwClsidSize = sizeof(szClsidHandler); + if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) { - /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. - Only if both interfaces are supported it's a real shell extension. - Then call IShellExtInit's Initialize method. */ - if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + /* Force a NULL-termination and convert the string */ + szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; + lRet = SHCLSIDFromStringW(szClsidHandler, &clsid); + } + } + + if (SUCCEEDED(lRet)) + { + /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. + Only if both interfaces are supported it's a real shell extension. + Then call IShellExtInit's Initialize method. */ + if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + { + if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) - { - /* Add the IShellPropSheetExt instance to the array */ - psxa->pspsx[psxa->uiCount++] = pspsx; - } - else - { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); - } + /* Add the IShellPropSheetExt instance to the array */ + psxa->pspsx[psxa->uiCount++] = pspsx; } else + { + psxi->lpVtbl->Release(psxi); pspsx->lpVtbl->Release(pspsx); + } } + else + pspsx->lpVtbl->Release(pspsx); } }

1 0

David Hedberg : shell32: Initial support for the properties command in the IContextMenu for shellview .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: bbe73787fcd100df4fe62f25f10794119c7f997b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe73787fcd100df4fe62f25f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 16 01:32:46 2010 +0100 shell32: Initial support for the properties command in the IContextMenu for shellview. --- dlls/shell32/shv_item_cmenu.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 6beb08f..1bab77b 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -32,6 +32,8 @@ #include "pidl.h" #include "undocshell.h" #include "shlobj.h" +#include "winreg.h" +#include "prsht.h" #include "shell32_main.h" #include "shellfolder.h" @@ -381,6 +383,130 @@ static BOOL DoCopyOrCut( } return TRUE; } + +/************************************************************************** + * Properties_AddPropSheetCallback + * + * Used by DoOpenProperties through SHCreatePropSheetExtArrayEx to add + * propertysheet pages from shell extensions. + */ +static BOOL Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) +{ + LPPROPSHEETHEADERW psh = (LPPROPSHEETHEADERW) lparam; + psh->u3.phpage[psh->nPages++] = hpage; + + return TRUE; +} + +/************************************************************************** + * DoOpenProperties + */ +static void DoOpenProperties(IContextMenu2 *iface, HWND hwnd) +{ + ItemCmImpl *This = (ItemCmImpl *)iface; + static const UINT MAX_PROP_PAGES = 99; + static const WCHAR wszFolder[] = {'F','o','l','d','e','r', 0}; + static const WCHAR wszFiletypeAll[] = {'*',0}; + LPSHELLFOLDER lpDesktopSF; + LPSHELLFOLDER lpSF; + LPDATAOBJECT lpDo; + WCHAR wszFiletype[MAX_PATH]; + WCHAR wszFilename[MAX_PATH]; + PROPSHEETHEADERW psh; + HPROPSHEETPAGE hpages[MAX_PROP_PAGES]; + HPSXA hpsxa; + UINT ret; + + TRACE("(%p)->(wnd=%p)\n", This, hwnd); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof (PROPSHEETHEADERW); + psh.hwndParent = hwnd; + psh.dwFlags = PSH_PROPTITLE; + psh.nPages = 0; + psh.u3.phpage = hpages; + psh.u2.nStartPage = 0; + + _ILSimpleGetTextW(This->apidl[0], (LPVOID)&wszFilename, MAX_PATH); + psh.pszCaption = (LPCWSTR)&wszFilename; + + /* Find out where to look for the shell extensions */ + if (_ILIsValue(This->apidl[0])) + { + char sTemp[64]; + sTemp[0] = 0; + if (_ILGetExtension(This->apidl[0], sTemp, 64)) + { + HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE); + MultiByteToWideChar(CP_ACP, 0, sTemp, -1, wszFiletype, MAX_PATH); + } + else + { + wszFiletype[0] = 0; + } + } + else if (_ILIsFolder(This->apidl[0])) + { + lstrcpynW(wszFiletype, wszFolder, 64); + } + else if (_ILIsSpecialFolder(This->apidl[0])) + { + LPGUID folderGUID; + static const WCHAR wszclsid[] = {'C','L','S','I','D','\\', 0}; + folderGUID = _ILGetGUIDPointer(This->apidl[0]); + lstrcpyW(wszFiletype, wszclsid); + StringFromGUID2(folderGUID, &wszFiletype[6], MAX_PATH - 6); + } + else + { + FIXME("Requested properties for unknown type.\n"); + return; + } + + /* Get a suitable DataObject for accessing the files */ + SHGetDesktopFolder(&lpDesktopSF); + if (_ILIsPidlSimple(This->pidl)) + { + ret = IShellFolder_GetUIObjectOf(lpDesktopSF, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, + &IID_IDataObject, NULL, (LPVOID *)&lpDo); + IShellFolder_Release(lpDesktopSF); + } + else + { + IShellFolder_BindToObject(lpDesktopSF, This->pidl, NULL, &IID_IShellFolder, (LPVOID*) &lpSF); + ret = IShellFolder_GetUIObjectOf(lpSF, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, + &IID_IDataObject, NULL, (LPVOID *)&lpDo); + IShellFolder_Release(lpSF); + IShellFolder_Release(lpDesktopSF); + } + + if (SUCCEEDED(ret)) + { + hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo); + if (hpsxa != NULL) + { + SHAddFromPropSheetExtArray((HPSXA)hpsxa, + (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, + (LPARAM)&psh); + SHDestroyPropSheetExtArray(hpsxa); + } + hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletypeAll, MAX_PROP_PAGES - psh.nPages, lpDo); + if (hpsxa != NULL) + { + SHAddFromPropSheetExtArray((HPSXA)hpsxa, + (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, + (LPARAM)&psh); + SHDestroyPropSheetExtArray(hpsxa); + } + IDataObject_Release(lpDo); + } + + if (psh.nPages) + PropertySheetW(&psh); + else + FIXME("No property pages found.\n"); +} + /************************************************************************** * ISvItemCm_fnInvokeCommand() */ @@ -429,6 +555,10 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( TRACE("Verb FCIDM_SHVIEW_CUT\n"); DoCopyOrCut(iface, lpcmi->hwnd, TRUE); break; + case FCIDM_SHVIEW_PROPERTIES: + TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); + DoOpenProperties(iface, lpcmi->hwnd); + break; default: FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); } @@ -438,6 +568,8 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); if (strcmp(lpcmi->lpVerb,"delete")==0) DoDelete(iface); + else if (strcmp(lpcmi->lpVerb,"properties")==0) + DoOpenProperties(iface, lpcmi->hwnd); else FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); }

1 0

Jörg Höhle : mciavi: Stubs should return a success code.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 33d1e593aacc3ab1d0b427374d9fc46ba6acfa97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d1e593aacc3ab1d0b427374… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 15 08:11:04 2010 +0100 mciavi: Stubs should return a success code. Partly reverts my commit 3e5c704e7a44328e9243e786bd6e37c17e790fa4. --- dlls/mciavi32/mciavi.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 0963821..1c15dc5 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -837,14 +837,14 @@ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P { WINE_MCIAVI *wma; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + FIXME("(%04x, %08x, %p) Item %04x: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETAUDIO_ITEM ? lpParms->dwItem : 0); + wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - return MCIERR_UNSUPPORTED_FUNCTION; /* like w2k */ + return 0; } /****************************************************************************** @@ -871,14 +871,14 @@ static DWORD MCIAVI_mciSetVideo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETVIDEO_P { WINE_MCIAVI *wma; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + FIXME("(%04x, %08x, %p) Item %04x: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETVIDEO_ITEM ? lpParms->dwItem : 0); + wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - return MCIERR_UNSUPPORTED_FUNCTION; /* like w2k */ + return 0; } /******************************************************************************

1 0

Jörg Höhle : mciseq: MCI Set Port allows to select the MIDI device.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: a8c252a67da97db86ab133457535c06b521e97fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c252a67da97db86ab133457… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 14 12:49:14 2010 +0100 mciseq: MCI Set Port allows to select the MIDI device. --- dlls/mciseq/mcimidi.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 301428d..87753c3 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -62,6 +62,7 @@ typedef struct tagWINE_MCIMIDI { UINT wDevID; /* the MCI one */ HMIDI hMidi; int nUseCount; /* Incremented for each shared open */ + WORD wPort; /* the WINMM device unit */ WORD wNotifyDeviceID; /* MCI device ID with a pending notification */ HANDLE hCallback; /* Callback handle for pending notification */ HMMIO hFile; /* mmio file handle open as Element */ @@ -726,6 +727,7 @@ static DWORD MIDI_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpParms) wmm->hFile = 0; wmm->hMidi = 0; + wmm->wPort = MIDI_MAPPER; wmm->lpstrElementName = NULL; dwDeviceID = lpParms->wDeviceID; @@ -962,8 +964,8 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) MIDI_mciReadNextEvent(wmm, mmt); /* FIXME == 0 */ } - dwRet = midiOutOpen((LPHMIDIOUT)&wmm->hMidi, MIDIMAPPER, 0L, 0L, CALLBACK_NULL); - /* dwRet = midiInOpen(&wmm->hMidi, MIDIMAPPER, 0L, 0L, CALLBACK_NULL);*/ + dwRet = midiOutOpen((LPHMIDIOUT)&wmm->hMidi, wmm->wPort, 0L, 0L, CALLBACK_NULL); + /* dwRet = midiInOpen(&wmm->hMidi, wmm->wPort, 0L, 0L, CALLBACK_NULL);*/ if (dwRet != MMSYSERR_NOERROR) { return dwRet; } @@ -1290,7 +1292,7 @@ static DWORD MIDI_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa /************************************************************************** * MIDI_mciSet [internal] */ -static DWORD MIDI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) +static DWORD MIDI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SEQ_SET_PARMS lpParms) { WINE_MCIMIDI* wmm = MIDI_mciGetOpenDev(wDevID); @@ -1359,8 +1361,15 @@ static DWORD MIDI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) TRACE("MCI_SEQ_SET_SLAVE !\n"); if (dwFlags & MCI_SEQ_SET_OFFSET) TRACE("MCI_SEQ_SET_OFFSET !\n"); - if (dwFlags & MCI_SEQ_SET_PORT) - TRACE("MCI_SEQ_SET_PORT !\n"); + if (dwFlags & MCI_SEQ_SET_PORT) { + TRACE("MCI_SEQ_SET_PORT = %d\n", lpParms->dwPort); + if ((UINT16)lpParms->dwPort != (UINT16)MIDI_MAPPER && + (UINT16)lpParms->dwPort >= midiOutGetNumDevs()) + /* FIXME: input/output port distinction? */ + return MCIERR_SEQ_PORT_NONEXISTENT; + /* FIXME: Native manages to swap the device while playing! */ + wmm->wPort = lpParms->dwPort; + } if (dwFlags & MCI_SEQ_SET_TEMPO) TRACE("MCI_SEQ_SET_TEMPO !\n"); return 0; @@ -1459,8 +1468,13 @@ static DWORD MIDI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpPar lpParms->dwReturn = 0; break; case MCI_SEQ_STATUS_PORT: - TRACE("MCI_SEQ_STATUS_PORT (%u)!\n", wmm->wDevID); - lpParms->dwReturn = MIDI_MAPPER; + if (wmm->wPort != (UINT16)MIDI_MAPPER) + lpParms->dwReturn = wmm->wPort; + else { + lpParms->dwReturn = MAKEMCIRESOURCE(MIDI_MAPPER, MCI_SEQ_MAPPER_S); + ret = MCI_RESOURCE_RETURNED; + } + TRACE("MCI_SEQ_STATUS_PORT (%u) => %d\n", wmm->wDevID, wmm->wPort); break; case MCI_SEQ_STATUS_TEMPO: TRACE("MCI_SEQ_STATUS_TEMPO !\n"); @@ -1664,7 +1678,7 @@ LRESULT CALLBACK MCIMIDI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_PLAY: return MIDI_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_RECORD: return MIDI_mciRecord (dwDevID, dwParam1, (LPMCI_RECORD_PARMS) dwParam2); case MCI_STOP: return MIDI_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_SET: return MIDI_mciSet (dwDevID, dwParam1, (LPMCI_SET_PARMS) dwParam2); + case MCI_SET: return MIDI_mciSet (dwDevID, dwParam1, (LPMCI_SEQ_SET_PARMS) dwParam2); case MCI_PAUSE: return MIDI_mciPause (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_RESUME: return MIDI_mciResume (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_STATUS: return MIDI_mciStatus (dwDevID, dwParam1, (LPMCI_STATUS_PARMS) dwParam2);

1 0

Ilya Basin : shell32/tests: Add tests for the parser of SHELLEXECUTEINFO. lpFile.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 4b5f6ada179af9e20ad16b97a4cbed5e13f1e5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5f6ada179af9e20ad16b97a… Author: Ilya Basin <basinilya(a)gmail.com> Date: Mon Mar 8 21:44:57 2010 +0300 shell32/tests: Add tests for the parser of SHELLEXECUTEINFO.lpFile. --- dlls/shell32/tests/shlexec.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5d5db34..ffdf393 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -797,6 +797,10 @@ static const char* testfiles[]= "%s\\test file.sde", "%s\\test file.exe", "%s\\test2.exe", + "%s\\simple.shlexec", + "%s\\drawback_file.noassoc", + "%s\\drawback_file.noassoc foo.shlexec", + "%s\\drawback_nonexist.noassoc foo.shlexec", NULL }; @@ -852,6 +856,112 @@ static filename_tests_t noquotes_tests[]= {NULL, NULL, 0} }; +static void test_lpFile_parsed(void) +{ + /* basename tmpdir */ + const char* shorttmpdir; + + const char *testfile; + char fileA[MAX_PATH]; + + int rc; + + GetTempPathA(sizeof(fileA), fileA); + shorttmpdir = tmpdir + strlen(fileA); + + /* ensure tmpdir is in %TEMP%: GetTempPath() can succeed even if TEMP is undefined */ + SetEnvironmentVariableA("TEMP", fileA); + + /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + testfile = "%s\\drawback_file.noassoc foo.shlexec"; + sprintf(fileA, testfile, tmpdir); + rc=shell_execute(NULL, fileA, NULL, NULL); + todo_wine { + ok(rc>32, + "expected success (33), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + } + + /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ + testfile = "\"%s\\drawback_file.noassoc foo.shlexec\""; + sprintf(fileA, testfile, tmpdir); + rc=shell_execute(NULL, fileA, NULL, NULL); + ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, + "expected success (33), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + + /* error should be 2, not 31 */ + testfile = "\"%s\\drawback_file.noassoc\" foo.shlexec"; + sprintf(fileA, testfile, tmpdir); + rc=shell_execute(NULL, fileA, NULL, NULL); + ok(rc==2, + "expected failure (2), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + + /* ""command"" not works on wine (and real win9x and w2k) */ + testfile = "\"\"%s\\simple.shlexec\"\""; + sprintf(fileA, testfile, tmpdir); + rc=shell_execute(NULL, fileA, NULL, NULL); + todo_wine { + ok(rc>32 || broken(rc == 2) /* Win9x/2000 */, + "expected success (33), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + } + + /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ + testfile = "%s\\drawback_nonexist.noassoc foo.shlexec"; + sprintf(fileA, testfile, tmpdir); + rc=shell_execute(NULL, fileA, NULL, NULL); + ok(rc>32, + "expected success (33), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + + /* is SEE_MASK_DOENVSUBST default flag? Should only be when XP emulates 9x (XP bug or real 95 or ME behavior ?) */ + testfile = "%%TEMP%%\\%s\\simple.shlexec"; + sprintf(fileA, testfile, shorttmpdir); + rc=shell_execute(NULL, fileA, NULL, NULL); + todo_wine { + ok(rc==2, + "expected failure (2), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + } + + /* quoted */ + testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; + sprintf(fileA, testfile, shorttmpdir); + rc=shell_execute(NULL, fileA, NULL, NULL); + todo_wine { + ok(rc==2, + "expected failure (2), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + } + + /* test SEE_MASK_DOENVSUBST works */ + testfile = "%%TEMP%%\\%s\\simple.shlexec"; + sprintf(fileA, testfile, shorttmpdir); + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); + ok(rc>32, + "expected success (33), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); + + /* quoted lpFile not works only on real win95 and nt4 */ + testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; + sprintf(fileA, testfile, shorttmpdir); + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); + ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, + "expected success (33), got %s (%d), lpFile: %s \n", + rc > 32 ? "success" : "failure", rc, fileA + ); +} + static void test_filename(void) { char filename[MAX_PATH]; @@ -1938,6 +2048,7 @@ START_TEST(shlexec) init_test(); + test_lpFile_parsed(); test_filename(); test_find_executable(); test_lnks();

1 0

Alexandre Julliard : makefiles: Remove the no longer needed explicit dependencies for bison files.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: fbef7217b92a52de6e350598ebd7b667b32439b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbef7217b92a52de6e350598e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 13:27:27 2010 +0100 makefiles: Remove the no longer needed explicit dependencies for bison files. --- dlls/jscript/Makefile.in | 2 -- dlls/msi/Makefile.in | 2 -- libs/wpp/Makefile.in | 2 -- programs/winedbg/Makefile.in | 2 -- tools/widl/Makefile.in | 2 -- tools/wmc/Makefile.in | 2 -- tools/wrc/Makefile.in | 2 -- 7 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index ac26969..3d3ffff 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -42,5 +42,3 @@ BISON_SRCS = \ parser.y @MAKE_DLL_RULES@ - -parser.tab.c: parser.tab.h # for parallel makes diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index e4c3193..194c1a2 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -87,5 +87,3 @@ RC_SRCS = \ version.rc @MAKE_DLL_RULES@ - -sql.tab.c: sql.tab.h # for parallel makes diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 9987812..950712f 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -19,5 +19,3 @@ $(MODULE): $(OBJS) $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ - -ppy.tab.c: ppy.tab.h # for parallel makes diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 7a2eff6..ad9350f 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -60,5 +60,3 @@ install install-lib:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) - -dbg.tab.c: dbg.tab.h # for parallel makes diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 88dd243..8936782 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -41,5 +41,3 @@ install install-dev:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) uninstall:: $(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) - -parser.tab.c: parser.tab.h # for parallel makes diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 04f0a95..add09e1 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -36,5 +36,3 @@ install install-dev:: wmc-installed $(MANPAGES) $(INSTALLDIRS) uninstall:: $(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) - -mcy.tab.c: mcy.tab.h # for parallel makes diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 229c9be..77eeecb 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -41,5 +41,3 @@ install install-dev:: wrc-installed $(MANPAGES) $(INSTALLDIRS) uninstall:: $(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) - -parser.tab.c: parser.tab.h # for parallel makes

1 0

Eric Pouech : dbghelp: Added full support for DW_FORM_data8 attributes, as well as primary support for DW_FORM_block* attributes.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 09a7e2d3d0ed226cf3d4a410112596873770c7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a7e2d3d0ed226cf3d4a4101… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 15 21:12:22 2010 +0100 dbghelp: Added full support for DW_FORM_data8 attributes, as well as primary support for DW_FORM_block* attributes. --- dlls/dbghelp/dwarf.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 433dca8..81a1333 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -139,6 +139,7 @@ struct attribute union { unsigned long uvalue; + ULONGLONG lluvalue; long svalue; const char* string; struct dwarf2_block block; @@ -512,9 +513,8 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_data8: - attr->u.block.size = 8; - attr->u.block.ptr = data; - data += 8; + attr->u.lluvalue = dwarf2_get_u8(data); + TRACE("data8<%s>\n", wine_dbgstr_longlong(attr->u.uvalue)); break; case DW_FORM_ref1: @@ -1480,6 +1480,11 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, v.n1.n2.n3.lVal = value.u.uvalue; break; + case DW_FORM_data8: + v.n1.n2.vt = VT_UI8; + v.n1.n2.n3.llVal = value.u.lluvalue; + break; + case DW_FORM_sdata: v.n1.n2.vt = VT_I4; v.n1.n2.n3.lVal = value.u.svalue; @@ -1511,12 +1516,6 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, } break; - case DW_FORM_data8: - v.n1.n2.vt = VT_I1 | VT_BYREF; - v.n1.n2.n3.byref = pool_alloc(&subpgm->ctx->module->pool, value.u.block.size); - memcpy(v.n1.n2.n3.byref, value.u.block.ptr, value.u.block.size); - break; - default: FIXME("Unsupported form for const value %s (%lx)\n", name.u.string, value.form);

1 0