Compare commits

...

107 Commits

Author SHA1 Message Date
Sebastian Lackner
1b0da6367b Release 1.9.16. 2016-08-06 23:43:07 +02:00
Sebastian Lackner
515f93534d wined3d-Silence_FIXMEs: Added patch to silence FIXME in shader_glsl_declare_generic_vertex_attribute. 2016-08-06 19:47:29 +02:00
Sebastian Lackner
d95ae10e5a Rebase against 3852d3357d087353d71d4d11359014a97dbf3e5a.
[d3dx9_36-D3DXDisassembleShader]
Removed patch to implement stub for d3dx9_36.D3DXFillCubeTextureTX (fixed upstream).
2016-08-06 05:03:26 +02:00
Sebastian Lackner
eaf5582379 wined3d-DXTn: Remove an invalid Fixes line. 2016-08-05 22:48:51 +02:00
Sebastian Lackner
61c40e8075 wined3d-CSMT_Main: Added patches to fix wrong return value and to send wined3d_texture_add_dirty_region through the command stream. 2016-08-05 22:47:08 +02:00
Sebastian Lackner
89e2d01a1d Rebase against 0b49495b8ed9e725b47b7ca791312a2a3c3e3c97. 2016-08-05 02:43:06 +02:00
Sebastian Lackner
43c1f6218c taskmgr-Memory_Usage: Update patch and return more precise freemem value if possible. 2016-08-04 20:45:59 +02:00
Sebastian Lackner
69b39e2f8a ntdll-Attach_Process_DLLs: Update patchset and fix a bug related to load ordering. 2016-08-04 08:53:05 +02:00
Sebastian Lackner
2260ec5633 Rebase against a65718a3e7b95443a82dafd5d2c9cded961404a6. 2016-08-04 03:33:52 +02:00
Sebastian Lackner
3aa3a625e3 Rebase against 9ef65cf3d6af2e488d7efcb94fe61aa7e8540351. 2016-08-03 03:13:11 +02:00
Sebastian Lackner
b5a323aaa3 Rebase against 7aadb08212a5269ebefcb100cf567f7cf7aa0a7c. 2016-08-02 23:48:54 +02:00
Sebastian Lackner
0b0ad0faa4 wined3d-CSMT_Main: Remove unused wined3d_cs_emit_query_poll declaration in header file. 2016-08-01 01:46:52 +02:00
Sebastian Lackner
a95641d039 d3dx9_36-D3DXStubs: Update spec files. 2016-07-31 03:45:07 +02:00
Sebastian Lackner
2c23a6155e d3dx9_36-D3DXDisassembleShader: Update spec file (thanks Alistair Leslie-Hughes). 2016-07-31 03:38:10 +02:00
Sebastian Lackner
3ddc7bcaff Fix compiler warnings in multiple patches. 2016-07-31 03:02:56 +02:00
Sebastian Lackner
9f334d5964 Added lots of patches to workaround GCC 6 compiler warnings. 2016-07-31 02:16:08 +02:00
Sebastian Lackner
d926a91bfa Rebase against 0f2a776a59006a15fb84a2a51237d3484f136966. 2016-07-31 01:20:28 +02:00
Sebastian Lackner
0fabea78c6 Rebase against 77fc4697dd7c2b81181c4549c22210bc16913736.
NtCurrentTeb()->Reserved5[0] is now used for a different purpose on x86_64 OSX.
2016-07-31 01:20:28 +02:00
Sebastian Lackner
50a53675fe Rebase against ba2e025b94fa3705d439803a545129c32e8818af. 2016-07-31 01:20:27 +02:00
Sebastian Lackner
ceb2471ad2 Rebase against 2337c50ed769f2078257283f82aa7e696b452324. 2016-07-31 01:20:27 +02:00
Sebastian Lackner
3d23048fe4 Rebase against d262a183116dedfbeedc2d1ec2ea597673bfcd86. 2016-07-31 01:20:27 +02:00
Sebastian Lackner
e1b287d31a Rebase against 52a3a3b20633bf3a08860d43c8a9130a693cbedb. 2016-07-31 01:20:27 +02:00
Sebastian Lackner
af8f18a1f6 Rebase against 63fcf7faee88aea9425f57de8516dea262f54531.
[ntdll-OSX_TEB_x86_64]
Removed patch to improve compatibility of 64-bit support for OS X (accepted
upstream).
2016-07-31 01:20:27 +02:00
Sebastian Lackner
002886bffa Rebase against b05704dbbd429a5325132c77a3e13fcb88b2995f. 2016-07-31 01:20:27 +02:00
Sebastian Lackner
104c5b24f1 Rebase against b54a8dda844a1a43d1dff22eff0ea206be5c630c.
[d3dx9_36-D3DXDisassembleShader]
Removed patch to implement d3dx9_36.D3DXCreateTextureShader with stub interface
(accepted upstream).

[ntdll-NtQuerySection]
Partially removed patches to implement NtQuerySection (fixed upstream).
2016-07-31 01:20:04 +02:00
Sebastian Lackner
e7778c5622 Release 1.9.15. 2016-07-23 22:40:22 +02:00
Sebastian Lackner
b8df58d714 Added patch to use sysfs to populate SCSI registry keys. 2016-07-23 18:37:21 +02:00
Sebastian Lackner
7307a7ea4f patchupdate.py: Add list of authors to autogenerated patches. 2016-07-23 17:27:59 +02:00
Sebastian Lackner
7ca3f2b608 Rebase against 267e8e3eeb6d0b6e8ccab809fddd27bae05cbfc2. 2016-07-23 16:30:17 +02:00
Sebastian Lackner
5989fb0938 Rebase against 654e960e340cc37a9282c52ba8aca5f779a13dbb. 2016-07-23 15:38:42 +02:00
Sebastian Lackner
3f111101a8 Rebase against 51c7df4f376fa7924752dc32a9715a4475e038df. 2016-07-23 14:32:39 +02:00
Sebastian Lackner
857c2fcfe2 Rebase against fac012f2e114870c9628e5ea5b5c8312284c0f3e. 2016-07-23 06:44:18 +02:00
Sebastian Lackner
f901f130fd Rebase against be2908ed071dd11de5dc2fae270aad15e5df7d17. 2016-07-22 20:22:24 +02:00
Sebastian Lackner
ba40b415b7 Rebase against a02c7ce7518b19d401ae854f18d2401a489f60db. 2016-07-22 19:10:06 +02:00
Sebastian Lackner
94f533c0ad Rebase against 0a5e205c06e0f0ccf632e02a48e86a386a4884e0. 2016-07-22 19:06:49 +02:00
Sebastian Lackner
4d1dd4c62a patchutils.py: Create smaller #ifdef ranges. 2016-07-22 18:49:06 +02:00
Sebastian Lackner
2b1f2e8578 patchutils.py: Fix a bug when parsing certain hunk headers. 2016-07-22 18:44:44 +02:00
Sebastian Lackner
4b1b7f77bc patchutils.py: Invert logic for applying #ifdef patches. 2016-07-22 17:33:27 +02:00
Sebastian Lackner
c779a2acbe Rebase against a615647435bd017af1993454902982d7a37b3cb3. 2016-07-20 21:01:50 +02:00
Sebastian Lackner
97fec39e47 Added patch to ensure process_attach callbacks are not executed too early. 2016-07-20 05:00:15 +02:00
Sebastian Lackner
cbd440689d Rebase against a71128513767d44a8f42e10895578b650061bdce.
[ntdll-NtUnmapViewOfSection]
Removed patch to fix behavior of UnmapViewOfFile for Win9x (accepted upstream).

[shell32-FolderItems_Stub_Iface]
Removed patch to implement stubbed FolderItems interface (fixed upstream).
2016-07-19 18:33:14 +02:00
Sebastian Lackner
5125d3edeb Rebase against adde9fadebe07c30ecc9f12685751fb78b3473c5.
[server-BaseNamedObjects]
Removed patch to provide symlink to BaseNamedObjects in \Sessions\1 (accepted
upstream).
2016-07-18 20:03:49 +02:00
Sebastian Lackner
6455c8e654 d3dx9_36-GetShaderSemantics: Correct spec files (thanks Alistair Leslie-Hughes). 2016-07-17 15:43:06 +02:00
Sebastian Lackner
b1b5d6c670 Added patch to provide symlink to BaseNamedObjects in \Sessions\1. 2016-07-16 18:12:26 +02:00
Sebastian Lackner
6a8aacda4c Rebase against fec0b697c74a8e016b41968b342f9fc9fe11bf74.
[ntdll-NtQueryInformationThread]
Removed patch to implement support for fs segment in GetThreadSelectorEntry
(accepted upstream).
2016-07-15 17:49:47 +02:00
Sebastian Lackner
f788007dc4 Rebase against 5101a90bca2bd2618b488f37624af43efe17a0e0.
[secur32-Gnutls_Algorithms]
Removed patch to define missing gnutls_kx_algorithm_t values for old gnutls
versions (accepted upstream).

[taskmgr-Memory_Usage]
Removed patch to use sysinfo to report correct number of physical pages
(accepted upstream).
2016-07-15 03:04:28 +02:00
Sebastian Lackner
31baacffe2 Rebase against 1bcc7ce75f64f2894de43379674bc5c53c52bb3a. 2016-07-11 03:06:53 +02:00
Sebastian Lackner
bd3563bdf1 Rebase against 0a3700e051f3e9473c5daa40a5cdd951b1310b8c.
[gdi32-PtInRegion]
Removed patch to add back the extents test (accepted upstream).
2016-07-10 22:20:23 +02:00
Sebastian Lackner
372c0be9d9 Release 1.9.14. 2016-07-10 19:52:08 +02:00
Sebastian Lackner
245467db83 Added patch to define missing gnutls_kx_algorithm_t values for old versions of gnutls. 2016-07-10 06:39:46 +02:00
Sebastian Lackner
f902de09d5 Added patch to add back extents test in PtInRegion. 2016-07-10 02:54:57 +02:00
Sebastian Lackner
17b81919fa wined3d-CSMT_Main: Removed patches affecting other dlls.
Because of the #ifdef those patches had no effect anyway.
2016-07-10 01:47:12 +02:00
Sebastian Lackner
a3e5cd8f58 Rebase against abb221fa81b60f53c14f6864bbfb9453455aeeeb. 2016-07-10 01:47:10 +02:00
Sebastian Lackner
a0cb1797f4 Rebase against cc9c18a46d1ce7e2834bae0fa65a6ed7904820dd. 2016-07-10 00:31:24 +02:00
Sebastian Lackner
970dc74e89 Rebase against 38f3d59ed694afba7913b4992d13cb044a09126c.
[user32-CharToOem]
Removed patch to properly handle invalid parameters in CharToOem* and
OemToChar* APIs (accepted upstream).
2016-07-09 17:57:44 +02:00
Sebastian Lackner
867c8334a1 Rebase against 94b6a885a880728f5e0a865fc17a82532723e756.
[ntdll-InMemoryOrderModuleList]
Removed patch to sort InMemoryOrderModuleList in load order (accepted upstream).
2016-07-07 20:33:23 +02:00
Sebastian Lackner
cf457f4e1c Rebase against 27ea3804ddc8077fedb7a0ea81ac96910f78a26f. 2016-07-06 22:38:12 +02:00
Sebastian Lackner
fc6aa583cf server-Realtime_Priority: Include stdarg.h in server/scheduler.c. 2016-07-06 05:51:29 +02:00
Sebastian Lackner
ed54d227d8 Added patch to forward various functions from d3d10_1 to d3d10. 2016-07-05 21:47:56 +02:00
Sebastian Lackner
f5734d67c8 Rebase against 9729d15a1a8de61030b68436a1c2239290af90f5. 2016-07-05 20:17:20 +02:00
Sebastian Lackner
8aa5c2acd0 Rebase against b1930ee4b8a0f77654bbab65c3bc30d721bf5d6a.
[include-webservices]
Removed patch to delete duplicate definition of WS_XML_NODE_POSITION (accepted
upstream).
2016-07-04 18:14:50 +02:00
Sebastian Lackner
d8862cbbfd Rebase against a9a6948b7944dccca6831914ea40e5c9aa5929bc.
[winspool.drv-SetPrinterW]
Removed patch to add stub for winspool.SetPrinterW level 8 (fixed upstream).
2016-07-03 23:05:00 +02:00
Sebastian Lackner
0792e994bd precommit-hook.sh: Use 'grep -q' instead of redirection to /dev/null. 2016-07-01 20:13:03 +02:00
Sebastian Lackner
09e1b75334 patchinstall.sh: Escape $ at the end of a string. 2016-07-01 19:50:22 +02:00
Sebastian Lackner
004c3abe40 patchutils.py: Generate diff in git format. 2016-07-01 01:28:38 +02:00
Sebastian Lackner
270b4f702b precommit-hook.sh: Automatically adjust version number after a release. 2016-07-01 01:13:40 +02:00
Sebastian Lackner
7df2eaa22d Release 1.9.13. 2016-06-25 17:18:29 +02:00
Sebastian Lackner
571ab663fd Added patch to remove duplicate definition in include/webservices.h. 2016-06-25 07:13:04 +02:00
Sebastian Lackner
ddba27937a ntoskrnl-DriverTest: Fix compile error caused by wrong import library. 2016-06-25 04:59:47 +02:00
Sebastian Lackner
f71c20b7f7 Rebase against af6f8ca4136ad937f8743494a8d3cea0b52d71cf.
[msvcrt-_fstat32i64]
Removed patch to implement msvcrt._fstat32i64 (accepted upstream).
2016-06-24 15:43:04 +02:00
Sebastian Lackner
8281fca8dc Added patch to implement ole32.OleGetIconOfFile stub. 2016-06-24 12:00:24 +02:00
Sebastian Lackner
093f3b9818 gdiplus-GdipCreateMetafileFromStream: Update patchset and implement GdipCreateMetafileFromFile. 2016-06-24 11:53:34 +02:00
Sebastian Lackner
c8299873fb wined3d-CSMT_Main: Remove patches with unnecessary 'Waiting for cs' warning. 2016-06-24 04:42:45 +02:00
Sebastian Lackner
60e6da65cd Rebase against 82f3446c5d09aba0aa0cffcf7ece54d44d3b86ef. 2016-06-24 02:24:55 +02:00
Sebastian Lackner
08dca3b834 Rebase against 38fb1062daaf68afe4dc20e1aceddfa89fe1ea4f. 2016-06-24 01:13:57 +02:00
Sebastian Lackner
4f12cf4dc9 Rebase against 9ba058e94c2662f5296c95adeafd29c59b137249. 2016-06-23 17:37:04 +02:00
Sebastian Lackner
1d08851c35 Rebase against e3bd659be9b2868b121857fb2643d775bbf0d8c7.
[d3dx9_33-Share_Source]
Removed patch to share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL
forwards (accepted upstream).
2016-06-23 16:17:27 +02:00
Sebastian Lackner
a8976086e5 Rebase against 0c83f4d5bec8b01e1e6dcbb0a9a9932b6c24570b. 2016-06-23 07:26:56 +02:00
Sebastian Lackner
c6a96f3e32 Rebase against 7fe9858988eabf377ab5e2c64d92f973574b1ae8.
Also modifies a couple of other wined3d-CSMT_Main patches, and uses
wined3d_cs_emit_destroy_object where appropriate.
2016-06-23 06:15:03 +02:00
Sebastian Lackner
6adf92cebb Rebase against 4afc7470fb630035c911a1bf1d48f66bf16c230c. 2016-06-23 00:43:28 +02:00
Sebastian Lackner
e27647e4d5 Rebase against 9c1fbe509576d7cbaada3af9736888cfa1d02847. 2016-06-22 23:33:39 +02:00
Sebastian Lackner
2f3baafeca Rebase against 025c54344230ca8b32e80f08b9af13a16dfd2445.
[ws2_32-Sort_default_route]
Removed patch to ensure default route IP addresses are returned first in
gethostbyname.
2016-06-21 22:18:57 +02:00
Sebastian Lackner
5e5f21854b Rebase against 754c68182623657b4862d7700afbf781b4555c77.
[ucrtbase-Functions]
Removed patch to forward _{calloc,malloc,free}_base to {calloc,malloc,free}.
2016-06-17 19:04:51 +02:00
Sebastian Lackner
6b9d38b61c Remove disabled gdi32-PS_GEOMETRIC patchset.
Bug 39172 already has been fixed in a different way.
2016-06-17 05:40:44 +02:00
Sebastian Lackner
45157d6bbe Added patch with stubs for user-mode scheduling functions. 2016-06-17 03:44:38 +02:00
Sebastian Lackner
3cb1c835bc Added patch to use root dialog for DM_SETDEFID/DM_GETDEFID in DefDlgProc. 2016-06-16 23:52:44 +02:00
Sebastian Lackner
243a9f7b89 Rebase against 41d01871fef296dc717cf2c4f0bdbb07f5266acd. 2016-06-16 22:56:56 +02:00
Sebastian Lackner
4f532d23bb Rebase against 7cb3b72559745d94e7b7e3a0fbb40426f93d775f. 2016-06-16 22:02:21 +02:00
Sebastian Lackner
73d2e2a9e8 Rebase against 849163b1ed5e2586ee9f391e7a8b03f054bb620f. 2016-06-15 20:57:20 +02:00
Sebastian Lackner
7391ecfaa0 Release 1.9.12. 2016-06-13 19:02:12 +02:00
Sebastian Lackner
295deafca7 comctl32-Listview_DrawItem: Update patchset and fix a regression (thanks Michael Müller). 2016-06-13 02:12:53 +02:00
Sebastian Lackner
2dd175172b Added patch to pass correct itemData to WM_MEASUREITEM when inserting an item to an owner-drawn listbox. 2016-06-12 19:58:05 +02:00
Sebastian Lackner
5924752fd9 Rebase against 50917e283629cbe994f2d7f091ed46ac8b25cda6. 2016-06-12 05:43:39 +02:00
Sebastian Lackner
57b298602e Rebase against 03b06fb76ba4204df5c20fda8955da09e16ec095. 2016-06-12 05:00:55 +02:00
Sebastian Lackner
52f5a405e9 Rebase against 0c0c86a8c7c93e7edbca8a7840c945f4159c3059.
FIXME: We should do all operations through the command stream.
2016-06-12 04:42:26 +02:00
Sebastian Lackner
c92ffa58c0 Rebase against 2a5b4fd884801a7f394ade49142fbfdba195243c. 2016-06-11 19:33:18 +02:00
Sebastian Lackner
e741b83080 Rebase against 9cc95e5a1d930d72892949a3ddf8fa00d471af88. 2016-06-06 22:38:52 +02:00
Sebastian Lackner
faf8d49216 winex11-_NET_ACTIVE_WINDOW: Update patchset and fix a regression (thanks Michael Müller). 2016-06-05 02:34:21 +02:00
Sebastian Lackner
08e221b30c Added patch to send SC_KEYMENU on managed windows. 2016-06-05 01:32:42 +02:00
Sebastian Lackner
c2158ca405 Added patch to force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA. 2016-06-04 03:04:10 +02:00
Sebastian Lackner
953ae16ca9 Added patch to scale a geometric pen for the mapping mode used by PATH_StrokePath. 2016-06-04 02:53:05 +02:00
Sebastian Lackner
066e207750 Rebase against d8641197c041763c2c9784f4b4a8b3dba2bbf0cb. 2016-06-03 18:05:36 +02:00
Sebastian Lackner
64e8ae3a61 Rebase against 5840ea47e6a0d761acbd45cd5a59fbcebfb86326. 2016-06-02 23:10:47 +02:00
Sebastian Lackner
3d1995983f Rebase against 03fa4cfaffd4c10f56a2f8bfd383f4eaf67d364c.
[ntdll-WinSqm]
Removed patch to add WinSqm[Start|End]Session implementation (accepted upstream).
2016-06-02 22:15:30 +02:00
Sebastian Lackner
4705d850ea Rebase against 59ee884bdf4947f5939499456539fca7a5806939. 2016-05-31 23:09:34 +02:00
Sebastian Lackner
8bede16222 Rebase against c89dc58deb9ba74d8dcd7faf7012203cff0724a0. 2016-05-30 18:24:40 +02:00
Sebastian Lackner
5c3c83fef5 Added patch to check if menu text is a valid string in MENU_DrawMenuItem. 2016-05-30 15:40:30 +02:00
258 changed files with 13659 additions and 18662 deletions

View File

@@ -0,0 +1,136 @@
From 99d742d6850f82d5106a7402ea0fbc680e929202 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:53:32 +0200
Subject: comctl32: Avoid misleading indentation warnings.
---
dlls/comctl32/listview.c | 54 ++++++++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 18 deletions(-)
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index cfdb7de..0298b12 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -588,23 +588,28 @@ static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo)
if (pScrollInfo == NULL) return "(null)";
len = snprintf(buf, size, "{cbSize=%u, ", pScrollInfo->cbSize);
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (pScrollInfo->fMask & SIF_RANGE)
len = snprintf(buf, size, "nMin=%d, nMax=%d, ", pScrollInfo->nMin, pScrollInfo->nMax);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (pScrollInfo->fMask & SIF_PAGE)
len = snprintf(buf, size, "nPage=%u, ", pScrollInfo->nPage);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (pScrollInfo->fMask & SIF_POS)
len = snprintf(buf, size, "nPos=%d, ", pScrollInfo->nPos);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (pScrollInfo->fMask & SIF_TRACKPOS)
len = snprintf(buf, size, "nTrackPos=%d, ", pScrollInfo->nTrackPos);
else len = 0;
- if (len == -1) goto end; buf += len;
+ if (len == -1) goto end;
+ buf += len;
goto undo;
end:
buf = text + strlen(text);
@@ -629,27 +634,33 @@ static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW)
if (lpLVItem == NULL) return "(null)";
len = snprintf(buf, size, "{iItem=%d, iSubItem=%d, ", lpLVItem->iItem, lpLVItem->iSubItem);
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpLVItem->mask & LVIF_STATE)
len = snprintf(buf, size, "state=%x, stateMask=%x, ", lpLVItem->state, lpLVItem->stateMask);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpLVItem->mask & LVIF_TEXT)
len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpLVItem->pszText, isW, 80), lpLVItem->cchTextMax);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpLVItem->mask & LVIF_IMAGE)
len = snprintf(buf, size, "iImage=%d, ", lpLVItem->iImage);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpLVItem->mask & LVIF_PARAM)
len = snprintf(buf, size, "lParam=%lx, ", lpLVItem->lParam);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpLVItem->mask & LVIF_INDENT)
len = snprintf(buf, size, "iIndent=%d, ", lpLVItem->iIndent);
else len = 0;
- if (len == -1) goto end; buf += len;
+ if (len == -1) goto end;
+ buf += len;
goto undo;
end:
buf = text + strlen(text);
@@ -665,31 +676,38 @@ static const char* debuglvcolumn_t(const LVCOLUMNW *lpColumn, BOOL isW)
if (lpColumn == NULL) return "(null)";
len = snprintf(buf, size, "{");
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpColumn->mask & LVCF_SUBITEM)
len = snprintf(buf, size, "iSubItem=%d, ", lpColumn->iSubItem);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpColumn->mask & LVCF_FMT)
len = snprintf(buf, size, "fmt=%x, ", lpColumn->fmt);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpColumn->mask & LVCF_WIDTH)
len = snprintf(buf, size, "cx=%d, ", lpColumn->cx);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpColumn->mask & LVCF_TEXT)
len = snprintf(buf, size, "pszText=%s, cchTextMax=%d, ", debugtext_tn(lpColumn->pszText, isW, 80), lpColumn->cchTextMax);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpColumn->mask & LVCF_IMAGE)
len = snprintf(buf, size, "iImage=%d, ", lpColumn->iImage);
else len = 0;
- if (len == -1) goto end; buf += len; size -= len;
+ if (len == -1) goto end;
+ buf += len; size -= len;
if (lpColumn->mask & LVCF_ORDER)
len = snprintf(buf, size, "iOrder=%d, ", lpColumn->iOrder);
else len = 0;
- if (len == -1) goto end; buf += len;
+ if (len == -1) goto end;
+ buf += len;
goto undo;
end:
buf = text + strlen(text);
--
2.9.0

View File

@@ -0,0 +1,248 @@
From 41ec9334edb0453cbc979d7655b430061af02dbb Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:54:51 +0200
Subject: dwrite/tests: Avoid misleading indentation warnings.
---
dlls/dwrite/tests/analyzer.c | 2 ++
dlls/dwrite/tests/font.c | 28 ++++++++++++++++++++++++++++
dlls/dwrite/tests/layout.c | 14 ++++++++++++++
3 files changed, 44 insertions(+)
diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c
index 1e3b318..ddd3584 100644
--- a/dlls/dwrite/tests/analyzer.c
+++ b/dlls/dwrite/tests/analyzer.c
@@ -1167,7 +1167,9 @@ static void test_GetScriptProperties(void)
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, NULL);
+}
sa.script = 0;
hr = IDWriteTextAnalyzer1_GetScriptProperties(analyzer1, sa, &props);
diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c
index 3b402b8..5691388 100644
--- a/dlls/dwrite/tests/font.c
+++ b/dlls/dwrite/tests/font.c
@@ -842,8 +842,10 @@ static void test_CreateFontFromLOGFONT(void)
EXPECT_HR(hr, S_OK);
if (0)
+{
/* null out parameter crashes this call */
hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, NULL);
+}
font = (void*)0xdeadbeef;
hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, &font);
@@ -1013,7 +1015,9 @@ static void test_CreateBitmapRenderTarget(void)
EXPECT_HR(hr, S_OK);
if (0) /* crashes on native */
+{
hr = IDWriteBitmapRenderTarget_GetSize(target, NULL);
+}
size.cx = size.cy = -1;
hr = IDWriteBitmapRenderTarget_GetSize(target, &size);
@@ -1159,7 +1163,9 @@ if (0) /* crashes on native */
/* transform tests, current hdc transform is not immediately affected */
if (0) /* crashes on native */
+{
hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, NULL);
+}
memset(&m, 0xcc, sizeof(m));
hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m);
@@ -1406,7 +1412,9 @@ static void test_GetFamilyNames(void)
EXPECT_HR(hr, S_OK);
if (0) /* crashes on native */
+{
hr = IDWriteFontFamily_GetFamilyNames(family, NULL);
+}
hr = IDWriteFontFamily_GetFamilyNames(family, &names);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -1421,7 +1429,9 @@ if (0) /* crashes on native */
/* GetStringLength */
if (0) /* crashes on native */
+{
hr = IDWriteLocalizedStrings_GetStringLength(names, 0, NULL);
+}
len = 100;
hr = IDWriteLocalizedStrings_GetStringLength(names, 10, &len);
@@ -1441,7 +1451,9 @@ if (0) /* crashes on native */
ok(hr == E_FAIL, "got 0x%08x\n", hr);
if (0)
+{
hr = IDWriteLocalizedStrings_GetString(names, 0, NULL, 100);
+}
buffer[0] = 1;
hr = IDWriteLocalizedStrings_GetString(names, 10, buffer, 100);
@@ -1513,7 +1525,9 @@ static void test_CreateFontFace(void)
ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDWriteFont_CreateFontFace(font, NULL);
+}
fontface = NULL;
hr = IDWriteFont_CreateFontFace(font, &fontface);
@@ -1846,7 +1860,9 @@ static void test_GetMetrics(void)
DeleteObject(hfont);
if (0) /* crashes on native */
+{
IDWriteFont_GetMetrics(font, NULL);
+}
memset(&metrics, 0, sizeof(metrics));
IDWriteFont_GetMetrics(font, &metrics);
@@ -2649,7 +2665,9 @@ if (0) { /* crashes on win10 */
todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr);
if (face2)
+{
IDWriteFontFace_Release(face2);
+}
file2 = NULL;
hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2);
@@ -2682,7 +2700,9 @@ if (face2)
ok(indices[1] == 11, "got index %i\n", indices[1]);
if (0) /* crashes on native */
+{
hr = IDWriteFontFace_GetGlyphIndices(face, NULL, 1, NULL);
+}
hr = IDWriteFontFace_GetGlyphIndices(face, codePoints, 1, indices);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -4130,7 +4150,9 @@ static void test_GetKerningPairAdjustments(void)
ok(hr == E_INVALIDARG || broken(hr == S_OK) /* win8 */, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+ {
hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, NULL);
+ }
adjustments[0] = 1;
hr = IDWriteFontFace1_GetKerningPairAdjustments(fontface1, 1, NULL, adjustments);
@@ -4837,7 +4859,9 @@ static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face)
expected.subscriptSizeY = round(round(design_metrics1.subscriptSizeY * scale) / scale);
expected.superscriptPositionX = round(round(design_metrics1.superscriptPositionX * scale) / scale);
if (0) /* this fails for 3 emsizes, Tahoma from [5, 2048] range */
+ {
expected.superscriptPositionY = round(round(design_metrics1.superscriptPositionY * scale) / scale);
+ }
expected.superscriptSizeX = round(round(design_metrics1.superscriptSizeX * scale) / scale);
expected.superscriptSizeY = round(round(design_metrics1.superscriptSizeY * scale) / scale);
expected.hasTypographicMetrics = design_metrics1.hasTypographicMetrics;
@@ -4904,7 +4928,9 @@ static void test_GetPanose(void)
DWRITE_PANOSE panose;
if (0) /* crashes on native */
+ {
IDWriteFont1_GetPanose(font1, NULL);
+ }
memset(&panose, 0, sizeof(panose));
IDWriteFont1_GetPanose(font1, &panose);
@@ -5211,8 +5237,10 @@ static void test_GetRecommendedRenderingMode(void)
win_skip("IDWriteFontFace3::GetRecommendedRenderingMode() is not supported.\n");
if (0) /* crashes on native */
+{
hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0,
DWRITE_MEASURING_MODE_GDI_CLASSIC, NULL, NULL);
+}
mode = 10;
hr = IDWriteFontFace_GetRecommendedRenderingMode(fontface, 3.0, 1.0,
diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
index 03038d8..d92d419 100644
--- a/dlls/dwrite/tests/layout.c
+++ b/dlls/dwrite/tests/layout.c
@@ -983,7 +983,9 @@ static void test_CreateTextFormat(void)
ok(hr == S_OK, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDWriteTextFormat_GetFontCollection(format, NULL);
+}
collection = NULL;
hr = IDWriteTextFormat_GetFontCollection(format, &collection);
@@ -2235,7 +2237,9 @@ static void test_SetLocaleName(void)
ok(hr == E_INVALIDARG, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 1, NULL);
+}
buffW[0] = 0;
range.length = 0;
@@ -2447,7 +2451,9 @@ static void test_fallback(void)
}
if (0) /* crashes on native */
+{
hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL);
+}
fallback = (void*)0xdeadbeef;
hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback);
@@ -4371,7 +4377,9 @@ todo_wine {
todo_wine
ok(font != NULL, "got %p\n", font);
if (font)
+{
IDWriteFont_Release(font);
+}
/* same latin text, full length */
g_source = strW;
@@ -4388,7 +4396,9 @@ todo_wine {
todo_wine
ok(font != NULL, "got %p\n", font);
if (font)
+{
IDWriteFont_Release(font);
+}
/* string 'a\x3058b' */
g_source = str2W;
@@ -4405,7 +4415,9 @@ todo_wine {
todo_wine
ok(font != NULL, "got %p\n", font);
if (font)
+{
IDWriteFont_Release(font);
+}
g_source = str2W;
mappedlength = 0;
@@ -4545,7 +4557,9 @@ static void test_FontFallbackBuilder(void)
ok(hr == S_OK, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, NULL);
+}
hr = IDWriteFontFallbackBuilder_CreateFontFallback(builder, &fallback);
ok(hr == S_OK, "got 0x%08x\n", hr);
--
2.9.0

View File

@@ -0,0 +1,27 @@
From e733682785c0f2001a972090693c4b49bb8e1090 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:55:40 +0200
Subject: mshtml: Avoid misleading indentation warnings.
---
dlls/mshtml/script.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c
index 40deda4..19f3541 100644
--- a/dlls/mshtml/script.c
+++ b/dlls/mshtml/script.c
@@ -991,8 +991,8 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream)
if(This->bsc.readed >= This->size) {
void *new_buf;
new_buf = heap_realloc(This->buf, This->size << 1);
- if(!new_buf)
- return E_OUTOFMEMORY;
+ if(!new_buf)
+ return E_OUTOFMEMORY;
This->size <<= 1;
This->buf = new_buf;
}
--
2.9.0

View File

@@ -0,0 +1,214 @@
From 5a398b6537c252196f0f3df6ea4dfbc3956e322b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:56:41 +0200
Subject: msvcirt/tests: Avoid misleading indentation warnings.
---
dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c
index a921b27..11c8b4f 100644
--- a/dlls/msvcirt/tests/msvcirt.c
+++ b/dlls/msvcirt/tests/msvcirt.c
@@ -2896,7 +2896,9 @@ static void test_ostream(void) {
/* flush */
if (0) /* crashes on native */
+{
pos = call_func1(p_ostream_flush, &os1);
+}
os1.base_ios.sb = &fb2.base;
call_func1(p_filebuf_ctor, &fb2);
pos = call_func1(p_ostream_flush, &os1);
@@ -2952,7 +2954,9 @@ if (0) /* crashes on native */
os1.base_ios.tie = &os2;
os2.base_ios.sb = NULL;
if (0) /* crashes on native */
+{
ret = (int) call_func1(p_ostream_opfx, &os1);
+}
os2.base_ios.sb = &fb2.base;
os2.base_ios.state = IOSTATE_badbit;
ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "We've known each other", 22);
@@ -2979,7 +2983,9 @@ if (0) /* crashes on native */
ok(ret == 1, "expected 1 got %d\n", ret);
os1.base_ios.sb = NULL;
if (0) /* crashes on native */
+{
call_func1(p_ostream_osfx, &os1);
+}
os1.base_ios.sb = &fb1.base;
os1.base_ios.flags = FLAGS_unitbuf;
call_func1(p_ostream_osfx, &os1);
@@ -3019,7 +3025,9 @@ if (0) /* crashes on native */
ok(fb1.base.pptr == fb1.base.base + 1, "wrong put pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.pptr);
os1.base_ios.sb = NULL;
if (0) /* crashes on native */
+{
pos = call_func2(p_ostream_put_char, &os1, 'c');
+}
os1.base_ios.sb = &fb1.base;
os1.base_ios.width = 5;
call_func1(p_filebuf_sync, &fb1);
@@ -3051,7 +3059,9 @@ if (0) /* crashes on native */
ok(fb1.base.pptr == fb1.base.base + 7, "wrong put pointer, expected %p got %p\n", fb1.base.base + 7, fb1.base.pptr);
os1.base_ios.sb = NULL;
if (0) /* crashes on native */
+{
pos = call_func3(p_ostream_write_char, &os1, "been", 4);
+}
os1.base_ios.sb = &fb1.base;
os1.base_ios.width = 5;
call_func1(p_filebuf_sync, &fb1);
@@ -3167,7 +3177,9 @@ if (0) /* crashes on native */
ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos);
ok(!strncmp(fb1.base.pptr - 6, "abzzzz", 6), "expected 'abzzzz' got '%s'\n", fb1.base.pptr - 6);
if (0) /* crashes on native */
+{
pos = call_func3(p_ostream_writepad, &os1, NULL, "o");
+}
pos = call_func3(p_ostream_writepad, &os1, "", "hello");
ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos);
ok(!strncmp(fb1.base.pptr - 6, "helloz", 6), "expected 'helloz' got '%s'\n", fb1.base.pptr - 6);
@@ -3580,7 +3592,9 @@ static void test_istream(void)
ok(is2.base_ios.precision == 6, "expected 6 got %d\n", is2.base_ios.precision);
ok(is2.base_ios.width == 0, "expected 0 got %d\n", is2.base_ios.width);
if (0) /* crashes on native */
+{
pis = call_func2(p_istream_assign, &is2, NULL);
+}
is2.extract_delim = is2.count = 0xabababab;
is2.base_ios.sb = (streambuf*) 0xabababab;
is2.base_ios.state = 0xabababab;
@@ -3616,7 +3630,9 @@ if (0) /* crashes on native */
/* eatwhite */
is1.extract_delim = is1.count = 0;
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
is1.base_ios.state = IOSTATE_badbit;
is1.base_ios.flags = 0;
call_func1(p_istream_eatwhite, &is1);
@@ -3684,7 +3700,9 @@ if (0) /* crashes on native */
ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n",
IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state);
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
is1.base_ios.state = IOSTATE_goodbit;
is1.base_ios.tie = &os;
pos = call_func3(p_ostream_sb_ctor, &os, &fb2.base, TRUE);
@@ -3951,7 +3969,9 @@ if (0) /* crashes on native */
ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]);
if (0) /* crashes on native */
+{
pis = call_func4(p_istream_get_str_delim, &is1, (char*) 0x1, 5, 0);
+}
/* get_str */
is1.extract_delim = is1.count = 0xabababab;
@@ -4089,7 +4109,9 @@ if (0) /* crashes on native */
ok(fb1.base.gptr == fb1.base.base + 3, "wrong get pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.gptr);
ok(c == -50, "expected %d got %d\n", -50, c);
if (0) /* crashes on native */
+{
pis = call_func2(p_istream_get_char, &is1, NULL);
+}
fb1.base.gptr = fb1.base.base + 30;
pis = call_func2(p_istream_get_char, &is1, &c);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
@@ -4201,7 +4223,9 @@ if (0) /* crashes on native */
ok(fb2.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb2.base.epptr);
is1.base_ios.state = IOSTATE_goodbit;
if (0) /* crashes on native */
+{
pis = call_func3(p_istream_get_sb, &is1, NULL, '?');
+}
*fb1.base.gptr = -50;
pis = call_func3(p_istream_get_sb, &is1, &fb2.base, -50);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
@@ -4395,7 +4419,9 @@ if (0) /* crashes on native */
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr);
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
fb1.base.gptr = fb1.base.base + 14;
ret = (int) call_func1(p_istream_peek, &is1);
ok(ret == 206, "expected 206 got %d\n", ret);
@@ -4440,7 +4466,9 @@ if (0) /* crashes on native */
ok(fb1.base.gptr == fb1.base.base + 15, "wrong get pointer, expected %p got %p\n", fb1.base.base + 15, fb1.base.gptr);
is1.base_ios.state = IOSTATE_goodbit;
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
pis = call_func2(p_istream_putback, &is1, -40);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
@@ -4498,13 +4526,17 @@ if (0) /* crashes on native */
ok(!strncmp(buffer, fb1.base.base, 30), "unexpected buffer content, got '%s'\n", buffer);
ok(buffer[30] == 'A', "expected 'A' got %d\n", buffer[30]);
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
is1.base_ios.state = IOSTATE_goodbit;
fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30;
memset(buffer, 'A', sizeof(buffer));
if (0) /* crashes on native */
+{
pis = call_func3(p_istream_read, &is1, buffer, -1);
+}
pis = call_func3(p_istream_read, &is1, buffer, 0);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
ok(is1.count == 0, "expected 0 got %d\n", is1.count);
@@ -4520,7 +4552,9 @@ if (0) /* crashes on native */
ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd));
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
pis = call_func2(p_istream_seekg, &is1, -5);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state);
@@ -4553,7 +4587,9 @@ if (0) /* crashes on native */
ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state);
ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr);
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
fb1.base.gptr = fb1.base.egptr;
pis = call_func3(p_istream_seekg_offset, &is1, 0, SEEKDIR_end);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
@@ -4574,7 +4610,9 @@ if (0) /* crashes on native */
ok(ret == 0, "expected 0 got %d\n", ret);
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30;
ret = (int) call_func1(p_istream_sync, &is1);
@@ -4607,7 +4645,9 @@ if (0) /* crashes on native */
ok(ret == 24, "expected 24 got %d\n", ret);
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
if (0) /* crashes on native */
+{
is1.base_ios.sb = NULL;
+}
fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30;
ret = (int) call_func1(p_istream_tellg, &is1);
--
2.9.0

View File

@@ -0,0 +1,41 @@
From dfefd1a7a793d0a6e4fcfb02438b7d9383f9ab97 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:57:11 +0200
Subject: oleaut32/tests: Avoid misleading indentation warnings.
---
dlls/ole32/tests/compobj.c | 2 ++
dlls/oleaut32/tests/safearray.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c
index 3b523d1..627f9a4 100644
--- a/dlls/ole32/tests/compobj.c
+++ b/dlls/ole32/tests/compobj.c
@@ -2880,7 +2880,9 @@ static void test_CoGetMalloc(void)
HRESULT hr;
if (0) /* crashes on native */
+{
hr = CoGetMalloc(0, NULL);
+}
imalloc = (void*)0xdeadbeef;
hr = CoGetMalloc(0, &imalloc);
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index f57b886..787891c 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -706,7 +706,9 @@ static void test_safearray(void)
}
if (!pSafeArrayAllocDescriptorEx)
+ {
return;
+ }
for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) {
a = NULL;
--
2.9.0

View File

@@ -0,0 +1,26 @@
From 9bda354ab7636fb357f29f777892de3c39ff06ae Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:57:37 +0200
Subject: rpcrt4/tests: Avoid misleading indentation warnings.
---
dlls/rpcrt4/tests/ndr_marshall.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index aeecf8c..b71f07b 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -2434,7 +2434,9 @@ static void test_MesEncodeFixedBufferHandleCreate(void)
todo_wine
ok(status == RPC_S_INVALID_ARG, "got %d\n", status);
if (status == RPC_S_OK)
+{
MesHandleFree(handle);
+}
status = MesEncodeFixedBufferHandleCreate(buffer, 32, NULL, &handle);
ok(status == RPC_S_INVALID_ARG, "got %d\n", status);
--
2.9.0

View File

@@ -0,0 +1,36 @@
From b79a3f64ec023a17955620362c748320c17a9ed0 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:57:59 +0200
Subject: scrrun/tests: Avoid misleading indentation warnings.
---
dlls/scrrun/tests/dictionary.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c
index a1b7d06..1880c20 100644
--- a/dlls/scrrun/tests/dictionary.c
+++ b/dlls/scrrun/tests/dictionary.c
@@ -102,7 +102,9 @@ static void test_comparemode(void)
ok(hr == S_OK, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDictionary_get_CompareMode(dict, NULL);
+}
method = 10;
hr = IDictionary_get_CompareMode(dict, &method);
@@ -934,7 +936,9 @@ static void test_IEnumVARIANT(void)
ok(hr == S_OK, "got 0x%08x\n", hr);
if (0) /* crashes on native */
+{
hr = IDictionary__NewEnum(dict, NULL);
+}
hr = IDictionary__NewEnum(dict, &enum1);
ok(hr == S_OK, "got 0x%08x\n", hr);
--
2.9.0

View File

@@ -0,0 +1,56 @@
From f1fa74c00e8c42d4ffd17689532ade8663015c6e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:58:37 +0200
Subject: shell32/tests: Avoid misleading indentation warnings.
---
dlls/shell32/tests/appbar.c | 2 ++
dlls/shell32/tests/shelldispatch.c | 2 ++
dlls/shell32/tests/shellole.c | 2 ++
3 files changed, 6 insertions(+)
diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c
index dbac4e6..7ec3c34 100644
--- a/dlls/shell32/tests/appbar.c
+++ b/dlls/shell32/tests/appbar.c
@@ -424,7 +424,9 @@ static void test_GetCurrentProcessExplicitAppUserModelID(void)
}
if (0) /* crashes on native */
+{
hr = pGetCurrentProcessExplicitAppUserModelID(NULL);
+}
appid = (void*)0xdeadbeef;
hr = pGetCurrentProcessExplicitAppUserModelID(&appid);
diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c
index 70b6c36..f42504e 100644
--- a/dlls/shell32/tests/shelldispatch.c
+++ b/dlls/shell32/tests/shelldispatch.c
@@ -729,7 +729,9 @@ todo_wine
todo_wine
ok(hr == S_OK, "got 0x%08x\n", hr);
if (hr == S_OK)
+{
test_dispatch_typeinfo(doc, viewdual_riids);
+}
IWebBrowser2_Release(wb);
diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c
index e8cf744..99f0ccb 100644
--- a/dlls/shell32/tests/shellole.c
+++ b/dlls/shell32/tests/shellole.c
@@ -872,7 +872,9 @@ static void test_SHCreateSessionKey(void)
}
if (0) /* crashes on native */
+{
hr = pSHCreateSessionKey(KEY_READ, NULL);
+}
hkey = (HKEY)0xdeadbeef;
hr = pSHCreateSessionKey(0, &hkey);
--
2.9.0

View File

@@ -0,0 +1,26 @@
From f590ced17854c6830cd15b63e757ef5798095cb1 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:58:52 +0200
Subject: shlwapi/tests: Avoid misleading indentation warnings.
---
dlls/shlwapi/tests/ordinal.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 74cad7d..b26fd4f 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -3225,7 +3225,9 @@ static void test_IUnknown_GetClassID(void)
HRESULT hr;
if (0) /* crashes on native systems */
+{
hr = pIUnknown_GetClassID(NULL, NULL);
+}
memset(&clsid, 0xcc, sizeof(clsid));
memset(&clsid3, 0xcc, sizeof(clsid3));
--
2.9.0

View File

@@ -0,0 +1,57 @@
From 49be4c98c9f543d23bb3e9f7dfc4c93ddc0a7d68 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:59:11 +0200
Subject: user32/tests: Avoid misleading indentation warnings.
---
dlls/user32/tests/input.c | 4 +++-
dlls/user32/tests/menu.c | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 0d7c6d6..66325e1 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -184,7 +184,7 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam )
if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */
(VKey != VK_MENU)) /* <ALT>-down...<something else>-up */
message = WM_SYSKEYUP;
- TrackSysKey = 0;
+ TrackSysKey = 0; /* FIXME */
}
InputKeyStateTable[VKey] &= ~0x80;
flags |= KF_REPEAT | KF_UP;
@@ -1768,7 +1768,9 @@ static void test_keyboard_layout_name(void)
char klid[KL_NAMELENGTH];
if (0) /* crashes on native system */
+{
ret = GetKeyboardLayoutNameA(NULL);
+}
SetLastError(0xdeadbeef);
ret = GetKeyboardLayoutNameW(NULL);
diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index ae7b957..f057613 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -3973,12 +3973,16 @@ static void test_AppendMenu(void)
ret = InsertMenuItemA(hmenu, 0, TRUE, &mii);
ok(ret, "InsertMenuItem failed\n");
if (0) /* FIXME: uncomment once Wine is fixed */
+{
check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED);
+}
mii.wID = 207;
ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);
ok(ret, "SetMenuItemInfo failed\n");
if (0) /* FIXME: uncomment once Wine is fixed */
+{
check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED);
+}
DestroyMenu(hmenu);
hbmp = CreateBitmap(1, 1, 1, 1, NULL);
--
2.9.0

View File

@@ -0,0 +1,26 @@
From 74a5d7a75aaae754ad64fd24947ba3f17d92a00a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:59:27 +0200
Subject: winhttp/tests: Avoid misleading indentation warnings.
---
dlls/winhttp/tests/winhttp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index 6be7598..d29457a 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -3823,7 +3823,9 @@ static void test_IWinHttpRequest_Invoke(void)
VariantInit(&ret);
if (0) /* crashes */
+{
hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, NULL, &ret, NULL, &err);
+}
params.cArgs = 1;
hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_OPTION, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &params, &ret, NULL, &err);
--
2.9.0

View File

@@ -0,0 +1,26 @@
From ec626b0fe26ec342091e9db61e78d77acf16f00a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 30 Jul 2016 23:59:41 +0200
Subject: wshom.ocx/tests: Avoid misleading indentation warnings.
---
dlls/wshom.ocx/tests/wshom.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c
index a3d398e..5b6ffd0 100644
--- a/dlls/wshom.ocx/tests/wshom.c
+++ b/dlls/wshom.ocx/tests/wshom.c
@@ -214,7 +214,9 @@ static void test_wshshell(void)
/* current directory */
if (0) /* crashes on native */
+{
hr = IWshShell3_get_CurrentDirectory(sh3, NULL);
+}
str = NULL;
hr = IWshShell3_get_CurrentDirectory(sh3, &str);
--
2.9.0

View File

@@ -0,0 +1,25 @@
From 1d2744df97beb00c40ae4c9d307334f4fe0c253d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 31 Jul 2016 00:01:52 +0200
Subject: include: Avoid shift overflow warning.
---
include/d3dtypes.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/d3dtypes.h b/include/d3dtypes.h
index 75aee55..8a884a8 100644
--- a/include/d3dtypes.h
+++ b/include/d3dtypes.h
@@ -53,7 +53,7 @@ typedef LONG D3DFIXED;
#define RGBA_GETRED(rgb) (((rgb) >> 16) & 0xff)
#define RGBA_GETGREEN(rgb) (((rgb) >> 8) & 0xff)
#define RGBA_GETBLUE(rgb) ((rgb) & 0xff)
-#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
+#define RGBA_MAKE(r, g, b, a) ((D3DCOLOR) (((DWORD)(a) << 24) | ((r) << 16) | ((g) << 8) | (b)))
#define D3DRGB(r, g, b) \
(0xff000000 | ( ((LONG)((r) * 255)) << 16) | (((LONG)((g) * 255)) << 8) | (LONG)((b) * 255))
--
2.9.0

View File

@@ -0,0 +1,85 @@
From c3170561ea6c0de42ae71925e31e08941e1b96dc Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 31 Jul 2016 00:03:02 +0200
Subject: server: Workaround duplicate condition warning of GCC 6.
---
server/request.c | 13 ++++++++++---
server/sock.c | 9 ++++++++-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/server/request.c b/server/request.c
index 597bf88..483884b 100644
--- a/server/request.c
+++ b/server/request.c
@@ -220,6 +220,13 @@ const void *get_req_data_after_objattr( const struct object_attributes *attr, da
return ptr;
}
+static inline int should_retry( int err )
+{
+ if (err == EWOULDBLOCK) return 1;
+ if (err == EAGAIN) return 1;
+ return 0;
+}
+
/* write the remaining part of the reply */
void write_reply( struct thread *thread )
{
@@ -241,7 +248,7 @@ void write_reply( struct thread *thread )
}
if (errno == EPIPE)
kill_thread( thread, 0 ); /* normal death */
- else if (errno != EWOULDBLOCK && errno != EAGAIN)
+ else if (!should_retry( errno ))
fatal_protocol_error( thread, "reply write: %s\n", strerror( errno ));
}
@@ -368,7 +375,7 @@ error:
kill_thread( thread, 0 );
else if (ret > 0)
fatal_protocol_error( thread, "partial read %d\n", ret );
- else if (errno != EWOULDBLOCK && errno != EAGAIN)
+ else if (!should_retry( errno ))
fatal_protocol_error( thread, "read: %s\n", strerror( errno ));
}
@@ -449,7 +456,7 @@ int receive_fd( struct process *process )
}
else
{
- if (errno != EWOULDBLOCK && errno != EAGAIN)
+ if (!should_retry( errno ))
{
fprintf( stderr, "Protocol error: process %04x: ", process->id );
perror( "recvmsg" );
diff --git a/server/sock.c b/server/sock.c
index dc10d2a..4f76163 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -1065,6 +1065,13 @@ static void ifchange_wake_up( struct object *obj, unsigned int status )
}
}
+static inline int should_retry( int err )
+{
+ if (err == EWOULDBLOCK) return 1;
+ if (err == EAGAIN) return 1;
+ return 0;
+}
+
static void ifchange_poll_event( struct fd *fd, int event )
{
struct object *ifchange = get_fd_user( fd );
@@ -1075,7 +1082,7 @@ static void ifchange_poll_event( struct fd *fd, int event )
r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT );
if (r < 0)
{
- if (errno == EWOULDBLOCK || errno == EAGAIN)
+ if (should_retry( errno ))
return; /* retry when poll() says the socket is ready */
status = sock_get_ntstatus( errno );
}
--
2.9.0

View File

@@ -1,4 +1,4 @@
From 71e593294e868bafa0b0b45c2694d7c0dceb0d64 Mon Sep 17 00:00:00 2001
From 23e0f029f1cc37d5d33bb39d5277371827b701aa Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 22 Mar 2016 21:54:48 +0100
Subject: d3d11: Avoid implicit cast of interface pointer.
@@ -8,16 +8,18 @@ Subject: d3d11: Avoid implicit cast of interface pointer.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index 1d9b766..78fc1ad 100644
index 5e48965..70eae5e 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -1559,5 +1559,5 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D1
@@ -2191,7 +2191,7 @@ struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D1
if (!iface)
return NULL;
assert(iface->lpVtbl == (ID3D10ShaderResourceViewVtbl *)&d3d10_shader_resource_view_vtbl);
- return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface);
+ return CONTAINING_RECORD((ID3D10ShaderResourceView1 *)iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView1_iface);
}
/* ID3D11UnorderedAccessView methods */
--
2.7.1
2.8.0

Some files were not shown because too many files have changed in this diff Show More