wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Nikolay Sivov : shell32: Implement ParseName().
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: e013a7e584863abb3d9bc5ce1339830b6560aba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e013a7e584863abb3d9bc5ce1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 10 20:00:55 2015 +0300 shell32: Implement ParseName(). --- dlls/shell32/shelldispatch.c | 38 +++++++++++++++++++--- dlls/shell32/tests/shelldispatch.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index f168477..6e13123 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -460,6 +460,8 @@ static HRESULT FolderItem_Constructor(VARIANT *dir, FolderItem **ppfi) FolderItemImpl *This; HRESULT ret; + TRACE("%s\n", debugstr_variant(dir)); + *ppfi = NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemImpl)); @@ -637,13 +639,39 @@ static HRESULT WINAPI FolderImpl_Items(Folder3 *iface, FolderItems **ppid) return E_NOTIMPL; } -static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR bName, - FolderItem **ppid) +static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem **item) { - FIXME("(%p,%s,%p)\n", iface, debugstr_w(bName), ppid); + FolderItem *self; + BSTR str; + WCHAR pathW[MAX_PATH]; + VARIANT v; + HRESULT hr; - *ppid = NULL; - return E_NOTIMPL; + TRACE("(%p,%s,%p)\n", iface, debugstr_w(name), item); + + *item = NULL; + + if (!name || !name[0]) + return S_FALSE; + + hr = Folder3_get_Self(iface, &self); + if (FAILED(hr)) + return hr; + + hr = FolderItem_get_Path(self, &str); + FolderItem_Release(self); + + PathCombineW(pathW, str, name); + SysFreeString(str); + + if (!PathFileExistsW(pathW)) + return S_FALSE; + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(pathW); + hr = FolderItem_Constructor(&v, item); + VariantClear(&v); + return hr; } static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR bName, diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index fe25eb4..851d775 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -679,6 +679,70 @@ todo_wine IShellWindows_Release(shellwindows); } +static void test_ParseName(void) +{ + static const WCHAR cadabraW[] = {'c','a','d','a','b','r','a',0}; + WCHAR pathW[MAX_PATH]; + IShellDispatch *sd; + FolderItem *item; + Folder *folder; + HRESULT hr; + VARIANT v; + BSTR str; + + hr = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (void**)&sd); + ok(hr == S_OK, "got 0x%08x\n", hr); + + GetTempPathW(sizeof(pathW)/sizeof(pathW[0]), pathW); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(pathW); + hr = IShellDispatch_NameSpace(sd, v, &folder); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + item = (void*)0xdeadbeef; + hr = Folder_ParseName(folder, NULL, &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(item == NULL, "got %p\n", item); + + /* empty name */ + str = SysAllocStringLen(NULL, 0); + item = (void*)0xdeadbeef; + hr = Folder_ParseName(folder, str, &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(item == NULL, "got %p\n", item); + SysFreeString(str); + + /* path doesn't exist */ + str = SysAllocString(cadabraW); + item = (void*)0xdeadbeef; + hr = Folder_ParseName(folder, str, &item); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(item == NULL, "got %p\n", item); + SysFreeString(str); + + lstrcatW(pathW, cadabraW); + CreateDirectoryW(pathW, NULL); + + str = SysAllocString(cadabraW); + item = NULL; + hr = Folder_ParseName(folder, str, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(item != NULL, "got %p\n", item); + SysFreeString(str); + + hr = FolderItem_get_Path(item, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(str[0] != 0, "path %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + RemoveDirectoryW(pathW); + FolderItem_Release(item); + Folder_Release(folder); + IShellDispatch_Release(sd); +} + START_TEST(shelldispatch) { HRESULT r; @@ -693,6 +757,7 @@ START_TEST(shelldispatch) test_service(); test_ShellFolderViewDual(); test_ShellWindows(); + test_ParseName(); CoUninitialize(); }

1 0

Alexandre Julliard : shell32/tests: Avoid duplicate const.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: ed700d16f7d69e257b7744870696283b6a122e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed700d16f7d69e257b7744870… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 11 14:52:07 2015 +0900 shell32/tests: Avoid duplicate const. --- dlls/shell32/tests/shelldispatch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 8e2e399..fe25eb4 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -394,7 +394,7 @@ static void test_dispatch_typeinfo(IDispatch *disp, REFIID *riid) static void test_ShellFolderViewDual(void) { - static const REFIID shelldisp_riids[] = { + static const IID *shelldisp_riids[] = { &IID_IShellDispatch6, &IID_IShellDispatch5, &IID_IShellDispatch4, @@ -556,12 +556,12 @@ todo_wine { ok(ret == 0, "got %d\n", ret); } else { - static const REFIID browser_riids[] = { + static const IID *browser_riids[] = { &IID_IWebBrowser2, &IID_NULL }; - static const REFIID viewdual_riids[] = { + static const IID *viewdual_riids[] = { &IID_IShellFolderViewDual3, &IID_NULL };

1 0

Nikolay Sivov : shell32: Partially implement SHGetKnownFolderIDList().
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 80d28abdc8cadb6dc5e35c36c2d9f71eddff50f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d28abdc8cadb6dc5e35c36c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 21:46:56 2015 +0300 shell32: Partially implement SHGetKnownFolderIDList(). --- dlls/shell32/shellpath.c | 44 ++++++++++++++++++++++++++++++++++++++++-- dlls/shell32/tests/shellpath.c | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 331db1f..42f34a2 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5727,8 +5727,48 @@ HRESULT WINAPI KnownFolderManager_Constructor( IUnknown *punk, REFIID riid, void HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PIDLIST_ABSOLUTE *pidl) { - FIXME("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); - return E_NOTIMPL; + TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); + + if (!pidl) + return E_INVALIDARG; + + if (flags) + FIXME("unsupported flags: 0x%08x\n", flags); + + if (token) + FIXME("user token is not used.\n"); + + *pidl = NULL; + if (IsEqualIID(rfid, &FOLDERID_Desktop)) + *pidl = _ILCreateDesktop(); + else if (IsEqualIID(rfid, &FOLDERID_RecycleBinFolder)) + *pidl = _ILCreateBitBucket(); + else if (IsEqualIID(rfid, &FOLDERID_ComputerFolder)) + *pidl = _ILCreateMyComputer(); + else if (IsEqualIID(rfid, &FOLDERID_PrintersFolder)) + *pidl = _ILCreatePrinters(); + else if (IsEqualIID(rfid, &FOLDERID_ControlPanelFolder)) + *pidl = _ILCreateControlPanel(); + else if (IsEqualIID(rfid, &FOLDERID_NetworkFolder)) + *pidl = _ILCreateNetwork(); + else if (IsEqualIID(rfid, &FOLDERID_Documents)) + *pidl = _ILCreateMyDocuments(); + else + { + DWORD attributes = 0; + WCHAR *pathW; + HRESULT hr; + + hr = SHGetKnownFolderPath(rfid, flags, token, &pathW); + if (FAILED(hr)) + return hr; + + hr = SHILCreateFromPathW(pathW, pidl, &attributes); + CoTaskMemFree(pathW); + return hr; + } + + return *pidl ? S_OK : E_FAIL; } HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG flags, HANDLE hToken, diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ec21ce7..6b5ed76 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -102,6 +102,7 @@ static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR); static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pPathYetAnotherMakeUniqueName)(PWSTR, PCWSTR, PCWSTR, PCWSTR); +static HRESULT (WINAPI *pSHGetKnownFolderIDList)(REFKNOWNFOLDERID, DWORD, HANDLE, PIDLIST_ABSOLUTE*); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; @@ -209,6 +210,7 @@ static void loadShell32(void) GET_PROC(SHFileOperationA) GET_PROC(SHGetMalloc) GET_PROC(PathYetAnotherMakeUniqueName) + GET_PROC(SHGetKnownFolderIDList) ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); if (pSHGetMalloc) @@ -2728,6 +2730,38 @@ if (0) ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); } +static void test_SHGetKnownFolderIDList(void) +{ + PIDLIST_ABSOLUTE pidl; + HRESULT hr; + + if (!pSHGetKnownFolderIDList) + { + win_skip("SHGetKnownFolderIDList is not available.\n"); + return; + } + + hr = pSHGetKnownFolderIDList(NULL, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + +if (0) { /* crashes on native */ + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(NULL, 0, NULL, &pidl); +} + /* not a known folder */ + pidl = (void*)0xdeadbeef; + hr = pSHGetKnownFolderIDList(&IID_IUnknown, 0, NULL, &pidl); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(pidl == NULL, "got %p\n", pidl); + + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = pSHGetKnownFolderIDList(&FOLDERID_Desktop, 0, NULL, &pidl); + ok(hr == S_OK, "got 0x%08x\n", hr); + CoTaskMemFree(pidl); +} + START_TEST(shellpath) { if (!init()) return; @@ -2757,5 +2791,6 @@ START_TEST(shellpath) test_knownFolders(); test_DoEnvironmentSubst(); test_PathYetAnotherMakeUniqueName(); + test_SHGetKnownFolderIDList(); } }

1 0

Nikolay Sivov : shell32: Silence IMarshal requests to IKnownFolder and IKnownFolderManager.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 4367f4b2308d935daa76965c57d4da757403cc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4367f4b2308d935daa76965c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 19:37:53 2015 +0300 shell32: Silence IMarshal requests to IKnownFolder and IKnownFolderManager. --- dlls/shell32/shellpath.c | 12 ++++++++++++ dlls/shell32/tests/shellpath.c | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 5753bb6..331db1f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5024,11 +5024,17 @@ static HRESULT WINAPI knownfolder_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppv ); + *ppv = NULL; if ( IsEqualGUID( riid, &IID_IKnownFolder ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppv = iface; } + else if ( IsEqualGUID( riid, &IID_IMarshal ) ) + { + TRACE("IID_IMarshal returning NULL.\n"); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -5416,11 +5422,17 @@ static HRESULT WINAPI foldermanager_QueryInterface( TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppv ); + *ppv = NULL; if ( IsEqualGUID( riid, &IID_IKnownFolderManager ) || IsEqualGUID( riid, &IID_IUnknown ) ) { *ppv = iface; } + else if ( IsEqualGUID( riid, &IID_IMarshal ) ) + { + TRACE("IID_IMarshal returning NULL.\n"); + return E_NOINTERFACE; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index c2ce198..ec21ce7 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -2075,8 +2075,13 @@ static void test_knownFolders(void) win_skip("IKnownFolderManager unavailable\n"); else { + IUnknown *unk; + ok(hr == S_OK, "failed to create KnownFolderManager instance: 0x%08x\n", hr); + hr = IKnownFolderManager_QueryInterface(mgr, &IID_IMarshal, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IKnownFolderManager_FolderIdFromCsidl(mgr, CSIDL_WINDOWS, &folderId); ok(hr == S_OK, "failed to convert CSIDL to KNOWNFOLDERID: 0x%08x\n", hr); ok(IsEqualGUID(&folderId, &FOLDERID_Windows)==TRUE, "invalid KNOWNFOLDERID returned\n"); @@ -2089,6 +2094,9 @@ static void test_knownFolders(void) ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) { + hr = IKnownFolder_QueryInterface(folder, &IID_IMarshal, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IKnownFolder_GetCategory(folder, &cat); ok(hr == S_OK, "failed to get folder category: 0x%08x\n", hr); ok(cat==KF_CATEGORY_FIXED, "invalid folder category: %d\n", cat);

1 0

Nikolay Sivov : shell32: Forward couple of IKnownFolder methods to regular API equivalents.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 594e0b674f997af1d12bf75e67ac5c1dc723f630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=594e0b674f997af1d12bf75e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 9 13:31:34 2015 +0300 shell32: Forward couple of IKnownFolder methods to regular API equivalents. --- dlls/shell32/shell32.spec | 1 + dlls/shell32/shellpath.c | 34 ++++++++++++++++++++++++++++------ include/shlobj.h | 26 +++++++++++++++++--------- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f168ed7..ed34919 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -379,6 +379,7 @@ @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) @ stdcall SHGetKnownFolderIDList(ptr long ptr ptr) +@ stdcall SHGetKnownFolderItem(ptr long long ptr ptr) @ stdcall SHGetKnownFolderPath(ptr long ptr ptr) @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 354b23a..5753bb6 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5103,12 +5103,13 @@ static HRESULT WINAPI knownfolder_GetCategory( static HRESULT WINAPI knownfolder_GetShellItem( IKnownFolder *iface, - DWORD dwFlags, + DWORD flags, REFIID riid, void **ppv) { - FIXME("0x%08x, %s, %p\n", dwFlags, debugstr_guid(riid), ppv); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); + TRACE("(%p, 0x%08x, %s, %p)\n", knownfolder, flags, debugstr_guid(riid), ppv); + return SHGetKnownFolderItem(&knownfolder->id, flags, NULL, riid, ppv); } static HRESULT get_known_folder_path( @@ -5275,11 +5276,12 @@ static HRESULT WINAPI knownfolder_SetPath( static HRESULT WINAPI knownfolder_GetIDList( IKnownFolder *iface, - DWORD dwFlags, + DWORD flags, PIDLIST_ABSOLUTE *ppidl) { - FIXME("0x%08x, %p\n", dwFlags, ppidl); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); + TRACE("(%p, 0x%08x, %p)\n", knownfolder, flags, ppidl); + return SHGetKnownFolderIDList(&knownfolder->id, flags, NULL, ppidl); } static HRESULT WINAPI knownfolder_GetFolderType( @@ -5717,6 +5719,26 @@ HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE return E_NOTIMPL; } +HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID rfid, KNOWN_FOLDER_FLAG flags, HANDLE hToken, + REFIID riid, void **ppv) +{ + PIDLIST_ABSOLUTE pidl; + HRESULT hr; + + TRACE("%s, 0x%08x, %p, %s, %p\n", debugstr_guid(rfid), flags, hToken, debugstr_guid(riid), ppv); + + hr = SHGetKnownFolderIDList(rfid, flags, hToken, &pidl); + if (FAILED(hr)) + { + *ppv = NULL; + return hr; + } + + hr = SHCreateItemFromIDList(pidl, riid, ppv); + CoTaskMemFree(pidl); + return hr; +} + static void register_system_knownfolders(void) { int i; diff --git a/include/shlobj.h b/include/shlobj.h index 9025a73..c40be95 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -42,6 +42,21 @@ extern "C" { DECLARE_HANDLE(HPSXA); #endif +typedef enum +{ + KF_FLAG_DEFAULT = 0x00000000, + KF_FLAG_SIMPLE_IDLIST = 0x00000100, + KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200, + KF_FLAG_DEFAULT_PATH = 0x00000400, + KF_FLAG_INIT = 0x00000800, + KF_FLAG_NO_ALIAS = 0x00001000, + KF_FLAG_DONT_UNEXPAND = 0x00002000, + KF_FLAG_DONT_VERIFY = 0x00004000, + KF_FLAG_CREATE = 0x00008000, + KF_FLAG_NO_APPCONTAINER_REDIRECTION = 0x00010000, + KF_FLAG_ALIAS_ONLY = 0x80000000 +} KNOWN_FOLDER_FLAG; + UINT WINAPI SHAddFromPropSheetExtArray(HPSXA,LPFNADDPROPSHEETPAGE,LPARAM); LPVOID WINAPI SHAlloc(ULONG) __WINE_ALLOC_SIZE(1); HRESULT WINAPI SHCoCreateInstance(LPCWSTR,const CLSID*,IUnknown*,REFIID,LPVOID*); @@ -62,6 +77,8 @@ HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); #define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir) +HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID,DWORD,HANDLE,PIDLIST_ABSOLUTE*); +HRESULT WINAPI SHGetKnownFolderItem(REFKNOWNFOLDERID,KNOWN_FOLDER_FLAG,HANDLE,REFIID,void**); HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID,DWORD,HANDLE,PWSTR*); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); @@ -92,15 +109,6 @@ BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); BOOL WINAPI SignalFileOpen(PCIDLIST_ABSOLUTE); BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); -#define KF_FLAG_SIMPLE_IDLIST 0x00000100 -#define KF_FLAG_NOT_PARENT_RELATIVE 0x00000200 -#define KF_FLAG_DEFAULT_PATH 0x00000400 -#define KF_FLAG_INIT 0x00000800 -#define KF_FLAG_NO_ALIAS 0x00001000 -#define KF_FLAG_DONT_UNEXPAND 0x00002000 -#define KF_FLAG_DONT_VERIFY 0x00004000 -#define KF_FLAG_CREATE 0x00008000 - #define SHFMT_ERROR __MSABI_LONG(0xFFFFFFFF) /* Error on last format, drive may be formattable */ #define SHFMT_CANCEL __MSABI_LONG(0xFFFFFFFE) /* Last format was cancelled */ #define SHFMT_NOFORMAT __MSABI_LONG(0xFFFFFFFD) /* Drive is not formattable */

1 0

Nikolay Sivov : kernel32: Implement GetDynamicTimeZoneInformation().
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 2c98d5b90cf4d1026a80a3279c8bae65cfca539c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c98d5b90cf4d1026a80a3279… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 17:34:10 2015 +0300 kernel32: Implement GetDynamicTimeZoneInformation(). --- dlls/kernel32/tests/time.c | 30 ++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 14 ++++++++++---- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/time.c | 39 +++++++++++++++++++++++++++++++-------- include/winternl.h | 14 ++++++++++++++ 5 files changed, 86 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c98d5b90cf4d1026a80a…

1 0

Nikolay Sivov : kernel32: Fixed couple of comments regarding atom calls.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: dde69d617bb6a9665dbf9f752c0baf7e57d26629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde69d617bb6a9665dbf9f752… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 18:05:02 2015 +0300 kernel32: Fixed couple of comments regarding atom calls. --- dlls/kernel32/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index 5ab5c06..9682fb4 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -67,7 +67,7 @@ static RTL_ATOM_TABLE get_local_table(DWORD entries) /*********************************************************************** * InitAtomTable (KERNEL32.@) * - * Initialise the global atom table. + * Initialise local atom table. * * PARAMS * entries [I] The number of entries to reserve in the table. @@ -142,7 +142,7 @@ ATOM WINAPI GlobalAddAtomA( LPCSTR str /* [in] String to add */ ) /*********************************************************************** * AddAtomA (KERNEL32.@) * - * Add a character string to the global atom table and return a unique + * Add a character string to local atom table and return a unique * value identifying it. * * RETURNS

1 0

Martin Storsjo : advapi32: Add a stub implementation of EventSetInformation.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 518e102a7ed96274a67082d01b15d0e036d0f7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518e102a7ed96274a67082d01… Author: Martin Storsjo <martin(a)martin.st> Date: Sat May 9 09:06:11 2015 +0300 advapi32: Add a stub implementation of EventSetInformation. --- dlls/advapi32/advapi32.spec | 1 + dlls/advapi32/eventlog.c | 10 ++++++++++ .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- include/evntprov.h | 9 +++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e7b7cf7..e885684 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -273,6 +273,7 @@ @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) +@ stdcall EventSetInformation(int64 long ptr long) @ stdcall EventUnregister(int64) @ stdcall EventWrite(int64 ptr long ptr) # @ stub EventWriteEndScenario diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 191d817..7839fc4 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -939,6 +939,16 @@ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG } /****************************************************************************** + * EventSetInformation [ADVAPI32.@] + */ +ULONG WINAPI EventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, PVOID info, + ULONG length ) +{ + FIXME("%u, %p, %u\n", class, info, length); + return ERROR_SUCCESS; +} + +/****************************************************************************** * QueryTraceW [ADVAPI32.@] */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index a498097..82c6e69 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister -@ stub EventSetInformation +@ stdcall EventSetInformation(int64 long ptr long) advapi32.EventSetInformation @ stdcall EventUnregister(int64) advapi32.EventUnregister @ stdcall EventWrite(int64 ptr long ptr) advapi32.EventWrite @ stub EventWriteEx diff --git a/include/evntprov.h b/include/evntprov.h index 6a3e2f3..7f086b9 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -59,9 +59,18 @@ typedef struct _EVENT_FILTER_DESCRIPTOR typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PEVENT_FILTER_DESCRIPTOR,PVOID); +typedef enum _EVENT_INFO_CLASS +{ + EventProviderBinaryTrackInfo = 0, + EventProviderSetTraits, + EventProviderUseDescriptorType, + MaxEventInfo +} EVENT_INFO_CLASS; + BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); BOOLEAN WINAPI EventProviderEnabled(REGHANDLE, UCHAR, ULONGLONG); ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); +ULONG WINAPI EventSetInformation(REGHANDLE, EVENT_INFO_CLASS, PVOID, ULONG); ULONG WINAPI EventUnregister(REGHANDLE); ULONG WINAPI EventWrite(REGHANDLE,PCEVENT_DESCRIPTOR,ULONG,PEVENT_DATA_DESCRIPTOR);

1 0

Andrew Eikum : dsound: Don't set very low limits on HW buffers.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: ff25b25a494aef6d55679dfaefd63d63fe0cf5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff25b25a494aef6d55679dfae… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 8 11:18:12 2015 -0500 dsound: Don't set very low limits on HW buffers. --- dlls/dsound/dsound.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index f77d2ea..7b93455 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -375,8 +375,8 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; device->drvcaps.dwMaxHwMixingAllBuffers = 16; - device->drvcaps.dwMaxHwMixingStaticBuffers = 1; - device->drvcaps.dwMaxHwMixingStreamingBuffers = 1; + device->drvcaps.dwMaxHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; + device->drvcaps.dwMaxHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers; device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers; @@ -814,14 +814,8 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds dscaps->dwMaxHwMixingStaticBuffers = This->device->drvcaps.dwMaxHwMixingStaticBuffers; dscaps->dwMaxHwMixingStreamingBuffers = This->device->drvcaps.dwMaxHwMixingStreamingBuffers; dscaps->dwFreeHwMixingAllBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; - - if (This->device->drvcaps.dwFreeHwMixingAllBuffers > 0) { - dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers; - dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers; - } else { - dscaps->dwFreeHwMixingStaticBuffers = 0; - dscaps->dwFreeHwMixingStreamingBuffers = 0; - } + dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; + dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; dscaps->dwMaxHw3DAllBuffers = This->device->drvcaps.dwMaxHw3DAllBuffers; dscaps->dwMaxHw3DStaticBuffers = This->device->drvcaps.dwMaxHw3DStaticBuffers;

1 0

Sebastian Lackner : server: Fix leak of async handle in pipe_server_flush.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: b3fb5992b668b51b998d8731564f87cacbf5647c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fb5992b668b51b998d87315… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 8 18:02:20 2015 +0200 server: Fix leak of async handle in pipe_server_flush. --- server/named_pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/named_pipe.c b/server/named_pipe.c index c698a87..f5e536c 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -563,6 +563,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_ if (!server->flush_poll) server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); if (blocking) handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); + release_object( async ); set_error( STATUS_PENDING ); } return handle;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
43
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 May 2015