mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Fix warnings in various patchsets
Correct the warning thats issued when GetLastError wsa used for %u, changed to use the standard %lx format.
This commit is contained in:
parent
f445af0deb
commit
15b6373d23
@ -45,7 +45,7 @@ index 5c00298d41e..d04f5645345 100644
|
||||
+
|
||||
+ status = LsaOpenPolicy( &machine, &object_attributes, POLICY_LOOKUP_NAMES, &handle);
|
||||
+ ok(status == RPC_NT_SERVER_UNAVAILABLE,
|
||||
+ "LsaOpenPolicy(POLICY_LOOKUP_NAMES) for invalid machine returned 0x%08x\n", status);
|
||||
+ "LsaOpenPolicy(POLICY_LOOKUP_NAMES) for invalid machine returned 0x%08lx\n", status);
|
||||
+
|
||||
status = LsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle);
|
||||
ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
|
||||
|
@ -39,7 +39,7 @@ index b81fb6863d3..75ee6d44a95 100644
|
||||
+ FIXME("Skinning vertices with two position elements not supported\n");
|
||||
+
|
||||
+ if ((skin->fvf & D3DFVF_POSITION_MASK) != D3DFVF_XYZ) {
|
||||
+ FIXME("Vertex type %#x not supported\n", skin->fvf & D3DFVF_POSITION_MASK);
|
||||
+ FIXME("Vertex type %#lx not supported\n", skin->fvf & D3DFVF_POSITION_MASK);
|
||||
+ return E_FAIL;
|
||||
+ }
|
||||
+
|
||||
|
@ -24,7 +24,7 @@ index 30a79368c94..fc2069c389a 100644
|
||||
+ /* System\CurrentControlSet\Control\Video should be non-volatile */
|
||||
+ ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Video\\Wine",
|
||||
+ 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL);
|
||||
+ ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %d\n", ret);
|
||||
+ ok(ret == ERROR_SUCCESS, "RegCreateKeyExA failed with error %lx\n", ret);
|
||||
+ RegDeleteKeyA(hkey1, "");
|
||||
+ RegCloseKey(hkey1);
|
||||
+
|
||||
|
@ -44,7 +44,7 @@ index af67e8d75bf..608b64a32ad 100644
|
||||
+ GetWindowsDirectoryW( path, MAX_PATH );
|
||||
+ path[2] = 0;
|
||||
+ ok( QueryDosDeviceW( path, temp, MAX_PATH ),
|
||||
+ "QueryDosDeviceW failed with error %u\n", GetLastError() );
|
||||
+ "QueryDosDeviceW failed with error %lx\n", GetLastError() );
|
||||
+ lstrcatW( temp, sepW );
|
||||
+ lstrcatW( temp, path+3 );
|
||||
+ lstrcatW( temp, sepW );
|
||||
@ -53,12 +53,12 @@ index af67e8d75bf..608b64a32ad 100644
|
||||
+ pRtlInitUnicodeString( &nameW, temp );
|
||||
+ status = pNtQueryFullAttributesFile( &attr, &info );
|
||||
+ ok( status == STATUS_SUCCESS,
|
||||
+ "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
|
||||
+ "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
|
||||
+
|
||||
+ pRtlInitUnicodeString( &nameW, systemrootExplorerW );
|
||||
+ status = pNtQueryFullAttributesFile( &attr, &info );
|
||||
+ ok( status == STATUS_SUCCESS,
|
||||
+ "query %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
|
||||
+ "query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
|
||||
}
|
||||
|
||||
static void open_file_test(void)
|
||||
|
@ -81,14 +81,14 @@ index 442ad729540..dcdac2a936a 100644
|
||||
+
|
||||
+ size1 = size2 = MAX_PATH * sizeof(WCHAR);
|
||||
+ status = pRtlQueryPackageIdentity((HANDLE)~(ULONG_PTR)3, buf1, &size1, buf2, &size2, NULL);
|
||||
+ ok(status == STATUS_NOT_FOUND, "expected STATUS_NOT_FOUND, got %08x\n", status);
|
||||
+ ok(status == STATUS_NOT_FOUND, "expected STATUS_NOT_FOUND, got %08lx\n", status);
|
||||
+
|
||||
+ CoInitializeEx(0, COINIT_APARTMENTTHREADED);
|
||||
+ hr = CoCreateInstance(&CLSID_ApplicationActivationManager, NULL, CLSCTX_LOCAL_SERVER,
|
||||
+ &IID_IApplicationActivationManager, (void **)&manager);
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ todo_wine win_skip("Failed to create ApplicationActivationManager (%x)\n", hr);
|
||||
+ todo_wine win_skip("Failed to create ApplicationActivationManager (%lx)\n", hr);
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
@ -96,28 +96,28 @@ index 442ad729540..dcdac2a936a 100644
|
||||
+ AO_NOERRORUI, &processid);
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ todo_wine win_skip("Failed to start program (%x)\n", hr);
|
||||
+ todo_wine win_skip("Failed to start program (%lx)\n", hr);
|
||||
+ IApplicationActivationManager_Release(manager);
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE, FALSE, processid);
|
||||
+ ok(process != NULL, "OpenProcess failed with %u\n", GetLastError());
|
||||
+ ok(process != NULL, "OpenProcess failed with %lx\n", GetLastError());
|
||||
+ ret = OpenProcessToken(process, TOKEN_QUERY, &token);
|
||||
+ ok(ret, "OpenProcessToken failed with error %u\n", GetLastError());
|
||||
+ ok(ret, "OpenProcessToken failed with error %lx\n", GetLastError());
|
||||
+
|
||||
+ size1 = size2 = MAX_PATH * sizeof(WCHAR);
|
||||
+ status = pRtlQueryPackageIdentity(token, buf1, &size1, buf2, &size2, NULL);
|
||||
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status);
|
||||
+
|
||||
+ ok(!memcmp(buf1, fullnameW, sizeof(fullnameW) - sizeof(WCHAR)),
|
||||
+ "Expected buf1 to begin with %s, got %s\n", wine_dbgstr_w(fullnameW), wine_dbgstr_w(buf1));
|
||||
+ ok(size1 >= sizeof(WCHAR) && !(size1 % sizeof(WCHAR)), "Unexpected size1 = %lu\n", size1);
|
||||
+ ok(buf1[size1 / sizeof(WCHAR) - 1] == 0, "Expected buf1[%lu] == 0\n", size1 / sizeof(WCHAR) - 1);
|
||||
+ ok(size1 >= sizeof(WCHAR) && !(size1 % sizeof(WCHAR)), "Unexpected size1 = %Iu\n", size1);
|
||||
+ ok(buf1[size1 / sizeof(WCHAR) - 1] == 0, "Expected buf1[%Iu] == 0\n", size1 / sizeof(WCHAR) - 1);
|
||||
+
|
||||
+ ok(!lstrcmpW(buf2, appidW), "Expected buf2 to be %s, got %s\n", wine_dbgstr_w(appidW), wine_dbgstr_w(buf2));
|
||||
+ ok(size2 >= sizeof(WCHAR) && !(size2 % sizeof(WCHAR)), "Unexpected size2 = %lu\n", size2);
|
||||
+ ok(buf2[size2 / sizeof(WCHAR) - 1] == 0, "Expected buf2[%lu] == 0\n", size2 / sizeof(WCHAR) - 1);
|
||||
+ ok(size2 >= sizeof(WCHAR) && !(size2 % sizeof(WCHAR)), "Unexpected size2 = %Iu\n", size2);
|
||||
+ ok(buf2[size2 / sizeof(WCHAR) - 1] == 0, "Expected buf2[%Iu] == 0\n", size2 / sizeof(WCHAR) - 1);
|
||||
+
|
||||
+ CloseHandle(token);
|
||||
+ TerminateProcess(process, 0);
|
||||
|
@ -20,7 +20,7 @@ index 2147d0f1700..cd039c734e9 100644
|
||||
+ strcpy(tmpfile, tmpdir);
|
||||
+ lstrcatA(tmpfile, "/tmpdir");
|
||||
+ bret = CreateDirectoryA(tmpfile, NULL);
|
||||
+ ok(bret == TRUE, "CreateDirectoryA failed with error %u\n", GetLastError());
|
||||
+ ok(bret == TRUE, "CreateDirectoryA failed with error %lx\n", GetLastError());
|
||||
+
|
||||
+ error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
|
||||
+ OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
|
||||
@ -31,7 +31,7 @@ index 2147d0f1700..cd039c734e9 100644
|
||||
+ 0x1f01ff, TRUE, TRUE, TRUE, __LINE__);
|
||||
+ LocalFree(pSD);
|
||||
+ bret = RemoveDirectoryA(tmpfile);
|
||||
+ ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
|
||||
+ ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
|
||||
+
|
||||
+ /* Test inheritance of ACLs in CreateDirectory with security descriptor */
|
||||
+ pSD = &sd;
|
||||
@ -49,7 +49,7 @@ index 2147d0f1700..cd039c734e9 100644
|
||||
+ sa.lpSecurityDescriptor = pSD;
|
||||
+ sa.bInheritHandle = TRUE;
|
||||
+ bret = CreateDirectoryA(tmpfile, &sa);
|
||||
+ ok(bret == TRUE, "CreateDirectoryA failed with error %u\n", GetLastError());
|
||||
+ ok(bret == TRUE, "CreateDirectoryA failed with error %lx\n", GetLastError());
|
||||
+ HeapFree(GetProcessHeap(), 0, pDacl);
|
||||
+
|
||||
+ error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
|
||||
@ -59,7 +59,7 @@ index 2147d0f1700..cd039c734e9 100644
|
||||
+ bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
|
||||
+ ok(bret, "GetAclInformation failed\n");
|
||||
+ todo_wine
|
||||
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
|
||||
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
|
||||
+ acl_size.AceCount);
|
||||
+ LocalFree(pSD);
|
||||
+
|
||||
@ -67,7 +67,7 @@ index 2147d0f1700..cd039c734e9 100644
|
||||
+ bret = RemoveDirectoryA(tmpfile);
|
||||
+ error = GetLastError();
|
||||
+ ok(bret == FALSE, "RemoveDirectoryA unexpected succeeded\n");
|
||||
+ ok(error == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %u\n", error);
|
||||
+ ok(error == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %ld\n", error);
|
||||
+
|
||||
+ pSD = &sd;
|
||||
+ InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION);
|
||||
@ -80,11 +80,11 @@ index 2147d0f1700..cd039c734e9 100644
|
||||
+ ok(bret, "Failed to add ACL to security desciptor.\n");
|
||||
+ error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL,
|
||||
+ NULL, pDacl, NULL);
|
||||
+ ok(error == ERROR_SUCCESS, "SetNamedSecurityInfoA failed with error %u\n", error);
|
||||
+ ok(error == ERROR_SUCCESS, "SetNamedSecurityInfoA failed with error %ld\n", error);
|
||||
+ HeapFree(GetProcessHeap(), 0, pDacl);
|
||||
+
|
||||
+ bret = RemoveDirectoryA(tmpfile);
|
||||
+ ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
|
||||
+ ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
|
||||
+
|
||||
done:
|
||||
HeapFree(GetProcessHeap(), 0, user);
|
||||
|
@ -14,7 +14,7 @@ index 36ef972..a0532f6 100644
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -3474,6 +3474,82 @@ static void test_CreateDirectoryA(void)
|
||||
bret = RemoveDirectoryA(tmpfile);
|
||||
ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
|
||||
ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
|
||||
|
||||
+ /* Test inheritance of ACLs in NtCreateFile(..., FILE_DIRECTORY_FILE, ...) without security descriptor */
|
||||
+ strcpy(tmpfile, tmpdir);
|
||||
@ -30,7 +30,7 @@ index 36ef972..a0532f6 100644
|
||||
+
|
||||
+ status = pNtCreateFile(&hTemp, GENERIC_READ | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL,
|
||||
+ FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, NULL, 0);
|
||||
+ ok(!status, "NtCreateFile failed with %08x\n", status);
|
||||
+ ok(!status, "NtCreateFile failed with %08lx\n", status);
|
||||
+ RtlFreeUnicodeString(&tmpfileW);
|
||||
+
|
||||
+ error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
|
||||
@ -65,7 +65,7 @@ index 36ef972..a0532f6 100644
|
||||
+
|
||||
+ status = pNtCreateFile(&hTemp, GENERIC_READ | DELETE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL,
|
||||
+ FILE_SHARE_READ, FILE_CREATE, FILE_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, NULL, 0);
|
||||
+ ok(!status, "NtCreateFile failed with %08x\n", status);
|
||||
+ ok(!status, "NtCreateFile failed with %08lx\n", status);
|
||||
+ RtlFreeUnicodeString(&tmpfileW);
|
||||
+ HeapFree(GetProcessHeap(), 0, pDacl);
|
||||
+
|
||||
@ -76,18 +76,18 @@ index 36ef972..a0532f6 100644
|
||||
+ bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
|
||||
+ ok(bret, "GetAclInformation failed\n");
|
||||
+ todo_wine
|
||||
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
|
||||
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
|
||||
+ acl_size.AceCount);
|
||||
+ LocalFree(pSD);
|
||||
+
|
||||
+ error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT,
|
||||
+ OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
|
||||
+ (PSID *)&owner, NULL, &pDacl, NULL, &pSD);
|
||||
+ ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error);
|
||||
+ ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %ld\n", error);
|
||||
+ bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
|
||||
+ ok(bret, "GetAclInformation failed\n");
|
||||
+ todo_wine
|
||||
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
|
||||
+ ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
|
||||
+ acl_size.AceCount);
|
||||
+ LocalFree(pSD);
|
||||
+ CloseHandle(hTemp);
|
||||
|
@ -40,52 +40,52 @@ index 35fab8ca427..5d6f9b83152 100644
|
||||
+
|
||||
+ status = pNtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, FILE_ATTRIBUTE_READONLY,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_CREATE, 0, NULL, 0);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, GENERIC_WRITE, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_ACCESS_DENIED, "got %#x\n", status);
|
||||
+ ok(status == STATUS_ACCESS_DENIED, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, GENERIC_READ, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, FILE_READ_ATTRIBUTES, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, FILE_WRITE_ATTRIBUTES, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ todo_wine ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, DELETE, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, READ_CONTROL, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, WRITE_DAC, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, WRITE_OWNER, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle(handle);
|
||||
+
|
||||
+ status = pNtOpenFile(&handle, SYNCHRONIZE, &attr, &io,
|
||||
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ CloseHandle( handle );
|
||||
+
|
||||
+ pRtlFreeUnicodeString(&nameW);
|
||||
|
@ -16,8 +16,8 @@ index d365303..8ec367b 100644
|
||||
|
||||
status = pNtOpenFile(&handle, FILE_WRITE_ATTRIBUTES, &attr, &io,
|
||||
FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN_FOR_BACKUP_INTENT);
|
||||
- todo_wine ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#x\n", status);
|
||||
- todo_wine ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
+ ok(status == STATUS_SUCCESS, "got %#lx\n", status);
|
||||
CloseHandle(handle);
|
||||
|
||||
status = pNtOpenFile(&handle, DELETE, &attr, &io,
|
||||
|
@ -39,7 +39,7 @@ index d2ce3803bf6..7794e6735f3 100644
|
||||
+ 0x1f01ff, FALSE, FALSE, FALSE, __LINE__);
|
||||
LocalFree(pSD);
|
||||
bret = RemoveDirectoryA(tmpfile);
|
||||
ok(bret == TRUE, "RemoveDirectoryA failed with error %u\n", GetLastError());
|
||||
ok(bret == TRUE, "RemoveDirectoryA failed with error %lx\n", GetLastError());
|
||||
@@ -3859,7 +3859,7 @@ static void test_CreateDirectoryA(void)
|
||||
ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n");
|
||||
test_inherited_dacl(pDacl, admin_sid, user_sid,
|
||||
|
@ -36,7 +36,7 @@ index 4b9e02af826..1e82353cfd0 100644
|
||||
bret = GetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation);
|
||||
ok(bret, "GetAclInformation failed\n");
|
||||
- todo_wine
|
||||
ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n",
|
||||
ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%ld != 0).\n",
|
||||
acl_size.AceCount);
|
||||
LocalFree(pSD);
|
||||
@@ -5024,23 +5021,22 @@ static void test_GetSecurityInfo(void)
|
||||
|
@ -22,7 +22,7 @@ index 8b2ae805aa..a789108a86 100644
|
||||
+ */
|
||||
+HKL WINAPI LoadKeyboardLayoutEx(DWORD unknown, const WCHAR *locale, UINT flags)
|
||||
+{
|
||||
+ FIXME("(%d, %s, %x) semi-stub!\n", unknown, debugstr_w(locale), flags);
|
||||
+ FIXME("(%ld, %s, %x) semi-stub!\n", unknown, debugstr_w(locale), flags);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return LoadKeyboardLayoutW(locale, flags);
|
||||
+}
|
||||
|
@ -41,7 +41,7 @@ index f3e5c14ea6c..082ac59544a 100644
|
||||
|
||||
+ static_win = CreateWindowA("static", "Title", WS_VISIBLE | WS_CHILD,
|
||||
+ 10, 10, 20, 20, hwnd, NULL, NULL, NULL);
|
||||
+ ok(static_win != NULL, "CreateWindowA failed %u\n", GetLastError());
|
||||
+ ok(static_win != NULL, "CreateWindowA failed %lx\n", GetLastError());
|
||||
+
|
||||
SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
|
||||
SetWindowLongA(hwnd, GWL_EXSTYLE, GetWindowLongA(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
|
||||
|
@ -94,7 +94,7 @@ index 1bd3908ef6d..053d39b009d 100644
|
||||
+ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam,
|
||||
+ lpMapiMessage message, FLAGS flags, ULONG reserved)
|
||||
+{
|
||||
+ TRACE("(0x%I64xx 0x%I64xx %p 0x%08x 0x%08lx)\n", session, uiparam,
|
||||
+ TRACE("(0x%I64xx 0x%I64xx %p 0x%08lx 0x%08lx)\n", session, uiparam,
|
||||
+ message, flags, reserved);
|
||||
+
|
||||
+ if (XDGMailAvailable())
|
||||
|
Loading…
Reference in New Issue
Block a user