wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Piotr Caban : msvcp90: Read last character of bool string in num_get_do_get_bool.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 12cfebb683fa71d6a0cab967620533a7e25821a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12cfebb683fa71d6a0cab9676… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:27 2014 +0100 msvcp90: Read last character of bool string in num_get_do_get_bool. --- dlls/msvcp60/locale.c | 12 ++++++++---- dlls/msvcp90/locale.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index a2ce279..6b95521 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -4828,8 +4828,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, pfalse = basic_string_wchar_c_str(&false_bstr); ptrue = basic_string_wchar_c_str(&true_bstr); - for(istreambuf_iterator_wchar_val(&first); first.strbuf; - istreambuf_iterator_wchar_inc(&first)) { + for(istreambuf_iterator_wchar_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -4845,6 +4844,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_wchar_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } @@ -5608,8 +5610,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi pfalse = basic_string_char_c_str(&false_bstr); ptrue = basic_string_char_c_str(&true_bstr); - for(istreambuf_iterator_char_val(&first); first.strbuf; - istreambuf_iterator_char_inc(&first)) { + for(istreambuf_iterator_char_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -5625,6 +5626,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_char_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 02ccb0e..2cdd002 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5850,8 +5850,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, pfalse = MSVCP_basic_string_wchar_c_str(&false_bstr); ptrue = MSVCP_basic_string_wchar_c_str(&true_bstr); - for(istreambuf_iterator_wchar_val(&first); first.strbuf; - istreambuf_iterator_wchar_inc(&first)) { + for(istreambuf_iterator_wchar_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -5867,6 +5866,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_wchar_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } @@ -6823,8 +6825,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi pfalse = MSVCP_basic_string_char_c_str(&false_bstr); ptrue = MSVCP_basic_string_char_c_str(&true_bstr); - for(istreambuf_iterator_char_val(&first); first.strbuf; - istreambuf_iterator_char_inc(&first)) { + for(istreambuf_iterator_char_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -6840,6 +6841,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_char_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; }

1 0

Piotr Caban : msvcp90: Fix basic_istream<wchar>::read implementation.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 75bcbece56e5158f19c1f9d0dfee50102417bc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bcbece56e5158f19c1f9d0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:13 2014 +0100 msvcp90: Fix basic_istream<wchar>::read implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 693c376..a853f6d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7156,7 +7156,7 @@ static basic_istream_char* basic_istream_char__Read_s(basic_istream_char *this, DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHPADIH@Z */ @@ -8397,7 +8397,7 @@ static basic_istream_wchar* basic_istream_wchar__Read_s(basic_istream_wchar *thi DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEHPA_WIH@Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a89352e..c4ef9a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8111,7 +8111,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) #endif basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHPADIH@Z */ @@ -9418,7 +9418,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) #endif basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream@_WU?$char_traits@_W@std@@@std@@QAEHPA_WIH@Z */

1 0

Jacek Caban : atl90: Share atl_ax.c with atl100.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 1a130126053105d9022f7a83fc95587bdb415ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a130126053105d9022f7a83f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 20 14:46:56 2014 +0100 atl90: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 17 ++++++++++++---- dlls/atl90/Makefile.in | 7 +++++-- dlls/atl90/atl90.c | 53 ------------------------------------------------ dlls/atl90/atl90.spec | 18 ++++++++-------- 4 files changed, 27 insertions(+), 68 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 50ebe3b..0f0f3c6 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -86,8 +86,17 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; - const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; - const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; + +#if _ATL_VER == _ATL_VER_90 +#define ATL_NAME_SUFFIX '9','0',0 +#elif _ATL_VER == _ATL_VER_100 +#define ATL_NAME_SUFFIX '1','0','0',0 +#else +#error Unsupported version +#endif + + const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -106,11 +115,11 @@ BOOL WINAPI AtlAxWinInit(void) wcex.hIconSm = 0; wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin100; + wcex.lpszClassName = AtlAxWinW; if ( !RegisterClassExW( &wcex ) ) return FALSE; - wcex.lpszClassName = AtlAxWinLic100; + wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) ) return FALSE; diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index f52b7d5..677aaae 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,7 +1,10 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 +IMPORTS = atl100 oleaut32 user32 ole32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 +PARENTSRC = ../atl100 -C_SRCS = atl90.c +C_SRCS = \ + atl90.c \ + atl_ax.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c index 06e8066..9dd0b70 100644 --- a/dlls/atl90/atl90.c +++ b/dlls/atl90/atl90.c @@ -40,56 +40,3 @@ DWORD WINAPI AtlGetVersion(void *reserved) TRACE("version %04x (%p)\n", _ATL_VER, reserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - if ( msg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hwnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hwnd, ptr, len ); - AtlAxCreateControlEx( ptr, hwnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hwnd, msg, wparam, lparam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin90[] = {'A','t','l','A','x','W','i','n','9','0',0}; - const WCHAR AtlAxWinLic90[] = {'A','t','l','A','x','W','i','n','L','i','c','9','0',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 045969e..35facf8 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -18,20 +18,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::CreateFolder.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: d6f6b6b798c51119f91a815b8720033ae3e99a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f6b6b798c51119f91a815b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:07:46 2014 +0900 taskschd: Implement ITaskFolder::CreateFolder. --- dlls/taskschd/folder.c | 72 ++++++++++++++++++++++++++++++++------ dlls/taskschd/task.c | 2 +- dlls/taskschd/taskschd_private.h | 2 +- dlls/taskschd/tests/scheduler.c | 15 ++------ 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6871138..4eb7b8a 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -134,6 +134,30 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return S_OK; } +static HRESULT reg_create_folder(const WCHAR *path, HKEY *hfolder) +{ + HKEY hroot; + DWORD ret, disposition; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegCreateKeyExW(hroot, path, 0, NULL, 0, KEY_ALL_ACCESS, NULL, hfolder, &disposition); + if (ret == ERROR_FILE_NOT_FOUND) + ret = ERROR_PATH_NOT_FOUND; + + if (ret == ERROR_SUCCESS && disposition == REG_OPENED_EXISTING_KEY) + { + RegCloseKey(*hfolder); + ret = ERROR_ALREADY_EXISTS; + } + + RegCloseKey(hroot); + + return HRESULT_FROM_WIN32(ret); +} + static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) { HKEY hroot; @@ -203,7 +227,7 @@ static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskF if (!path) return E_INVALIDARG; if (!new_folder) return E_POINTER; - return TaskFolder_create(folder->path, path, new_folder); + return TaskFolder_create(folder->path, path, new_folder, FALSE); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders) @@ -212,10 +236,32 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas return E_NOTIMPL; } -static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR name, VARIANT sddl, ITaskFolder **folder) +static inline BOOL is_variant_null(const VARIANT *var) { - FIXME("%p,%s,%s,%p: stub\n", iface, debugstr_w(name), debugstr_variant(&sddl), folder); - return E_NOTIMPL; + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL || + (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); +} + +static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR path, VARIANT sddl, ITaskFolder **new_folder) +{ + TaskFolder *folder = impl_from_ITaskFolder(iface); + ITaskFolder *tmp_folder = NULL; + HRESULT hr; + + TRACE("%p,%s,%s,%p\n", iface, debugstr_w(path), debugstr_variant(&sddl), folder); + + if (!path) return E_INVALIDARG; + + if (!new_folder) new_folder = &tmp_folder; + + if (!is_variant_null(&sddl)) + FIXME("security descriptor %s is ignored\n", debugstr_variant(&sddl)); + + hr = TaskFolder_create(folder->path, path, new_folder, TRUE); + if (tmp_folder) + ITaskFolder_Release(tmp_folder); + + return hr; } static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) @@ -302,7 +348,7 @@ static const ITaskFolderVtbl TaskFolder_vtbl = TaskFolder_SetSecurityDescriptor }; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) { static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; @@ -328,17 +374,21 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (parent) strcpyW(folder_path, parent); - len = strlenW(folder_path); - if (!len || folder_path[len - 1] != '\\') - strcatW(folder_path, bslash); - - if (path) + if (path && *path) { + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + while (*path == '\\') path++; strcatW(folder_path, path); } - hr = reg_open_folder(folder_path, &hfolder); + len = strlenW(folder_path); + if (!len) + strcatW(folder_path, bslash); + + hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) { HeapFree(GetProcessHeap(), 0, folder_path); diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 632cabb..a13a968 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -117,7 +117,7 @@ static HRESULT WINAPI TaskService_GetFolder(ITaskService *iface, BSTR path, ITas if (!folder) return E_POINTER; - return TaskFolder_create(path, NULL, folder); + return TaskFolder_create(path, NULL, folder, FALSE); } static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flags, IRunningTaskCollection **tasks) diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index deebc41..4ef348f 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -17,6 +17,6 @@ */ HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) DECLSPEC_HIDDEN; +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a976de2..61e4a04 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -185,7 +185,6 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); /* Just in case something was left from previous runs */ @@ -205,20 +204,14 @@ todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); -todo_wine ok(hr == S_OK, "CreateFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskFolder_Release(folder); - ITaskService_Release(service); - return; - } ITaskFolder_Release(subfolder); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); @@ -239,11 +232,6 @@ todo_wine hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); ok(hr == S_OK, "GetFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskService_Release(service); - return; - } hr = ITaskFolder_get_Name(subfolder, &bstr); ok (hr == S_OK, "get_Name error %#x\n", hr); @@ -303,6 +291,7 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::GetFolder.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: efced588616da1ac8153b3d7da40a3dd6dd14bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efced588616da1ac8153b3d7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:06:28 2014 +0900 taskschd: Implement ITaskFolder::GetFolder. --- dlls/taskschd/folder.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6d69002..6871138 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -194,10 +194,16 @@ static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) return S_OK; } -static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **folder) +static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **new_folder) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(path), folder); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%s,%p\n", iface, debugstr_w(path), folder); + + if (!path) return E_INVALIDARG; + if (!new_folder) return E_POINTER; + + return TaskFolder_create(folder->path, path, new_folder); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders)

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::get_Name.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: a4c4574bd403624c4b8d5c159a9d299deeff309c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c4574bd403624c4b8d5c159… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:05:50 2014 +0900 taskschd: Implement ITaskFolder::get_Name. --- dlls/taskschd/folder.c | 19 +++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 5 ----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 9114417..6d69002 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -115,8 +115,23 @@ static HRESULT WINAPI TaskFolder_Invoke(ITaskFolder *iface, DISPID dispid, REFII static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) { - FIXME("%p,%p: stub\n", iface, name); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + const WCHAR *p_name; + + TRACE("%p,%p\n", iface, name); + + if (!name) return E_POINTER; + + p_name = strrchrW(folder->path, '\\'); + if (!p_name) + p_name = folder->path; + else + if (p_name[1] != 0) p_name++; + + *name = SysAllocString(p_name); + if (!*name) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 32c8f71..a976de2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -169,17 +169,12 @@ todo_wine ok(hr == S_OK, "GetFolder error %#x\n", hr); hr = ITaskFolder_get_Name(folder, NULL); -todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); hr = ITaskFolder_get_Name(folder, &bstr); -todo_wine ok (hr == S_OK, "get_Name error %#x\n", hr); -if (hr == S_OK) -{ ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); -} hr = ITaskFolder_get_Path(folder, NULL); ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr);

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::DeleteFolder.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 3003ee9ba1a395a3da20d54efb6641759d942635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3003ee9ba1a395a3da20d54ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:04:58 2014 +0900 taskschd: Implement ITaskFolder::DeleteFolder. --- dlls/taskschd/folder.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index cb285fd..9114417 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -137,6 +137,29 @@ static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) return HRESULT_FROM_WIN32(ret); } +static HRESULT reg_delete_folder(const WCHAR *path, const WCHAR *name) +{ + HKEY hroot, hfolder; + DWORD ret; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegOpenKeyExW(hroot, path, 0, DELETE, &hfolder); + + RegCloseKey(hroot); + + while (*name == '\\') name++; + if (ret == ERROR_SUCCESS) + { + ret = RegDeleteKeyW(hfolder, name); + RegCloseKey(hfolder); + } + + return HRESULT_FROM_WIN32(ret); +} + static inline void reg_close_folder(HKEY hfolder) { RegCloseKey(hfolder); @@ -176,8 +199,14 @@ static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR name, VAR static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) { - FIXME("%p,%s,%x: stub\n", iface, debugstr_w(name), flags); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + + if (flags) + FIXME("unsupported flags %x\n", flags); + + return reg_delete_folder(folder->path, name); } static HRESULT WINAPI TaskFolder_GetTask(ITaskFolder *iface, BSTR path, IRegisteredTask **task)

1 0

Dmitry Timoshkov : taskschd: Make GetFolder check whether task folder tree exists in the registry.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 630354f6df619f3833db083242370fd6358f5607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630354f6df619f3833db08324… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:04:16 2014 +0900 taskschd: Make GetFolder check whether task folder tree exists in the registry. --- dlls/taskschd/Makefile.in | 2 +- dlls/taskschd/folder.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/taskschd/tests/scheduler.c | 1 - 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 80775c7..fa4beba 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,5 +1,5 @@ MODULE = taskschd.dll -IMPORTS = oleaut32 +IMPORTS = advapi32 oleaut32 C_SRCS = \ folder.c \ diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index c19aa4e..cb285fd 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "objbase.h" #include "taskschd.h" #include "taskschd_private.h" @@ -31,6 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); +static const char root[] = "Software\\Microsoft\\Windows NT\\CurrentVersion\\Schedule\\TaskCache\\Tree"; + typedef struct { ITaskFolder ITaskFolder_iface; @@ -116,6 +119,29 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return E_NOTIMPL; } +static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) +{ + HKEY hroot; + DWORD ret; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegOpenKeyExW(hroot, path, 0, KEY_ALL_ACCESS, hfolder); + if (ret == ERROR_FILE_NOT_FOUND) + ret = ERROR_PATH_NOT_FOUND; + + RegCloseKey(hroot); + + return HRESULT_FROM_WIN32(ret); +} + +static inline void reg_close_folder(HKEY hfolder) +{ + RegCloseKey(hfolder); +} + static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) { TaskFolder *folder = impl_from_ITaskFolder(iface); @@ -232,6 +258,8 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** TaskFolder *folder; WCHAR *folder_path; int len = 0; + HRESULT hr; + HKEY hfolder; if (path) { @@ -260,6 +288,15 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** strcatW(folder_path, path); } + hr = reg_open_folder(folder_path, &hfolder); + if (hr) + { + HeapFree(GetProcessHeap(), 0, folder_path); + return hr; + } + + reg_close_folder(hfolder); + folder = HeapAlloc(GetProcessHeap(), 0, sizeof(*folder)); if (!folder) { diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 38d60a4..32c8f71 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -203,7 +203,6 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder);

1 0

Volkan Gezer : Update Turkish news to version 1.7.11
by Jeremy Newman 20 Jan '14

20 Jan '14

Module: website Branch: master Commit: b575bec82160fc3b7f417575cf28b0b0fe30e262 URL: http://source.winehq.org/git/website.git/?a=commit;h=b575bec82160fc3b7f4175… Author: Volkan Gezer <vlkngzr(a)gmail.com> Date: Mon Jan 20 18:21:29 2014 +0100 Update Turkish news to version 1.7.11 --- news/tr/2013122001.xml | 15 +++++++++++++++ news/tr/2014010301.xml | 17 +++++++++++++++++ news/tr/2014011001.xml | 13 +++++++++++++ news/tr/2014011701.xml | 17 +++++++++++++++++ 4 files changed, 62 insertions(+) diff --git a/news/tr/2013122001.xml b/news/tr/2013122001.xml new file mode 100644 index 0000000..1922feb --- /dev/null +++ b/news/tr/2013122001.xml @@ -0,0 +1,15 @@ +<news> + <date>20 Aralık 2013</date> + <title>Wine 1.7.9 Yayınlandı</title> + <body> + Wine geliştirme sürümü 1.7.9 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.9">yenilikler</a>: +<ul> + <li>Mac sürücüsündeki pencere taşıma/boyutlandırma iyileştirmesi.</li> + <li>Bazı DirectDraw palet onarımları.</li> + <li>C++ çalışma zamanı sürümleri arasındaki kod yinelenmesi azaltıldı.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.9.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news> diff --git a/news/tr/2014010301.xml b/news/tr/2014010301.xml new file mode 100644 index 0000000..4f53eb6 --- /dev/null +++ b/news/tr/2014010301.xml @@ -0,0 +1,17 @@ +<news> + <date>3 Ocak 2014</date> + <title>Wine 1.7.10 Yayınlandı</title> + <body> + Wine geliştirme sürümü 1.7.10 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.10">yenilikler</a>: +<ul> + <li>Mac sürüsücünde pencere ekranı kaplaması.</li> + <li>AVI sıkıştırma desteği.</li> + <li>Dinamik olarak yüklü kütüphanelerde yerel iş parçacığı depolama desteği.</li> + <li>Görev Zamanlayıcı geliştirmesi başlangıcı.</li> + <li>İyileştirilmiş IPX protokol desteği.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news> diff --git a/news/tr/2014011001.xml b/news/tr/2014011001.xml new file mode 100644 index 0000000..65b62cb --- /dev/null +++ b/news/tr/2014011001.xml @@ -0,0 +1,13 @@ +<news> + <date>10 Ocak 2014</date> + <title>Wine 1.6.2 Yayınlandı</title> + <body> + Wine bakım sürümü 1.6.2 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.6.2">yenilikler</a>: +<ul> + <li>Renk yönetim desteği liblcms sürüm 2'ye yükseltildi.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news> diff --git a/news/tr/2014011701.xml b/news/tr/2014011701.xml new file mode 100644 index 0000000..06eeaaf --- /dev/null +++ b/news/tr/2014011701.xml @@ -0,0 +1,17 @@ +<news> + <date>17 Ocak 2014</date> + <title>Wine 1.7.11 Yayınlandı</title> + <body> + Wine geliştirme sürümü 1.7.11 artık kullanılabilir. + Bu sürümdeki <a href="{$root}/announce/1.7.11">yenilikler</a>: +<ul> + <li>RichEdit denetiminde unikod desteği.</li> + <li>Koşul değişkenleri ve Slim Okuyucu/Yazıcı kilitleri için destek.</li> + <li>Daha fazla D3D komut akış hazırlık çalışması.</li> + <li>Masaüstü kipinde isteğe bağlı Başlat Menüsü.</li> + <li>Dikey yazı tipi ölçütleri için iyileştirilmiş destek.</li> + <li>Çeşitli hata onarımları.</li> +</ul> +Kaynak dosyaları <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.11.tar.bz2">artık indirilebilir</a>. + İnşa sürecindeki ikili paketler kısa zaman içinde <a href="{$root}/download">indirme</a> konumunda yerini alacaktır. + </body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.7.10
by Jeremy Newman 20 Jan '14

20 Jan '14

Module: website Branch: master Commit: b54baa130129ab04a326aef462fa2235c68f3571 URL: http://source.winehq.org/git/website.git/?a=commit;h=b54baa130129ab04a326ae… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Jan 20 11:49:56 2014 -0200 Portuguese translation for release 1.7.10 --- news/pt/2014010301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pt/2014010301.xml b/news/pt/2014010301.xml new file mode 100644 index 0000000..a3ac466 --- /dev/null +++ b/news/pt/2014010301.xml @@ -0,0 +1,16 @@ +<news> +<date>3 de Janeiro de 2014</date> +<title>Wine 1.7.10 lançado</title> +<body> + A versão de desenvolvimento 1.7.10 já está disponível agora. + <a href="{$root}/announce/1.7.10">Novidades</a> desta versão: +<ul> + <li>Maximização de janelas no driver de Mac.</li> + <li>Implementação de um compressor AVI.</li> + <li>Armazenamento local a threads em bibliotecas carregadas dinamicamente.</li> + <li>Começo da implementação de um Gerenciador de Tarefas.</li> + <li>Suporte ao protocolo IPX estendido.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.10.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
82
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 January 2014