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

Jörg Höhle : winmm: Abort PlaySound in case of audio error.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: ca37dbcfe6309fd7caad1f53f3b76773cd0278fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca37dbcfe6309fd7caad1f53f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 26 07:36:47 2011 +0100 winmm: Abort PlaySound in case of audio error. --- dlls/winmm/playsound.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 58c833a..a6a3c87 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -179,7 +179,6 @@ static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg, static void PlaySound_WaitDone(struct playsound_data* s) { for (;;) { - ResetEvent(s->hEvent); if (InterlockedDecrement(&s->dwEventCount) >= 0) break; InterlockedIncrement(&s->dwEventCount); @@ -437,17 +436,20 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (count < 1) break; left -= count; waveHdr[index].dwBufferLength = count; - waveHdr[index].dwFlags &= ~WHDR_DONE; if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } - else FIXME("Couldn't play header\n"); + else { + ERR("Aborting play loop, waveOutWrite error\n"); + wps->bLoop = FALSE; + break; + } } bRet = TRUE; } while (wps->bLoop); - PlaySound_WaitDone(&s); /* for last buffer */ + PlaySound_WaitDone(&s); /* to balance first buffer */ waveOutReset(hWave); waveOutUnprepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR));

1 0

David Hedberg : comdlg32: Implement SetOptions/ GetOptions for the Item Dialog.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: f9a95150f3cc3a6c3c1aa3f7bfa9d0726c594955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a95150f3cc3a6c3c1aa3f7b… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 29 21:13:20 2011 +0200 comdlg32: Implement SetOptions/GetOptions for the Item Dialog. --- dlls/comdlg32/itemdlg.c | 21 +++++++++++++++++---- dlls/comdlg32/tests/itemdlg.c | 6 ------ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 4e49081..27f57cd 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -49,6 +49,8 @@ typedef struct FileDialogImpl { } u; enum ITEMDLG_TYPE dlg_type; LONG ref; + + FILEOPENDIALOGOPTIONS options; } FileDialogImpl; /************************************************************************** @@ -160,15 +162,24 @@ static HRESULT WINAPI IFileDialog2_fnUnadvise(IFileDialog2 *iface, DWORD dwCooki static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIALOGOPTIONS fos) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (0x%x)\n", This, fos); - return E_NOTIMPL; + TRACE("%p (0x%x)\n", This, fos); + + This->options = fos; + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnGetOptions(IFileDialog2 *iface, FILEOPENDIALOGOPTIONS *pfos) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p\n", This); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, pfos); + + if(!pfos) + return E_INVALIDARG; + + *pfos = This->options; + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetDefaultFolder(IFileDialog2 *iface, IShellItem *psi) @@ -822,11 +833,13 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p { fdimpl->dlg_type = ITEMDLG_TYPE_OPEN; fdimpl->u.IFileOpenDialog_iface.lpVtbl = &vt_IFileOpenDialog; + fdimpl->options = FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR; } else { fdimpl->dlg_type = ITEMDLG_TYPE_SAVE; fdimpl->u.IFileSaveDialog_iface.lpVtbl = &vt_IFileSaveDialog; + fdimpl->options = FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR; } hr = IUnknown_QueryInterface((IUnknown*)fdimpl, riid, ppv); diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index c345498..f67ef31 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -207,17 +207,12 @@ static void test_basics(void) } /* GetOptions */ - todo_wine - { hr = IFileOpenDialog_GetOptions(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileSaveDialog_GetOptions(pfsd, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); - } /* Check default options */ - todo_wine - { hr = IFileOpenDialog_GetOptions(pfod, &fdoptions); ok(hr == S_OK, "got 0x%08x.\n", hr); ok(fdoptions == (FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR), @@ -226,7 +221,6 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x.\n", hr); ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), "Unexpected default options: 0x%08x\n", fdoptions); - } /* GetResult */ todo_wine

1 0

David Hedberg : comdlg32: Implement SetFileTypes and GetFileTypeIndex/ SetFileTypeIndex for the Item Dialog.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: fc771c9f3872133227bdf043e93d465624a0d687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc771c9f3872133227bdf043e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Mar 30 08:12:29 2011 +0200 comdlg32: Implement SetFileTypes and GetFileTypeIndex/SetFileTypeIndex for the Item Dialog. --- dlls/comdlg32/itemdlg.c | 65 +++++++++++++++++++++++++++++++++++++---- dlls/comdlg32/tests/itemdlg.c | 6 ---- 2 files changed, 59 insertions(+), 12 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 27f57cd..018e713 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -28,6 +28,8 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" +#include "winreg.h" +#include "shlwapi.h" #include "commdlg.h" #include "cdlg.h" @@ -51,6 +53,9 @@ typedef struct FileDialogImpl { LONG ref; FILEOPENDIALOGOPTIONS options; + COMDLG_FILTERSPEC *filterspecs; + UINT filterspec_count; + UINT filetypeindex; } FileDialogImpl; /************************************************************************** @@ -111,7 +116,17 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface) TRACE("%p - ref %d\n", This, ref); if(!ref) + { + UINT i; + for(i = 0; i < This->filterspec_count; i++) + { + LocalFree((void*)This->filterspecs[i].pszName); + LocalFree((void*)This->filterspecs[i].pszSpec); + } + HeapFree(GetProcessHeap(), 0, This->filterspecs); + HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -127,22 +142,56 @@ static HRESULT WINAPI IFileDialog2_fnSetFileTypes(IFileDialog2 *iface, UINT cFil const COMDLG_FILTERSPEC *rgFilterSpec) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%d, %p)\n", This, cFileTypes, rgFilterSpec); - return E_NOTIMPL; + UINT i; + TRACE("%p (%d, %p)\n", This, cFileTypes, rgFilterSpec); + + if(This->filterspecs) + return E_UNEXPECTED; + + if(!rgFilterSpec) + return E_INVALIDARG; + + if(!cFileTypes) + return S_OK; + + This->filterspecs = HeapAlloc(GetProcessHeap(), 0, sizeof(COMDLG_FILTERSPEC)*cFileTypes); + for(i = 0; i < cFileTypes; i++) + { + This->filterspecs[i].pszName = StrDupW(rgFilterSpec[i].pszName); + This->filterspecs[i].pszSpec = StrDupW(rgFilterSpec[i].pszSpec); + } + This->filterspec_count = cFileTypes; + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetFileTypeIndex(IFileDialog2 *iface, UINT iFileType) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%d)\n", This, iFileType); - return E_NOTIMPL; + TRACE("%p (%d)\n", This, iFileType); + + if(!This->filterspecs) + return E_FAIL; + + if(iFileType >= This->filterspec_count) + This->filetypeindex = This->filterspec_count - 1; + else + This->filetypeindex = iFileType; + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnGetFileTypeIndex(IFileDialog2 *iface, UINT *piFileType) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, piFileType); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, piFileType); + + if(!piFileType) + return E_INVALIDARG; + + *piFileType = This->filetypeindex; + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnAdvise(IFileDialog2 *iface, IFileDialogEvents *pfde, DWORD *pdwCookie) @@ -842,6 +891,10 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->options = FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR; } + fdimpl->filterspecs = NULL; + fdimpl->filterspec_count = 0; + fdimpl->filetypeindex = 0; + hr = IUnknown_QueryInterface((IUnknown*)fdimpl, riid, ppv); IUnknown_Release((IUnknown*)fdimpl); return hr; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index f67ef31..848d815 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -271,8 +271,6 @@ static void test_basics(void) } /* GetFileTypeIndex */ - todo_wine - { hr = IFileOpenDialog_GetFileTypeIndex(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); filetype = 0x12345; @@ -285,11 +283,8 @@ static void test_basics(void) hr = IFileSaveDialog_GetFileTypeIndex(pfsd, &filetype); ok(hr == S_OK, "got 0x%08x.\n", hr); ok(filetype == 0, "got %d.\n", filetype); - } /* SetFileTypes / SetFileTypeIndex */ - todo_wine - { hr = IFileOpenDialog_SetFileTypes(pfod, 0, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileOpenDialog_SetFileTypes(pfod, 0, filterspec); @@ -330,7 +325,6 @@ static void test_basics(void) ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFileTypes(pfsd, 1, &filterspec[1]); ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); - } /* SetFilter */ todo_wine

1 0

David Hedberg : comdlg32: Implement some folder and file selection functions for the Item Dialog.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: b5a1c89f6ad056c8b7437186ba4a16c310f97bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a1c89f6ad056c8b7437186b… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 29 21:13:22 2011 +0200 comdlg32: Implement some folder and file selection functions for the Item Dialog. --- dlls/comdlg32/itemdlg.c | 136 ++++++++++++++++++++++++++++++++++++---- dlls/comdlg32/tests/itemdlg.c | 23 ++----- 2 files changed, 129 insertions(+), 30 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 018e713..4cb6839 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -56,6 +56,12 @@ typedef struct FileDialogImpl { COMDLG_FILTERSPEC *filterspecs; UINT filterspec_count; UINT filetypeindex; + + IShellItemArray *psia_selection; + IShellItemArray *psia_results; + IShellItem *psi_defaultfolder; + IShellItem *psi_setfolder; + IShellItem *psi_folder; } FileDialogImpl; /************************************************************************** @@ -125,6 +131,12 @@ static ULONG WINAPI IFileDialog2_fnRelease(IFileDialog2 *iface) } HeapFree(GetProcessHeap(), 0, This->filterspecs); + if(This->psi_defaultfolder) IShellItem_Release(This->psi_defaultfolder); + if(This->psi_setfolder) IShellItem_Release(This->psi_setfolder); + if(This->psi_folder) IShellItem_Release(This->psi_folder); + if(This->psia_selection) IShellItemArray_Release(This->psia_selection); + if(This->psia_results) IShellItemArray_Release(This->psia_results); + HeapFree(GetProcessHeap(), 0, This); } @@ -234,29 +246,77 @@ static HRESULT WINAPI IFileDialog2_fnGetOptions(IFileDialog2 *iface, FILEOPENDIA static HRESULT WINAPI IFileDialog2_fnSetDefaultFolder(IFileDialog2 *iface, IShellItem *psi) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, psi); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, psi); + if(This->psi_defaultfolder) + IShellItem_Release(This->psi_defaultfolder); + + This->psi_defaultfolder = psi; + + if(This->psi_defaultfolder) + IShellItem_AddRef(This->psi_defaultfolder); + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnSetFolder(IFileDialog2 *iface, IShellItem *psi) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, psi); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, psi); + if(This->psi_setfolder) + IShellItem_Release(This->psi_setfolder); + + This->psi_setfolder = psi; + + if(This->psi_setfolder) + IShellItem_AddRef(This->psi_setfolder); + + return S_OK; } static HRESULT WINAPI IFileDialog2_fnGetFolder(IFileDialog2 *iface, IShellItem **ppsi) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, ppsi); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, ppsi); + if(!ppsi) + return E_INVALIDARG; + + /* FIXME: + If the dialog is shown, return the current(ly selected) folder. */ + + *ppsi = NULL; + if(This->psi_folder) + *ppsi = This->psi_folder; + else if(This->psi_setfolder) + *ppsi = This->psi_setfolder; + else if(This->psi_defaultfolder) + *ppsi = This->psi_defaultfolder; + + if(*ppsi) + { + IShellItem_AddRef(*ppsi); + return S_OK; + } + + return E_FAIL; } static HRESULT WINAPI IFileDialog2_fnGetCurrentSelection(IFileDialog2 *iface, IShellItem **ppsi) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, ppsi); - return E_NOTIMPL; + HRESULT hr; + TRACE("%p (%p)\n", This, ppsi); + + if(!ppsi) + return E_INVALIDARG; + + if(This->psia_selection) + { + /* FIXME: Check filename edit box */ + hr = IShellItemArray_GetItemAt(This->psia_selection, 0, ppsi); + return hr; + } + + return E_FAIL; } static HRESULT WINAPI IFileDialog2_fnSetFileName(IFileDialog2 *iface, LPCWSTR pszName) @@ -297,8 +357,29 @@ static HRESULT WINAPI IFileDialog2_fnSetFileNameLabel(IFileDialog2 *iface, LPCWS static HRESULT WINAPI IFileDialog2_fnGetResult(IFileDialog2 *iface, IShellItem **ppsi) { FileDialogImpl *This = impl_from_IFileDialog2(iface); - FIXME("stub - %p (%p)\n", This, ppsi); - return E_NOTIMPL; + HRESULT hr; + TRACE("%p (%p)\n", This, ppsi); + + if(!ppsi) + return E_INVALIDARG; + + if(This->psia_results) + { + UINT item_count; + hr = IShellItemArray_GetCount(This->psia_results, &item_count); + if(SUCCEEDED(hr)) + { + if(item_count != 1) + return E_FAIL; + + /* Adds a reference. */ + hr = IShellItemArray_GetItemAt(This->psia_results, 0, ppsi); + } + + return hr; + } + + return E_UNEXPECTED; } static HRESULT WINAPI IFileDialog2_fnAddPlace(IFileDialog2 *iface, IShellItem *psi, FDAP fdap) @@ -566,15 +647,32 @@ static HRESULT WINAPI IFileOpenDialog_fnSetFilter(IFileOpenDialog *iface, IShell static HRESULT WINAPI IFileOpenDialog_fnGetResults(IFileOpenDialog *iface, IShellItemArray **ppenum) { FileDialogImpl *This = impl_from_IFileOpenDialog(iface); - FIXME("stub - %p (%p)\n", This, ppenum); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, ppenum); + + *ppenum = This->psia_results; + + if(*ppenum) + { + IShellItemArray_AddRef(*ppenum); + return S_OK; + } + + return E_FAIL; } static HRESULT WINAPI IFileOpenDialog_fnGetSelectedItems(IFileOpenDialog *iface, IShellItemArray **ppsai) { FileDialogImpl *This = impl_from_IFileOpenDialog(iface); - FIXME("stub - %p (%p)\n", This, ppsai); - return E_NOTIMPL; + TRACE("%p (%p)\n", This, ppsai); + + if(This->psia_selection) + { + *ppsai = This->psia_selection; + IShellItemArray_AddRef(*ppsai); + return S_OK; + } + + return E_FAIL; } static const IFileOpenDialogVtbl vt_IFileOpenDialog = { @@ -864,6 +962,7 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p { FileDialogImpl *fdimpl; HRESULT hr; + IShellFolder *psf; TRACE("%p, %s, %p\n", pUnkOuter, debugstr_guid(riid), ppv); if(!ppv) @@ -895,6 +994,15 @@ static HRESULT FileDialog_constructor(IUnknown *pUnkOuter, REFIID riid, void **p fdimpl->filterspec_count = 0; fdimpl->filetypeindex = 0; + fdimpl->psia_selection = fdimpl->psia_results = NULL; + fdimpl->psi_setfolder = fdimpl->psi_folder = NULL; + + /* FIXME: The default folder setting should be restored for the + * application if it was previously set. */ + SHGetDesktopFolder(&psf); + SHGetItemFromObject((IUnknown*)psf, &IID_IShellItem, (void**)&fdimpl->psi_defaultfolder); + IShellFolder_Release(psf); + hr = IUnknown_QueryInterface((IUnknown*)fdimpl, riid, ppv); IUnknown_Release((IUnknown*)fdimpl); return hr; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 848d815..e5f5439 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -223,21 +223,18 @@ static void test_basics(void) "Unexpected default options: 0x%08x\n", fdoptions); /* GetResult */ - todo_wine - { hr = IFileOpenDialog_GetResult(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileSaveDialog_GetResult(pfsd, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); - } psi = (void*)0xdeadbeef; hr = IFileOpenDialog_GetResult(pfod, &psi); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); ok(psi == (void*)0xdeadbeef, "got %p.\n", psi); psi = (void*)0xdeadbeef; hr = IFileSaveDialog_GetResult(pfsd, &psi); - todo_wine ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); + ok(hr == E_UNEXPECTED, "got 0x%08x.\n", hr); ok(psi == (void*)0xdeadbeef, "got %p.\n", psi); /* GetCurrentSelection */ @@ -336,13 +333,10 @@ static void test_basics(void) } /* SetFolder */ - todo_wine - { hr = IFileOpenDialog_SetFolder(pfod, NULL); ok(hr == S_OK, "got 0x%08x.\n", hr); hr = IFileSaveDialog_SetFolder(pfsd, NULL); ok(hr == S_OK, "got 0x%08x.\n", hr); - } /* SetDefaultExtension */ todo_wine @@ -363,8 +357,6 @@ static void test_basics(void) } /* SetDefaultFolder */ - todo_wine - { hr = IFileOpenDialog_SetDefaultFolder(pfod, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_SetDefaultFolder(pfsd, NULL); @@ -374,7 +366,6 @@ static void test_basics(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IFileSaveDialog_SetDefaultFolder(pfsd, psidesktop); ok(hr == S_OK, "got 0x%08x\n", hr); - } if(0) { @@ -385,10 +376,10 @@ static void test_basics(void) /* GetFolder / SetFolder */ hr = IFileOpenDialog_GetFolder(pfod, NULL); - todo_wine ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); hr = IFileOpenDialog_GetFolder(pfod, &psi_original); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) { hr = IFileOpenDialog_SetFolder(pfod, psidesktop); @@ -399,7 +390,7 @@ static void test_basics(void) } hr = IFileSaveDialog_GetFolder(pfsd, &psi_original); - todo_wine ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(hr == S_OK, "got 0x%08x.\n", hr); if(SUCCEEDED(hr)) { hr = IFileSaveDialog_SetFolder(pfsd, psidesktop); @@ -523,8 +514,8 @@ static void test_basics(void) } psia = (void*)0xdeadbeef; hr = IFileOpenDialog_GetResults(pfod, &psia); - todo_wine ok(hr == E_FAIL, "got 0x%08x.\n", hr); - todo_wine ok(psia == NULL, "got %p.\n", psia); + ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(psia == NULL, "got %p.\n", psia); /* GetSelectedItems */ if(0)

1 0

David Hedberg : comdlg32: Implement Advise/Unadvise for the Item Dialog.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: ac2063a418d5c198333188bd5e7e3c050037d838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2063a418d5c198333188bd5… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 29 21:13:23 2011 +0200 comdlg32: Implement Advise/Unadvise for the Item Dialog. --- dlls/comdlg32/itemdlg.c | 54 ++++++++++- dlls/comdlg32/tests/itemdlg.c | 201 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac2063a418d5c19833318…

1 0

Vincent Povirk : gdiplus: Fall back to Liberation Serif if Times New Roman is missing.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: ca5b5d2a05677b180f6dc5346fef5d2cf501bcdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5b5d2a05677b180f6dc5346… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 13:11:53 2011 -0500 gdiplus: Fall back to Liberation Serif if Times New Roman is missing. --- dlls/gdiplus/font.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index e092b43..54accd7 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -837,12 +837,22 @@ GpStatus WINGDIPAPI GdipGetGenericFontFamilyMonospace(GpFontFamily **nativeFamil GpStatus WINGDIPAPI GdipGetGenericFontFamilySerif(GpFontFamily **nativeFamily) { static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; + static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f','\0'}; + GpStatus stat; TRACE("(%p)\n", nativeFamily); if (nativeFamily == NULL) return InvalidParameter; - return GdipCreateFontFamilyFromName(TimesNewRoman, NULL, nativeFamily); + stat = GdipCreateFontFamilyFromName(TimesNewRoman, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + stat = GdipCreateFontFamilyFromName(LiberationSerif, NULL, nativeFamily); + + if (stat == FontFamilyNotFound) + ERR("Missing 'Times New Roman' font\n"); + + return stat; } /*****************************************************************************

1 0

Piotr Caban : ntdll: Don' t call compare function on memory not provided by user in qsort.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 49250bec7c23b79d4bf23fb95e86acb132e4e567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49250bec7c23b79d4bf23fb95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 10:56:27 2011 +0200 ntdll: Don't call compare function on memory not provided by user in qsort. --- dlls/ntdll/misc.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 8496113..fecd67e 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -253,7 +253,6 @@ double CDECL NTDLL_tan( double d ) } -/* Merge Sort. Algorithm taken from http://www.linux-related.de/index.html?/coding/sort/sort_merge.htm */ static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), size_t left, size_t right ) @@ -265,25 +264,21 @@ NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(co NTDLL_mergesort( arr, barr, elemsize, compar, m+1, right); #define X(a,i) ((char*)a+elemsize*(i)) - for (i=m+1; i>left; i--) - memcpy (X(barr,(i-1)),X(arr,(i-1)),elemsize); - for (j=m; j<right; j++) - memcpy (X(barr,(right+m-j)),X(arr,(j+1)),elemsize); - - /* i=left; j=right; */ - for (k=left; i<=m && j>m; k++) { - if (i==j || compar(X(barr,i),X(barr,j))<=0) { - memcpy(X(arr,k),X(barr,i),elemsize); + for (k=left, i=left, j=m+1; i<=m && j<=right; k++) { + if (compar(X(arr, i), X(arr,j)) <= 0) { + memcpy(X(barr,k), X(arr, i), elemsize); i++; } else { - memcpy(X(arr,k),X(barr,j),elemsize); - j--; + memcpy(X(barr,k), X(arr, j), elemsize); + j++; } } - for (; i<=m; i++, k++) - memcpy(X(arr,k),X(barr,i),elemsize); - for (; j>m; j--, k++) - memcpy(X(arr,k),X(barr,j),elemsize); + if (i<=m) + memcpy(X(barr,k), X(arr,i), (m-i+1)*elemsize); + else + memcpy(X(barr,k), X(arr,j), (right-j+1)*elemsize); + + memcpy(X(arr, left), X(barr, left), (right-left+1)*elemsize); } #undef X }

1 0

David Hedberg : comdlg32: Add implementation of DllRegisterServer/ DllUnregisterServer.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 18b1f5ca476a8fc1d87a5615de528d1139045b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b1f5ca476a8fc1d87a5615d… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 29 21:13:18 2011 +0200 comdlg32: Add implementation of DllRegisterServer/DllUnregisterServer. --- dlls/comdlg32/Makefile.in | 2 ++ dlls/comdlg32/cdlg32.c | 18 ++++++++++++++++++ dlls/comdlg32/comdlg32.spec | 2 ++ dlls/comdlg32/comdlg32_classes.idl | 33 +++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 5 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index 6bf1c1a..f75c706 100644 --- a/dlls/comdlg32/Makefile.in +++ b/dlls/comdlg32/Makefile.in @@ -57,4 +57,6 @@ SVG_SRCS = \ pd32_nocollate.svg \ pd32_portrait.svg +IDL_R_SRCS = comdlg32_classes.idl + @MAKE_DLL_RULES@ diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index de0f486..4f6b98a 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" +#include "objbase.h" +#include "rpcproxy.h" #include "commdlg.h" #include "cderr.h" #include "wine/debug.h" @@ -273,3 +275,19 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return CLASS_E_CLASSNOTAVAILABLE; } + +/*********************************************************************** + * DllRegisterServer (COMMDLG32.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(COMDLG32_hInstance, NULL); +} + +/*********************************************************************** + * DllUnregisterServer (COMMDLG32.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(COMDLG32_hInstance, NULL); +} diff --git a/dlls/comdlg32/comdlg32.spec b/dlls/comdlg32/comdlg32.spec index 118d3d7..01c7cf6 100644 --- a/dlls/comdlg32/comdlg32.spec +++ b/dlls/comdlg32/comdlg32.spec @@ -4,6 +4,8 @@ @ stdcall ChooseFontW(ptr) @ stdcall CommDlgExtendedError() @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall FindTextA(ptr) @ stdcall FindTextW(ptr) @ stdcall GetFileTitleA(str ptr long) diff --git a/dlls/comdlg32/comdlg32_classes.idl b/dlls/comdlg32/comdlg32_classes.idl new file mode 100644 index 0000000..b45eeb5 --- /dev/null +++ b/dlls/comdlg32/comdlg32_classes.idl @@ -0,0 +1,33 @@ +/* + * Coclasses for comdlg32 + * + * Copyright 2011 David Hedberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("File Open Dialog"), + threading(apartment), + uuid(dc1c5a9c-e88a-4dde-a5a1-60f82a20aef7) +] +coclass FileOpenDialog { interface IFileOpenDialog; } + +[ + helpstring("File Save Dialog"), + threading(apartment), + uuid(c0b4e2f3-ba21-4773-8dba-335ec946eb8b) +] +coclass FileSaveDialog { interface IFileSaveDialog; } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ff72e56..5c09faf 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2489,6 +2489,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,avifil32.dll,1 11,,browseui.dll,1 11,,comctl32.dll,2 +11,,comdlg32.dll,1 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,d3dxof.dll,1

1 0

David Hedberg : comdlg32/tests: Add initial tests for the Item Dialog.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: fb391afaefb308cbbf0efc7c7911388cbafd77db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb391afaefb308cbbf0efc7c7… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 29 21:13:19 2011 +0200 comdlg32/tests: Add initial tests for the Item Dialog. --- dlls/comdlg32/tests/Makefile.in | 3 +- dlls/comdlg32/tests/filedlg.c | 1 - dlls/comdlg32/tests/itemdlg.c | 672 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 674 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb391afaefb308cbbf0ef…

1 0

Henri Verbeet : Revert "wined3d: Prevent crash when blit_priv is NULL.".
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: c9ba0949c2ee0224696bc00575a7d42d33fc355f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ba0949c2ee0224696bc0057… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 19:21:46 2011 +0200 Revert "wined3d: Prevent crash when blit_priv is NULL.". This reverts commit 37aadc9e377d7840a607dbabff10de375f9fdde8. This patch was superseded by b2132202c77b0d56b68d2a0f4c0c1f6d637ab577. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0f20c1f..f76cdde 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3924,8 +3924,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT } /* Special cases for RenderTargets */ - if (This->resource.device->blit_priv && ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) - || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET)))) + if ((This->resource.usage & WINED3DUSAGE_RENDERTARGET) + || (src && (src->resource.usage & WINED3DUSAGE_RENDERTARGET))) { if (SUCCEEDED(IWineD3DSurfaceImpl_BltOverride(This, DestRect, src, SrcRect, flags, DDBltFx, Filter))) return WINED3D_OK;

1 0