Author: akhaldi
Date: Wed Apr 15 18:10:59 2015
New Revision: 67207
URL:
http://svn.reactos.org/svn/reactos?rev=67207&view=rev
Log:
[PROPSYS_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
Modified:
trunk/rostests/winetests/propsys/propsys.c
Modified: trunk/rostests/winetests/propsys/propsys.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/propsys…
==============================================================================
--- trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/propsys/propsys.c [iso-8859-1] Wed Apr 15 18:10:59 2015
@@ -117,19 +117,19 @@
{NULL, NULL, 0, E_POINTER},
{&prop, NULL, 0, E_POINTER},
{&prop, NULL, PKEYSTR_MAX, E_POINTER},
- {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
- {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),
zero_fillerW, FALSE, 0, TRUE, fillerW},
- {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
- {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),
fillerW},
- {&prop, out, GUIDSTRING_MAX + 1,
HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
- {&prop, out, GUIDSTRING_MAX + 2,
HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE,
truncatedW},
- {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),
zero_truncated2W, TRUE, S_OK, TRUE, truncated2W},
- {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),
zero_truncated3W, TRUE, S_OK, TRUE, truncated3W},
+ {NULL, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW},
+ {NULL, out, PKEYSTR_MAX, E_NOT_SUFFICIENT_BUFFER, zero_fillerW, FALSE, 0, TRUE,
fillerW},
+ {&prop, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW},
+ {&prop, out, GUIDSTRING_MAX, E_NOT_SUFFICIENT_BUFFER, fillerW},
+ {&prop, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW},
+ {&prop, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncatedW,
TRUE, S_OK, TRUE, truncatedW},
+ {&prop, out, PKEYSTR_MAX - 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated2W,
TRUE, S_OK, TRUE, truncated2W},
+ {&prop, out, PKEYSTR_MAX - 1, E_NOT_SUFFICIENT_BUFFER, zero_truncated3W,
TRUE, S_OK, TRUE, truncated3W},
{&prop, out, PKEYSTR_MAX, S_OK, expectedW},
- {&prop2, out, GUIDSTRING_MAX + 2,
HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE,
truncated4W},
+ {&prop2, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated4W,
TRUE, S_OK, TRUE, truncated4W},
{&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W},
{&prop2, out, PKEYSTR_MAX, S_OK, expected2W},
- {&prop3, out, GUIDSTRING_MAX + 1,
HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
+ {&prop3, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW},
{&prop3, out, GUIDSTRING_MAX + 2, S_OK, expected3W},
{&prop3, out, PKEYSTR_MAX, S_OK, expected3W},
};