August 2019 - Wine-Commits - list.winehq.org

Zebediah Figura : d3dcompiler: Get rid of the superfluous "variable" rule.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: f9f1e99099a03fff4e29991f8aebf2b84f2bcc99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f1e99099a03fff4e29991f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 9 09:52:44 2019 -0500 d3dcompiler: Get rid of the superfluous "variable" rule. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 4ece669..ba0fd5c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -913,7 +913,6 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr BOOL boolval; char *name; DWORD modifiers; - struct hlsl_ir_var *var; struct hlsl_ir_node *instr; struct list *list; struct parse_function function; @@ -1049,7 +1048,6 @@ static const struct hlsl_ir_function_decl *get_overloaded_func(struct wine_rb_tr %type <list> parameters %type <list> param_list %type <instr> expr -%type <var> variable %type <intval> array %type <list> statement %type <list> statement_list @@ -1910,10 +1908,19 @@ primary_expr: C_FLOAT c->v.value.b[0] = $1; $$ = &c->node; } - | variable + | VAR_IDENTIFIER { - struct hlsl_ir_deref *deref = new_var_deref($1); - if (deref) + struct hlsl_ir_deref *deref; + struct hlsl_ir_var *var; + + if (!(var = get_variable(hlsl_ctx.cur_scope, $1))) + { + hlsl_message("Line %d: variable '%s' not declared\n", + hlsl_ctx.line_no, $1); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ((deref = new_var_deref(var))) { $$ = &deref->node; set_location(&$$->loc, &@1); @@ -1926,20 +1933,6 @@ primary_expr: C_FLOAT $$ = $2; } -variable: VAR_IDENTIFIER - { - struct hlsl_ir_var *var; - var = get_variable(hlsl_ctx.cur_scope, $1); - if (!var) - { - hlsl_message("Line %d: variable '%s' not declared\n", - hlsl_ctx.line_no, $1); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); - return 1; - } - $$ = var; - } - postfix_expr: primary_expr { $$ = $1;

1 0

Andrew Eikum : hid: Fix looking up report in HidP_GetValueCaps.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 6563166142b60f5857e4341f926e9cff7cc4cec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6563166142b60f5857e4341f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Aug 9 11:50:56 2019 -0500 hid: Fix looking up report in HidP_GetValueCaps. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8f4a474..59a4078 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -450,8 +450,8 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS { for (i = 0; i < report[j].elementCount && u < v_count; i++) { - if (elems[report->elementIdx + i].ElementType == ValueElement) - ValueCaps[u++] = elems[report->elementIdx + i].caps.value; + if (elems[report[j].elementIdx + i].ElementType == ValueElement) + ValueCaps[u++] = elems[report[j].elementIdx + i].caps.value; } }

1 0

Alex Henrie : ntoskrnl: Add stub for SeLocateProcessImageName.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: f04e7d2650ffc5258989672f385ac86bce04d4ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f04e7d2650ffc5258989672f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 7 21:42:41 2019 -0600 ntoskrnl: Add stub for SeLocateProcessImageName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47601 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8eb0f2d..95b09ab 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3801,6 +3801,16 @@ BOOLEAN WINAPI SePrivilegeCheck(PRIVILEGE_SET *privileges, SECURITY_SUBJECT_CONT } /********************************************************************* + * SeLocateProcessImageName (NTOSKRNL.@) + */ +NTSTATUS WINAPI SeLocateProcessImageName(PEPROCESS process, UNICODE_STRING **image_name) +{ + FIXME("stub: %p %p\n", process, image_name); + if (image_name) *image_name = NULL; + return STATUS_NOT_IMPLEMENTED; +} + +/********************************************************************* * KeFlushQueuedDpcs (NTOSKRNL.@) */ void WINAPI KeFlushQueuedDpcs(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 79cf50b..d84129a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1257,6 +1257,7 @@ @ stub SeFreePrivileges @ stub SeImpersonateClient @ stub SeImpersonateClientEx +@ stdcall SeLocateProcessImageName(ptr ptr) @ stub SeLockSubjectContext @ stub SeMarkLogonSessionForTerminationNotification @ stub SeOpenObjectAuditAlarm

1 0

Nikolay Sivov : kernel32/tests: Add some tests for setting file times.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 70189853e2f0284cfd185069e4f5ead4ba0fa1ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=70189853e2f0284cfd185069… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 9 09:50:32 2019 +0300 kernel32/tests: Add some tests for setting file times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 63a67ca..a2511be 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5065,6 +5065,17 @@ todo_wine ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); ok(atime.QuadPart + 1 == basicinfo.LastAccessTime.QuadPart, "Unexpected access time.\n"); + memset(&basicinfo, 0, sizeof(basicinfo)); + basicinfo.LastAccessTime.QuadPart = -1; + ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); +todo_wine + ok(ret, "Failed to set basic info, error %d.\n", GetLastError()); + + memset(&basicinfo, 0, sizeof(basicinfo)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); + ok(atime.QuadPart + 1 == basicinfo.LastAccessTime.QuadPart, "Unexpected access time.\n"); + dispinfo.DeleteFile = TRUE; ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); ok(ret, "setting FileDispositionInfo failed, error %d\n", GetLastError()); @@ -5357,6 +5368,50 @@ static void test_find_file_stream(void) ok(error == ERROR_HANDLE_EOF, "Expected ERROR_HANDLE_EOF, got %d\n", error); } +static void test_SetFileTime(void) +{ + static const WCHAR prefix[] = {'p','f','x',0}; + WCHAR path[MAX_PATH], temp_path[MAX_PATH]; + FILETIME ft1, ft2; + DWORD ret, len; + HANDLE hfile; + + ret = GetTempPathW(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameW(temp_path, prefix, 0, path); + ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError()); + + hfile = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file\n"); + ret = WriteFile(hfile, prefix, sizeof(prefix), &len, NULL ); + ok(ret && len == sizeof(prefix), "WriteFile error %d\n", GetLastError()); + ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n"); + + ret = GetFileTime(hfile, NULL, NULL, &ft1); + ok(ret, "GetFileTime error %d\n", GetLastError()); + ft2 = ft1; + ft2.dwLowDateTime -= 600000000; /* 60 second */ + ret = SetFileTime(hfile, NULL, NULL, &ft2); + ok(ret, "SetFileTime error %d\n", GetLastError()); + memset(&ft2, 0, sizeof(ft2)); + ret = GetFileTime(hfile, NULL, NULL, &ft2); /* get the actual time back */ + ok(ret, "GetFileTime error %d\n", GetLastError()); + ok(memcmp(&ft1, &ft2, sizeof(ft1)), "Unexpected write time.\n"); + + memset(&ft1, 0xff, sizeof(ft1)); + ret = SetFileTime(hfile, NULL, NULL, &ft1); +todo_wine + ok(ret, "SetFileTime error %d\n", GetLastError()); + memset(&ft1, 0, sizeof(ft1)); + ret = GetFileTime(hfile, NULL, NULL, &ft1); /* get the actual time back */ + ok(ret, "GetFileTime error %d\n", GetLastError()); + ok(!memcmp(&ft1, &ft2, sizeof(ft1)), "Unexpected write time.\n"); + + CloseHandle(hfile); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5429,4 +5484,5 @@ START_TEST(file) test_overlapped_read(); test_file_readonly_access(); test_find_file_stream(); + test_SetFileTime(); }

1 0

Dridi Boukelmoune : powrprof: Add PowerReadFriendlyName() stub.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 0fca739770492ad94f687a9c5d51879b3aa5ef6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fca739770492ad94f687a9c… Author: Dridi Boukelmoune <dridi.boukelmoune(a)gmail.com> Date: Tue Aug 6 23:22:54 2019 +0200 powrprof: Add PowerReadFriendlyName() stub. Signed-off-by: Dridi Boukelmoune <dridi.boukelmoune(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-power-setting-l1-1-0.spec | 1 + dlls/powrprof/powrprof.c | 8 ++++++++ dlls/powrprof/powrprof.spec | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec b/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec index 4aa924f..7f6fa28 100644 --- a/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec +++ b/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec @@ -1,6 +1,7 @@ @ stdcall PowerGetActiveScheme(ptr ptr) powrprof.PowerGetActiveScheme @ stub PowerReadACValue @ stdcall PowerReadDCValue(ptr ptr ptr ptr ptr ptr ptr) powrprof.PowerReadDCValue +@ stdcall PowerReadFriendlyName(ptr ptr ptr ptr ptr ptr) powrprof.PowerReadFriendlyName @ stdcall PowerSetActiveScheme(ptr ptr) powrprof.PowerSetActiveScheme @ stub PowerSettingRegisterNotification @ stub PowerSettingUnregisterNotification diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 92bab03..5f00c7b 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -315,6 +315,14 @@ DWORD WINAPI PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI PowerReadFriendlyName(HKEY RootPowerKey, const GUID *Scheme, + const GUID *SubGroup, const GUID *PowerSettings, UCHAR *Buffer, + DWORD *BufferSize) +{ + FIXME("(%p,%s,%s,%s,%p,%p) stub!\n", RootPowerKey, debugstr_guid(Scheme), debugstr_guid(SubGroup), debugstr_guid(PowerSettings), Buffer, BufferSize); + return ERROR_CALL_NOT_IMPLEMENTED; +} + POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) { FIXME("stub\n"); diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 169219a..611e03d 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -16,6 +16,7 @@ @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) +@ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr)

1 0

Nikolay Sivov : ntdll/tests: Add some tests for setting file times.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 3172b854ae1fc087d46734bdeedd00754b50961c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3172b854ae1fc087d46734bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 9 09:50:33 2019 +0300 ntdll/tests: Add some tests for setting file times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8e54dbb..63854b5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1313,8 +1313,8 @@ static void test_file_full_size_information(void) static void test_file_basic_information(void) { + FILE_BASIC_INFORMATION fbi, fbi2; IO_STATUS_BLOCK io; - FILE_BASIC_INFORMATION fbi; HANDLE h; int res; int attrib_mask = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NORMAL; @@ -1328,6 +1328,30 @@ static void test_file_basic_information(void) ok ( (fbi.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE, "attribute %x not expected\n", fbi.FileAttributes ); + memset(&fbi2, 0, sizeof(fbi2)); + fbi2.LastWriteTime.QuadPart = -1; + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); +todo_wine { + ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); +} + memset(&fbi2, 0, sizeof(fbi2)); + res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); + ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "unexpected write time.\n"); + + memset(&fbi2, 0, sizeof(fbi2)); + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + + memset(&fbi2, 0, sizeof(fbi2)); + res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); + ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "unexpected write time.\n"); + /* Then SYSTEM */ /* Clear fbi to avoid setting times */ memset(&fbi, 0, sizeof(fbi));

1 0

Alex Henrie : ntoskrnl: Add stub for SePrivilegeCheck.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 558d7fd1b21135dab0b91a80c236c73c3a803ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=558d7fd1b21135dab0b91a80… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 7 21:42:40 2019 -0600 ntoskrnl: Add stub for SePrivilegeCheck. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47601 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ccc5fce..8eb0f2d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3792,6 +3792,15 @@ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) } /********************************************************************* + * SePrivilegeCheck (NTOSKRNL.@) + */ +BOOLEAN WINAPI SePrivilegeCheck(PRIVILEGE_SET *privileges, SECURITY_SUBJECT_CONTEXT *context, KPROCESSOR_MODE mode) +{ + FIXME("stub: %p %p %u\n", privileges, context, mode); + return TRUE; +} + +/********************************************************************* * KeFlushQueuedDpcs (NTOSKRNL.@) */ void WINAPI KeFlushQueuedDpcs(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a3704a5..79cf50b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1261,7 +1261,7 @@ @ stub SeMarkLogonSessionForTerminationNotification @ stub SeOpenObjectAuditAlarm @ stub SeOpenObjectForDeleteAuditAlarm -@ stub SePrivilegeCheck +@ stdcall SePrivilegeCheck(ptr ptr long) @ stub SePrivilegeObjectAuditAlarm @ stub SePublicDefaultDacl @ stub SeQueryAuthenticationIdToken

1 0

Nikolay Sivov : ntdll: Ignore -1 time value same as 0 when setting file times.
by Alexandre Julliard Aug. 9, 2019

Aug. 9, 2019

Module: wine Branch: master Commit: 2a15f77b497cadcef8f984bf678e2766c7a67cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a15f77b497cadcef8f984bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 9 09:50:34 2019 +0300 ntdll: Ignore -1 time value same as 0 when setting file times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 -- dlls/ntdll/file.c | 8 ++++++-- dlls/ntdll/tests/file.c | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a2511be..9be4ecd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5068,7 +5068,6 @@ todo_wine memset(&basicinfo, 0, sizeof(basicinfo)); basicinfo.LastAccessTime.QuadPart = -1; ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); -todo_wine ok(ret, "Failed to set basic info, error %d.\n", GetLastError()); memset(&basicinfo, 0, sizeof(basicinfo)); @@ -5402,7 +5401,6 @@ static void test_SetFileTime(void) memset(&ft1, 0xff, sizeof(ft1)); ret = SetFileTime(hfile, NULL, NULL, &ft1); -todo_wine ok(ret, "SetFileTime error %d\n", GetLastError()); memset(&ft1, 0, sizeof(ft1)); ret = GetFileTime(hfile, NULL, NULL, &ft1); /* get the actual time back */ diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1cbaa1b..cd1775a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2513,12 +2513,16 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, { struct stat st; const FILE_BASIC_INFORMATION *info = ptr; + LARGE_INTEGER mtime, atime; if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return io->u.Status; - if (info->LastAccessTime.QuadPart || info->LastWriteTime.QuadPart) - io->u.Status = set_file_times( fd, &info->LastWriteTime, &info->LastAccessTime ); + mtime.QuadPart = info->LastWriteTime.QuadPart == -1 ? 0 : info->LastWriteTime.QuadPart; + atime.QuadPart = info->LastAccessTime.QuadPart == -1 ? 0 : info->LastAccessTime.QuadPart; + + if (atime.QuadPart || mtime.QuadPart) + io->u.Status = set_file_times( fd, &mtime, &atime ); if (io->u.Status == STATUS_SUCCESS && info->FileAttributes) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 63854b5..31fc7ae 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1332,10 +1332,9 @@ static void test_file_basic_information(void) fbi2.LastWriteTime.QuadPart = -1; U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); -todo_wine { ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); -} + memset(&fbi2, 0, sizeof(fbi2)); res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res);

1 0

Francois Gouget : server: A spelling and slight rewording fix in a comment.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: 826aae15a2f689e53617e5bb1d9e6647715c69db URL: https://source.winehq.org/git/wine.git/?a=commit;h=826aae15a2f689e53617e5bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:24:18 2019 +0200 server: A spelling and slight rewording fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index 94cac47..5486601 100644 --- a/server/async.c +++ b/server/async.c @@ -50,7 +50,7 @@ struct async struct iosb *iosb; /* I/O status block */ obj_handle_t wait_handle; /* pre-allocated wait handle */ unsigned int signaled :1; - unsigned int pending :1; /* request is succesfully queued, but pending */ + unsigned int pending :1; /* request successfully queued, but pending */ unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */

1 0

Francois Gouget : msvcrt: A spelling fix in a comment.
by Alexandre Julliard Aug. 8, 2019

Aug. 8, 2019

Module: wine Branch: master Commit: e49526e65225f84bd5b7fe5a7303b60222b35a61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49526e65225f84bd5b7fe5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 8 15:23:58 2019 +0200 msvcrt: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/stdint.h b/include/msvcrt/stdint.h index d228071..7ecdb23 100644 --- a/include/msvcrt/stdint.h +++ b/include/msvcrt/stdint.h @@ -177,7 +177,7 @@ typedef unsigned long long uintmax_t; /* 7.18.4.1 Macros for minimum-width integer constants - Accoding to Douglas Gwyn <gwyn(a)arl.mil>: + According to Douglas Gwyn <gwyn(a)arl.mil>: "This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC 9899:1999 as initially published, the expansion was required to be an integer constant of precisely matching type, which

1 0