September 2016 - Wine-Commits

Sebastian Lackner : taskschd: Do not return ERROR_* constant in HRESULT function.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: e16b9f757b410a5f29ef0e9b3cd1d19a31e33057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16b9f757b410a5f29ef0e9b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 17:46:10 2016 +0200 taskschd: Do not return ERROR_* constant in HRESULT function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder.c | 2 +- dlls/taskschd/tests/scheduler.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index c0eb1fb..26993ca 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -417,7 +417,7 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (path) { int len = strlenW(path); - if (len && path[len - 1] == '\\') return ERROR_INVALID_NAME; + if (len && path[len - 1] == '\\') return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } folder_path = get_full_path(parent, path); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 20f8845..4976f4c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -217,7 +217,6 @@ todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); @@ -297,7 +296,6 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2);

1 0

Sebastian Lackner : dxva2: Return E_NOTIMPL from GetPhysicalMonitorsFromIDirect3DDevice9 stub.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 69e49122ec113360656f8e444e117254e89bbe22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e49122ec113360656f8e444… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:13:20 2016 +0200 dxva2: Return E_NOTIMPL from GetPhysicalMonitorsFromIDirect3DDevice9 stub. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index b4704f0..782f0df 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -187,8 +187,7 @@ HRESULT WINAPI GetPhysicalMonitorsFromIDirect3DDevice9( IDirect3DDevice9 *device { FIXME("(%p, 0x%x, %p): stub\n", device, arraySize, array); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return E_NOTIMPL; } BOOL WINAPI GetTimingReport( HMONITOR monitor, LPMC_TIMING_REPORT timingReport )

1 0

Sebastian Lackner : user32: Fix definition of DeregisterShellHookWindow.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: acdf0012617522327c344cc73740ef3ac8f60388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdf0012617522327c344cc73… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:10:45 2016 +0200 user32: Fix definition of DeregisterShellHookWindow. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index beed6aa..fa0502e 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -538,7 +538,7 @@ void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved) /*********************************************************************** * RegisterShellHookWindow [USER32.@] */ -BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) +BOOL WINAPI RegisterShellHookWindow(HWND hWnd) { FIXME("(%p): stub\n", hWnd); return FALSE; @@ -548,11 +548,10 @@ BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) /*********************************************************************** * DeregisterShellHookWindow [USER32.@] */ -HRESULT WINAPI DeregisterShellHookWindow ( DWORD u ) +BOOL WINAPI DeregisterShellHookWindow(HWND hWnd) { - FIXME("0x%08x stub\n",u); - return 0; - + FIXME("(%p): stub\n", hWnd); + return FALSE; }

1 0

Sebastian Lackner : include: Fix declaration of DwmDefWindowProc.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 980589471ec7af584dc5bfd60664a955792c44eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=980589471ec7af584dc5bfd60… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:16:44 2016 +0200 include: Fix declaration of DwmDefWindowProc. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwmapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwmapi.h b/include/dwmapi.h index f5191e1..b2f39de 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -136,7 +136,7 @@ typedef struct _DWM_PRESENT_PARAMETERS { #include <poppack.h> -DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); +DWMAPI_(BOOL) DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL);

1 0

Sebastian Lackner : shlwapi: Return E_NOTIMPL for unknown types in StrRetToBuf{A, W}.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 0198d0d56a47e22d7d08c72ffb262183e57b2070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0198d0d56a47e22d7d08c72ff… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Sep 13 23:20:28 2016 +0200 shlwapi: Return E_NOTIMPL for unknown types in StrRetToBuf{A,W}. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 4d77c3f..8c4cb71 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1509,7 +1509,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U default: FIXME("unknown type!\n"); - return FALSE; + return E_NOTIMPL; } return S_OK; } @@ -1559,7 +1559,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, default: FIXME("unknown type!\n"); - return FALSE; + return E_NOTIMPL; } return S_OK; }

1 0

Alexandre Julliard : user32: Fix GetClipboardFormatName behavior for integer formats.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: 4bdcf512cf5c93ec4833ed772cfe87770ef970e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdcf512cf5c93ec4833ed772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 14:20:31 2016 +0900 user32: Fix GetClipboardFormatName behavior for integer formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 12 ++++++------ dlls/user32/tests/clipboard.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 326ea03..d8fb68d 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -456,20 +456,20 @@ UINT WINAPI RegisterClipboardFormatA( LPCSTR name ) /************************************************************************** * GetClipboardFormatNameW (USER32.@) */ -INT WINAPI GetClipboardFormatNameW(UINT wFormat, LPWSTR retStr, INT maxlen) +INT WINAPI GetClipboardFormatNameW( UINT format, LPWSTR buffer, INT maxlen ) { - if (wFormat < MAXINTATOM) return 0; - return GlobalGetAtomNameW( wFormat, retStr, maxlen ); + if (format < MAXINTATOM || format > 0xffff) return 0; + return GlobalGetAtomNameW( format, buffer, maxlen ); } /************************************************************************** * GetClipboardFormatNameA (USER32.@) */ -INT WINAPI GetClipboardFormatNameA(UINT wFormat, LPSTR retStr, INT maxlen) +INT WINAPI GetClipboardFormatNameA( UINT format, LPSTR buffer, INT maxlen ) { - if (wFormat < MAXINTATOM) return 0; - return GlobalGetAtomNameA( wFormat, retStr, maxlen ); + if (format < MAXINTATOM || format > 0xffff) return 0; + return GlobalGetAtomNameA( format, buffer, maxlen ); } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index ff5b6fb..61b0d2c 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -416,12 +416,12 @@ todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); } - for (format_id = 0; format_id < 0xffff; format_id++) + for (format_id = 0; format_id < 0x10fff; format_id++) { SetLastError(0xdeadbeef); len = GetClipboardFormatNameA(format_id, buf, 256); - if (format_id < 0xc000) + if (format_id < 0xc000 || format_id > 0xffff) ok(!len, "GetClipboardFormatNameA should fail, but it returned %d (%s)\n", len, buf); else if (len && winetest_debug > 1) trace("%04x: %s\n", format_id, len ? buf : "");

1 0

Bruno Jesus : dinput: Improve linux effect debugging.
by Alexandre Julliard Sept. 14, 2016

Sept. 14, 2016

Module: wine Branch: master Commit: ab5ad7dc0b8e4c4c3f3694858a6db95f53cda5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5ad7dc0b8e4c4c3f3694858… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 14 02:25:33 2016 -0300 dinput: Improve linux effect debugging. Based on ideas by Elias Vanderstuyft. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index bb45792..d3fede5 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -97,10 +97,10 @@ static void ff_dump_effect(struct ff_effect *effect) if (effect->replay.length) length = wine_dbg_sprintf("%u ms", effect->replay.length); - TRACE("type: 0x%x %s, id %d, direction 0x%x (angle: %.2f), time length %s, start delay %u ms\n", + TRACE("type 0x%x %s, id %d, direction 0x%x (source angle %.2f), time length %s, start delay %u ms\n", effect->type, type, effect->id, effect->direction, angle, length, effect->replay.delay); if (effect->trigger.button || effect->trigger.interval) - TRACE("trigger button %u, re-trigger interval %u ms\n", + TRACE(" -> trigger button %u, re-trigger interval %u ms\n", effect->trigger.button, effect->trigger.interval); if (effect->type == FF_PERIODIC) @@ -118,8 +118,9 @@ static void ff_dump_effect(struct ff_effect *effect) FE(FF_CUSTOM); } #undef FE - TRACE(" -> waveform 0x%x %s, period %u, magnitude %d, offset %d, phase %u, custom len %d\n", - per->waveform, wave, per->period, per->magnitude, per->offset, per->phase, per->custom_len); + angle = ff_effect_direction_to_rad(per->phase) * 180 / M_PI; + TRACE(" -> waveform 0x%x %s, period %u ms, magnitude %d, offset %d, phase 0x%x (angle %.2f), custom len %d\n", + per->waveform, wave, per->period, per->magnitude, per->offset, per->phase, angle, per->custom_len); env = &per->envelope; } else if (effect->type == FF_CONSTANT) @@ -137,7 +138,7 @@ static void ff_dump_effect(struct ff_effect *effect) else if (effect->type == FF_RUMBLE) { struct ff_rumble_effect *rumble = &effect->u.rumble; - TRACE(" -> strong/weak magnitude %d/%d\n", rumble->strong_magnitude, rumble->weak_magnitude); + TRACE(" -> strong/weak magnitude %u/%u\n", rumble->strong_magnitude, rumble->weak_magnitude); } else if (effect->type == FF_SPRING || effect->type == FF_FRICTION || effect->type == FF_DAMPER || effect->type == FF_INERTIA) @@ -154,7 +155,7 @@ static void ff_dump_effect(struct ff_effect *effect) } if (env) - TRACE(" -> envelope attack length/level %u/%u, fade length/level %u/%u\n", + TRACE(" -> envelope attack length(ms)/level %u/%u, fade length(ms)/level %u/%u\n", env->attack_length, env->attack_level, env->fade_length, env->fade_level); }

1 0

Andrey Gusev : api-ms-win-core-atoms-l1-1-0: Add dll.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 78bbde2e5fe590248de32c5bce38b3cd7adaf57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bbde2e5fe590248de32c5bc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 13 12:24:41 2016 +0300 api-ms-win-core-atoms-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-atoms-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-atoms-l1-1-0.spec | 17 +++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 22 insertions(+) diff --git a/configure b/configure index 2e2186b..7acd339 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_actxprxy enable_advapi32 enable_advpack enable_amstream +enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_console_l1_1_0 @@ -17531,6 +17532,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 diff --git a/configure.ac b/configure.ac index db9c6e4..4944d23 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) diff --git a/dlls/api-ms-win-core-atoms-l1-1-0/Makefile.in b/dlls/api-ms-win-core-atoms-l1-1-0/Makefile.in new file mode 100644 index 0000000..3c6a688 --- /dev/null +++ b/dlls/api-ms-win-core-atoms-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-atoms-l1-1-0.dll diff --git a/dlls/api-ms-win-core-atoms-l1-1-0/api-ms-win-core-atoms-l1-1-0.spec b/dlls/api-ms-win-core-atoms-l1-1-0/api-ms-win-core-atoms-l1-1-0.spec new file mode 100644 index 0000000..0cebce0 --- /dev/null +++ b/dlls/api-ms-win-core-atoms-l1-1-0/api-ms-win-core-atoms-l1-1-0.spec @@ -0,0 +1,17 @@ +@ stdcall AddAtomA(str) kernel32.AddAtomA +@ stdcall AddAtomW(wstr) kernel32.AddAtomW +@ stdcall DeleteAtom(long) kernel32.DeleteAtom +@ stdcall FindAtomA(str) kernel32.FindAtomA +@ stdcall FindAtomW(wstr) kernel32.FindAtomW +@ stdcall GetAtomNameA(long ptr long) kernel32.GetAtomNameA +@ stdcall GetAtomNameW(long ptr long) kernel32.GetAtomNameW +@ stdcall GlobalAddAtomA(str) kernel32.GlobalAddAtomA +@ stub GlobalAddAtomExA +@ stub GlobalAddAtomExW +@ stdcall GlobalAddAtomW(wstr) kernel32.GlobalAddAtomW +@ stdcall GlobalDeleteAtom(long) kernel32.GlobalDeleteAtom +@ stdcall GlobalFindAtomA(str) kernel32.GlobalFindAtomA +@ stdcall GlobalFindAtomW(wstr) kernel32.GlobalFindAtomW +@ stdcall GlobalGetAtomNameA(long ptr long) kernel32.GlobalGetAtomNameA +@ stdcall GlobalGetAtomNameW(long ptr long) kernel32.GlobalGetAtomNameW +@ stdcall InitAtomTable(long) kernel32.InitAtomTable diff --git a/tools/make_specfiles b/tools/make_specfiles index 6cfc4f0..d8ea7c5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -127,6 +127,7 @@ my @dll_groups = "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", + "api-ms-win-core-atoms-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-delayload-l1-1-1",

1 0

Michael Stefaniuc : oleaut32/tests: Avoid casts from COM object to interface.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 9e5f9209973d1af2f48ba65d3f75a97a7fb10035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5f9209973d1af2f48ba65d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 13 10:27:18 2016 +0200 oleaut32/tests: Avoid casts from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 00b2919..0e86ffb 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -723,12 +723,13 @@ static void test_VariantClear(void) /* DISPATCH */ V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = (IDispatch*)&test_myVariantClearImpl; + V_DISPATCH(&v) = (IDispatch*)&test_myVariantClearImpl.IUnknown_iface; test_myVariantClearImpl.events = 0; hres = VariantClear(&v); ok(hres == S_OK, "ret %08x\n", hres); ok(V_VT(&v) == 0, "vt %04x\n", V_VT(&v)); - ok(V_DISPATCH(&v) == (IDispatch*)&test_myVariantClearImpl, "dispatch %p\n", V_DISPATCH(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&test_myVariantClearImpl.IUnknown_iface, + "dispatch %p\n", V_DISPATCH(&v)); /* Check that Release got called, but nothing else */ ok(test_myVariantClearImpl.events == 0x4, "Unexpected call. events %08x\n", test_myVariantClearImpl.events);

1 0

Hans Leidekker : include: Fix aligment of some Web Services structures.
by Alexandre Julliard Sept. 13, 2016

Sept. 13, 2016

Module: wine Branch: master Commit: 4e9cc305bb1a758eb70419318c7c41c2918fc180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9cc305bb1a758eb70419318… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 13 14:31:37 2016 +0200 include: Fix aligment of some Web Services structures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index 0a58641..f09d15b 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -360,8 +360,8 @@ typedef struct _WS_INT32_DESCRIPTION { } WS_INT32_DESCRIPTION; typedef struct _WS_INT64_DESCRIPTION { - __int64 minValue; - __int64 maxValue; + __int64 DECLSPEC_ALIGN(8) minValue; + __int64 DECLSPEC_ALIGN(8) maxValue; } WS_INT64_DESCRIPTION; typedef struct _WS_UINT8_DESCRIPTION { @@ -380,8 +380,8 @@ typedef struct _WS_UINT32_DESCRIPTION { } WS_UINT32_DESCRIPTION; typedef struct _WS_UINT64_DESCRIPTION { - unsigned __int64 minValue; - unsigned __int64 maxValue; + unsigned __int64 DECLSPEC_ALIGN(8) minValue; + unsigned __int64 DECLSPEC_ALIGN(8) maxValue; } WS_UINT64_DESCRIPTION; typedef struct _WS_WSZ_DESCRIPTION { @@ -412,8 +412,8 @@ struct _WS_ENUM_DESCRIPTION { }; struct _WS_DOUBLE_DESCRIPTION { - double minValue; - double maxValue; + double DECLSPEC_ALIGN(8) minValue; + double DECLSPEC_ALIGN(8) maxValue; }; struct _WS_GUID_DESCRIPTION { @@ -595,17 +595,17 @@ typedef struct _WS_XML_INT32_TEXT { typedef struct _WS_XML_INT64_TEXT { WS_XML_TEXT text; - __int64 value; + __int64 DECLSPEC_ALIGN(8) value; } WS_XML_INT64_TEXT; typedef struct _WS_XML_UINT64_TEXT { WS_XML_TEXT text; - unsigned __int64 value; + unsigned __int64 DECLSPEC_ALIGN(8) value; } WS_XML_UINT64_TEXT; typedef struct _WS_XML_DOUBLE_TEXT { WS_XML_TEXT text; - double value; + double DECLSPEC_ALIGN(8) value; } WS_XML_DOUBLE_TEXT; typedef struct _WS_XML_GUID_TEXT { @@ -1097,7 +1097,7 @@ typedef enum { } WS_DATETIME_FORMAT; struct _WS_DATETIME { - unsigned __int64 ticks; + unsigned __int64 DECLSPEC_ALIGN(8) ticks; WS_DATETIME_FORMAT format; };

1 0