wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alexandre Julliard : configure; Also disable gssapi when krb5 is disabled.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 4559c06032586f6a809db4cf06a3a2b41d1f27f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4559c06032586f6a809db4cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 09:26:23 2018 -0600 configure; Also disable gssapi when krb5 is disabled. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index 397677e..b4cfc38 100755 --- a/configure +++ b/configure @@ -13654,6 +13654,8 @@ CPPFLAGS=$ac_save_CPPFLAGS test -z "$KRB5_CFLAGS" || KRB5_CFLAGS=`echo " $KRB5_CFLAGS" | sed 's/ -I$[^/]$/ -I\$(top_builddir)\/\1/g'` test -z "$KRB5_LIBS" || KRB5_LIBS=`echo " $KRB5_LIBS" | sed 's/ -L$[^/]$/ -L\$(top_builddir)\/\1/g'` +else + with_gssapi=${with_gssapi:-no} fi if test "x$ac_cv_lib_soname_krb5" = "x"; then : case "x$with_krb5" in diff --git a/configure.ac b/configure.ac index cfc2080..702267e 100644 --- a/configure.ac +++ b/configure.ac @@ -1673,6 +1673,8 @@ then else KRB5_CFLAGS="" fi]) +else + with_gssapi=${with_gssapi:-no} fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found, Kerberos won't be supported.])

1 0

Alexandre Julliard : ntdll: Handle LOAD_LIBRARY_AS_IMAGE_RESOURCE modules when loading resources.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 7aa6dcafbb1703984ac5d858b475110444a9f9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa6dcafbb1703984ac5d858… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 09:08:10 2018 -0600 ntdll: Handle LOAD_LIBRARY_AS_IMAGE_RESOURCE modules when loading resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 7 ++----- dlls/ntdll/resource.c | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index de2cc54..7140645 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3277,11 +3277,8 @@ PVOID WINAPI RtlImageDirectoryEntryToData( HMODULE module, BOOL image, WORD dir, const IMAGE_NT_HEADERS *nt; DWORD addr; - if ((ULONG_PTR)module & 1) /* mapped as data file */ - { - module = (HMODULE)((ULONG_PTR)module & ~1); - image = FALSE; - } + if ((ULONG_PTR)module & 1) image = FALSE; /* mapped as data file */ + module = (HMODULE)((ULONG_PTR)module & ~3); if (!(nt = RtlImageNtHeader( module ))) return NULL; if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index f542677..0d5172a 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -333,12 +333,12 @@ static inline NTSTATUS access_resource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ { if (ptr) { - if (is_data_file_module(hmod)) - { - HMODULE mod = (HMODULE)((ULONG_PTR)hmod & ~1); - *ptr = RtlImageRvaToVa( RtlImageNtHeader(mod), mod, entry->OffsetToData, NULL ); - } - else *ptr = (char *)hmod + entry->OffsetToData; + BOOL is_data_file = is_data_file_module(hmod); + hmod = (HMODULE)((ULONG_PTR)hmod & ~3); + if (is_data_file) + *ptr = RtlImageRvaToVa( RtlImageNtHeader(hmod), hmod, entry->OffsetToData, NULL ); + else + *ptr = (char *)hmod + entry->OffsetToData; } if (size) *size = entry->Size; status = STATUS_SUCCESS;

1 0

Austin English : ntoskrnl.exe: Add PsSetCreateProcessNotifyRoutineEx stub.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 9566c50a1eec40b84ecaa63821d526efd0d3fe32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9566c50a1eec40b84ecaa638… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 1 16:02:38 2018 -0600 ntoskrnl.exe: Add PsSetCreateProcessNotifyRoutineEx stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/ntddk.h | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4342902..10f69ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -68,6 +68,7 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4] = { { 0 } }; typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); +typedef void (WINAPI *PCREATE_PROCESS_NOTIFY_ROUTINE_EX)(PEPROCESS,HANDLE,PPS_CREATE_NOTIFY_INFO); typedef void (WINAPI *PCREATE_THREAD_NOTIFY_ROUTINE)(HANDLE,HANDLE,BOOLEAN); static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', @@ -2389,6 +2390,16 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine( PCREATE_PROCESS_NOTIFY_ROUTINE /*********************************************************************** + * PsSetCreateProcessNotifyRoutineEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx( PCREATE_PROCESS_NOTIFY_ROUTINE_EX callback, BOOLEAN remove ) +{ + FIXME( "stub: %p %d\n", callback, remove ); + return STATUS_SUCCESS; +} + + +/*********************************************************************** * PsSetCreateThreadNotifyRoutine (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7f43704..ebf1705 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -912,6 +912,7 @@ @ stub PsRevertToSelf @ stub PsSetContextThread @ stdcall PsSetCreateProcessNotifyRoutine(ptr long) +@ stdcall PsSetCreateProcessNotifyRoutineEx(ptr long) @ stdcall PsSetCreateThreadNotifyRoutine(ptr) @ stub PsSetJobUIRestrictionsClass @ stub PsSetLegoNotifyRoutine diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 6aae257..5c124ca 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -186,6 +186,24 @@ typedef struct _RTL_AVL_TABLE { void *TableContext; } RTL_AVL_TABLE, *PRTL_AVL_TABLE; +typedef struct _PS_CREATE_NOTIFY_INFO { + SIZE_T Size; + union { + ULONG Flags; + struct { + ULONG FileOpenNameAvailable :1; + ULONG IsSubsystemProcess :1; + ULONG Reserved :30; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + HANDLE ParentProcessId; + CLIENT_ID CreatingThreadId; + struct _FILE_OBJECT *FileObject; + PCUNICODE_STRING ImageFileName; + PCUNICODE_STRING CommandLine; + NTSTATUS CreationStatus; +} PS_CREATE_NOTIFY_INFO, *PPS_CREATE_NOTIFY_INFO; + typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO);

1 0

Zhiyi Zhang : kernel32: Fix handling lines with only values in GetPrivateProfileSection.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: aa16304c191ab19a60577f02f42b904df584acaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16304c191ab19a60577f02… Author: Zhiyi Zhang <yi.gd.cn(a)gmail.com> Date: Tue Mar 6 16:13:20 2018 +0800 kernel32: Fix handling lines with only values in GetPrivateProfileSection. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 721808c..0974aaf 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -879,7 +879,7 @@ static INT PROFILE_GetSection( PROFILESECTION *section, LPCWSTR section_name, for (key = section->key; key; key = key->next) { if (len <= 2) break; - if (!*key->name) continue; /* Skip empty lines */ + if (!*key->name && !key->value) continue; /* Skip empty lines */ if (IS_ENTRY_COMMENT(key->name)) continue; /* Skip comments */ if (!return_values && !key->value) continue; /* Skip lines w.o. '=' */ PROFILE_CopyEntry( buffer, key->name, len - 1, 0 ); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 17ba124..64ffc17 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -171,7 +171,7 @@ static void test_profile_sections(void) DWORD count; char buf[100]; char *p; - static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n"; + static const char content[]="[section1]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n[section2]\r\n[section3]\r\n=val5\r\n"; static const char testfile4[]=".\\testwine4.ini"; BOOL on_win98 = FALSE; @@ -241,6 +241,19 @@ static void test_profile_sections(void) broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Existing section with no keys but has values */ + SetLastError(0xdeadbeef); + ret=GetPrivateProfileSectionA("section3", buf, sizeof(buf), testfile4); + trace("section3 return: %s\n", buf); + for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) + p[-1] = ','; + ok( ret == 6 && !strcmp( buf, "=val5"), "wrong section returned(%d): %s\n", + ret, buf); + ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); + ok( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Overflow*/ ret=GetPrivateProfileSectionA("section1", buf, 24, testfile4); for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1)

1 0

Dmitry Timoshkov : taskschd/tests: Add more tests for actions.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 2c925f2320f1b0716a7f3730b71db9317e539887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c925f2320f1b0716a7f3730… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:33:05 2018 +0800 taskschd/tests: Add more tests for actions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/tests/scheduler.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c60fd1d..80bc1c9 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1304,6 +1304,8 @@ static void test_daily_trigger(ITrigger *trigger) static void create_action(ITaskDefinition *taskdef) { static WCHAR task1_exe[] = { 't','a','s','k','1','.','e','x','e',0 }; + static WCHAR workdir[] = { 'w','o','r','k','d','i','r',0 }; + static WCHAR args[] = { 'a','r','g','u','m','e','n','s',0 }; HRESULT hr; IActionCollection *actions; IAction *action; @@ -1311,6 +1313,9 @@ static void create_action(ITaskDefinition *taskdef) TASK_ACTION_TYPE type; BSTR path; + hr = ITaskDefinition_get_Actions(taskdef, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); @@ -1325,11 +1330,17 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + hr = IExecAction_get_Path(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + path = (BSTR)0xdeadbeef; hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path == NULL, "path not set\n"); + hr = IExecAction_put_Path(exec_action, NULL); + ok(hr == S_OK, "put_Path error %#x\n", hr); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); @@ -1337,7 +1348,49 @@ static void create_action(ITaskDefinition *taskdef) hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path != NULL, "path not set\n"); - ok(!lstrcmpW(path, task1_exe), "wrong path\n" ); + ok(!lstrcmpW(path, task1_exe), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_WorkingDirectory(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path == NULL, "workdir not set\n"); + + hr = IExecAction_put_WorkingDirectory(exec_action, NULL); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + hr = IExecAction_put_WorkingDirectory(exec_action, workdir); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path != NULL, "workdir not set\n"); + ok(!lstrcmpW(path, workdir), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_Arguments(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path == NULL, "args not set\n"); + + hr = IExecAction_put_Arguments(exec_action, NULL); + ok(hr == S_OK, "put_Arguments error %#x\n", hr); + + hr = IExecAction_put_Arguments(exec_action, args); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path != NULL, "args not set\n"); + ok(!lstrcmpW(path, args), "got %s\n", wine_dbgstr_w(path)); SysFreeString(path); IExecAction_Release(exec_action);

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::get_Arguments.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 1884714569b0121bb8c7eda928211ca9d4123923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1884714569b0121bb8c7eda9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:33:02 2018 +0800 taskschd: Implement IExecAction::get_Arguments. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a4cc3be..1b6a701 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1810,8 +1810,16 @@ static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) { - FIXME("%p,%p: stub\n", iface, arguments); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, arguments); + + if (!arguments) return E_POINTER; + + if (!action->args) *arguments = NULL; + else if (!(*arguments = SysAllocString(action->args))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments)

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::put_Arguments.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: daf2d98e683a9fd2bd0410b4a0c57c5d196e2862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=daf2d98e683a9fd2bd0410b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:33:00 2018 +0800 taskschd: Implement IExecAction::put_Arguments. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 2b0283e..a4cc3be 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1678,6 +1678,7 @@ typedef struct LONG ref; WCHAR *path; WCHAR *directory; + WCHAR *args; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1701,6 +1702,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) TRACE("destroying %p\n", iface); heap_free(action->path); heap_free(action->directory); + heap_free(action->args); heap_free(action); } @@ -1814,7 +1816,15 @@ static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *argumen static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) { - FIXME("%p,%s: stub\n", iface, debugstr_w(arguments)); + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(arguments)); + + if (arguments && !(str = heap_strdupW((arguments)))) return E_OUTOFMEMORY; + heap_free(action->args); + action->args = str; + return S_OK; } @@ -1877,6 +1887,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->ref = 1; action->path = NULL; action->directory = NULL; + action->args = NULL; *obj = &action->IExecAction_iface;

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::get_WorkingDirectory.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 439a4b1ee1c5e2f3e6d505f92a84dbe63779708f URL: https://source.winehq.org/git/wine.git/?a=commit;h=439a4b1ee1c5e2f3e6d505f9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:32:58 2018 +0800 taskschd: Implement IExecAction::get_WorkingDirectory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f7ea013..2b0283e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1820,8 +1820,16 @@ static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR argument static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) { - FIXME("%p,%p: stub\n", iface, directory); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, directory); + + if (!directory) return E_POINTER; + + if (!action->directory) *directory = NULL; + else if (!(*directory = SysAllocString(action->directory))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory)

1 0

Dmitry Timoshkov : taskschd: Implement IExecAction::put_WorkingDirectory.
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 6dbee463a797b3e24bc96a2bc7e04b299036750b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbee463a797b3e24bc96a2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 6 11:32:55 2018 +0800 taskschd: Implement IExecAction::put_WorkingDirectory. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a8b819c..f7ea013 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1677,6 +1677,7 @@ typedef struct IExecAction IExecAction_iface; LONG ref; WCHAR *path; + WCHAR *directory; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1699,6 +1700,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) { TRACE("destroying %p\n", iface); heap_free(action->path); + heap_free(action->directory); heap_free(action); } @@ -1824,8 +1826,16 @@ static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR * static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) { - FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(directory)); + + if (directory && !(str = heap_strdupW((directory)))) return E_OUTOFMEMORY; + heap_free(action->directory); + action->directory = str; + + return S_OK; } static const IExecActionVtbl Action_vtbl = @@ -1858,6 +1868,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; action->path = NULL; + action->directory = NULL; *obj = &action->IExecAction_iface;

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptShape().
by Alexandre Julliard 06 Mar '18

06 Mar '18

Module: wine Branch: master Commit: 315be161ce0ae73775085c1bae6bacdbf3432349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=315be161ce0ae73775085c1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 6 10:26:30 2018 +0330 usp10: Use heap_calloc() in ScriptShape(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 411d19f..983eb83 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3333,10 +3333,10 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); - if (!charProps) return E_OUTOFMEMORY; - glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); - if (!glyphProps) + if (!(charProps = heap_calloc(cChars, sizeof(*charProps)))) + return E_OUTOFMEMORY; + + if (!(glyphProps = heap_calloc(cMaxGlyphs, sizeof(*glyphProps)))) { heap_free(charProps); return E_OUTOFMEMORY;

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
79
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 March 2018