February 2017 - Wine-commits

Henri Verbeet : wined3d: Use the command stream state in wined3d_cs_exec_clear().
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 97266441f4756024821b71afb61c7ba6f0b26fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=97266441f4756024821b71afb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 07:46:35 2017 +0100 wined3d: Use the command stream state in wined3d_cs_exec_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fa7c6dd..c686181 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -387,17 +387,16 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) { + const struct wined3d_state *state = &cs->state; const struct wined3d_cs_clear *op = data; - const struct wined3d_state *state; struct wined3d_device *device; unsigned int i; RECT draw_rect; device = cs->device; - state = &device->state; wined3d_get_draw_rect(state, &draw_rect); device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - cs->state.fb, op->rect_count, op->rects, &draw_rect, op->flags, + state->fb, op->rect_count, op->rects, &draw_rect, op->flags, &op->color, op->depth, op->stencil); if (op->flags & WINED3DCLEAR_TARGET)

1 0

Francois Gouget : gdiplus: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 43e36d62a12bd4b2306774cce8c92313ad85c7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e36d62a12bd4b2306774cce… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:26:09 2017 +0100 gdiplus: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index dd210fc..9b0151b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -48,22 +48,19 @@ #define GIF_DISPOSE_RESTORE_TO_BKGND 2 #define GIF_DISPOSE_RESTORE_TO_PREV 3 -static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_alloc_zero(size_t len) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static void *heap_realloc(void *mem, size_t len) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

André Hentschel : mscoree: Fix some spec file entries.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: aa91a9a3ac1c6b27f5716cba6c63489bbb92d68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa91a9a3ac1c6b27f5716cba6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:22:57 2017 +0100 mscoree: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 93248e2..3715b7c 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -38,7 +38,7 @@ @ stub EEDllGetClassObjectFromClass @ stub EEDllRegisterServer @ stub EEDllUnregisterServer -@ stdcall GetAssemblyMDImport(ptr ptr ptr) +@ stdcall GetAssemblyMDImport(wstr ptr ptr) @ stub GetCORRequiredVersion @ stub GetCORRootDirectory @ stdcall GetCORSystemDirectory(ptr long ptr) @@ -69,7 +69,7 @@ @ stub GetXMLElement @ stub GetXMLElementAttribute @ stub GetXMLObject -@ stdcall LoadLibraryShim(ptr ptr ptr ptr) +@ stdcall LoadLibraryShim(wstr wstr ptr ptr) @ stub LoadLibraryWithPolicyShim @ stdcall LoadStringRCEx(long long ptr long long ptr) @ stdcall LockClrVersion(ptr ptr ptr) @@ -116,4 +116,4 @@ @ stdcall _CorExeMain2(ptr long ptr ptr ptr) @ stdcall _CorExeMain() @ stdcall _CorImageUnloading(ptr) -@ stdcall _CorValidateImage(ptr ptr) +@ stdcall _CorValidateImage(ptr wstr)

1 0

André Hentschel : gdiplus: Fix GdipCreateStreamOnFile spec file entry.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 7f2543180ea97958add330c05bc9ee62d4ebb0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2543180ea97958add330c05… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:00 2017 +0100 gdiplus: Fix GdipCreateStreamOnFile spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8cf5ab3..dd8d909 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -120,7 +120,7 @@ 120 stdcall GdipCreateRegionRectI(ptr ptr) 121 stdcall GdipCreateRegionRgnData(ptr long ptr) 122 stdcall GdipCreateSolidFill(long ptr) -123 stdcall GdipCreateStreamOnFile(ptr long ptr) +123 stdcall GdipCreateStreamOnFile(wstr long ptr) 124 stdcall GdipCreateStringFormat(long long ptr) 125 stdcall GdipCreateTexture2(ptr long float float float float ptr) 126 stdcall GdipCreateTexture2I(ptr long long long long long ptr)

1 0

André Hentschel : user32: Fix some spec file entries.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: b05c000c915dccd5317e39dc0270970744d42f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05c000c915dccd5317e39dc0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:05 2017 +0100 user32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c2d43e7..6f2703a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -90,14 +90,14 @@ @ stdcall CreateDialogIndirectParamA(long ptr long ptr long) @ stdcall CreateDialogIndirectParamAorW(long ptr long ptr long long) @ stdcall CreateDialogIndirectParamW(long ptr long ptr long) -@ stdcall CreateDialogParamA(long ptr long ptr long) -@ stdcall CreateDialogParamW(long ptr long ptr long) +@ stdcall CreateDialogParamA(long str long ptr long) +@ stdcall CreateDialogParamW(long wstr long ptr long) @ stdcall CreateIcon(long long long long long ptr ptr) @ stdcall CreateIconFromResource (ptr long long long) @ stdcall CreateIconFromResourceEx(ptr long long long long long long) @ stdcall CreateIconIndirect(ptr) -@ stdcall CreateMDIWindowA(ptr ptr long long long long long long long long) -@ stdcall CreateMDIWindowW(ptr ptr long long long long long long long long) +@ stdcall CreateMDIWindowA(str str long long long long long long long long) +@ stdcall CreateMDIWindowW(wstr wstr long long long long long long long long) @ stdcall CreateMenu() @ stdcall CreatePopupMenu() # @ stub CreateSystemThreads @@ -521,10 +521,10 @@ @ stdcall MsgWaitForMultipleObjectsEx(long ptr long long long) @ stdcall NotifyWinEvent(long long long long) @ stdcall OemKeyScan(long) -@ stdcall OemToCharA(ptr ptr) +@ stdcall OemToCharA(str ptr) @ stdcall OemToCharBuffA(ptr ptr long) @ stdcall OemToCharBuffW(ptr ptr long) -@ stdcall OemToCharW(ptr ptr) +@ stdcall OemToCharW(str ptr) @ stdcall OffsetRect(ptr long long) @ stdcall OpenClipboard(long) @ stdcall OpenDesktopA(str long long long) @@ -631,7 +631,7 @@ @ stub SetCursorContents @ stdcall SetCursorPos(long long) @ stdcall SetDebugErrorLevel(long) -@ stdcall SetDeskWallPaper(ptr) +@ stdcall SetDeskWallPaper(str) # @ stub SetDeskWallpaper # @ stub SetDesktopBitmap @ stdcall SetDlgItemInt(long long long long)

1 0

André Hentschel : oleaut32: Fix OleLoadPictureEx spec file entry.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: d90fcb426772316133279c0ae87f97055284da82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90fcb426772316133279c0ae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:06 2017 +0100 oleaut32: Fix OleLoadPictureEx spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 680a588..dccdb5f 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -377,7 +377,7 @@ 397 stub UserMSG_to_local 398 stub UserMSG_free_inst 399 stub UserMSG_free_local -401 stdcall OleLoadPictureEx(ptr long long long long long long ptr) +401 stdcall OleLoadPictureEx(ptr long long ptr long long long ptr) 402 stub OleLoadPictureFileEx 411 stdcall SafeArrayCreateVector(long long long) 412 stdcall SafeArrayCopyData(ptr ptr)

1 0

André Hentschel : kernel32: Fix some more spec file entries.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 88eef73fc876789e32a7cb82cf39c1b18736e398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88eef73fc876789e32a7cb82c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:07 2017 +0100 kernel32: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a6cefef..388f7c0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1349,8 +1349,8 @@ @ stdcall SetConsoleFont(long long) @ stub SetConsoleHardwareState @ stdcall SetConsoleIcon(ptr) -@ stdcall SetConsoleInputExeNameA(ptr) -@ stdcall SetConsoleInputExeNameW(ptr) +@ stdcall SetConsoleInputExeNameA(str) +@ stdcall SetConsoleInputExeNameW(wstr) @ stdcall SetConsoleKeyShortcuts(long long ptr long) @ stub SetConsoleLocalEUDC @ stub SetConsoleMaximumWindowSize

1 0

André Hentschel : mscms: Fix some spec file entries.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: cd55d5dcc980a8aa5fe83f40e0018cc6a661a9f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd55d5dcc980a8aa5fe83f40e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:09 2017 +0100 mscms: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/mscms.spec | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index e420dd8..dd404f1 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -1,5 +1,5 @@ -@ stdcall AssociateColorProfileWithDeviceA(ptr ptr ptr) -@ stdcall AssociateColorProfileWithDeviceW(ptr ptr ptr) +@ stdcall AssociateColorProfileWithDeviceA(str str str) +@ stdcall AssociateColorProfileWithDeviceW(wstr wstr wstr) @ stdcall CheckBitmapBits(ptr ptr ptr long long long ptr ptr long) @ stdcall CheckColors(ptr ptr long long ptr) @ stdcall CloseColorProfile(ptr) @@ -12,14 +12,14 @@ @ stdcall CreateProfileFromLogColorSpaceA(ptr ptr) @ stdcall CreateProfileFromLogColorSpaceW(ptr ptr) @ stdcall DeleteColorTransform(ptr) -@ stdcall DisassociateColorProfileFromDeviceA(ptr ptr ptr) -@ stdcall DisassociateColorProfileFromDeviceW(ptr ptr ptr) -@ stdcall EnumColorProfilesA(ptr ptr ptr ptr ptr) -@ stdcall EnumColorProfilesW(ptr ptr ptr ptr ptr) +@ stdcall DisassociateColorProfileFromDeviceA(str str str) +@ stdcall DisassociateColorProfileFromDeviceW(wstr wstr wstr) +@ stdcall EnumColorProfilesA(str ptr ptr ptr ptr) +@ stdcall EnumColorProfilesW(wstr ptr ptr ptr ptr) @ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long) @ stdcall GetCMMInfo(ptr long) -@ stdcall GetColorDirectoryA(ptr ptr ptr) -@ stdcall GetColorDirectoryW(ptr ptr ptr) +@ stdcall GetColorDirectoryA(str ptr ptr) +@ stdcall GetColorDirectoryW(wstr ptr ptr) @ stdcall GetColorProfileElement(ptr long long ptr ptr ptr) @ stdcall GetColorProfileElementTag(ptr long ptr) @ stdcall GetColorProfileFromHandle(ptr ptr ptr) @@ -29,10 +29,10 @@ @ stdcall GetPS2ColorRenderingDictionary(ptr long ptr ptr ptr) @ stdcall GetPS2ColorRenderingIntent(ptr long ptr ptr) @ stdcall GetPS2ColorSpaceArray(ptr long long ptr ptr ptr) -@ stdcall GetStandardColorSpaceProfileA(ptr long ptr ptr) -@ stdcall GetStandardColorSpaceProfileW(ptr long ptr ptr) -@ stdcall InstallColorProfileA(ptr ptr) -@ stdcall InstallColorProfileW(ptr ptr) +@ stdcall GetStandardColorSpaceProfileA(str long ptr ptr) +@ stdcall GetStandardColorSpaceProfileW(wstr long ptr ptr) +@ stdcall InstallColorProfileA(str str) +@ stdcall InstallColorProfileW(wstr wstr) @ stub InternalGetDeviceConfig @ stub InternalGetPS2CSAFromLCS @ stub InternalGetPS2ColorRenderingDictionary @@ -43,19 +43,19 @@ @ stdcall IsColorProfileValid(ptr ptr) @ stdcall OpenColorProfileA(ptr long long long) @ stdcall OpenColorProfileW(ptr long long long) -@ stdcall RegisterCMMA(ptr long ptr) -@ stdcall RegisterCMMW(ptr long ptr) +@ stdcall RegisterCMMA(str long str) +@ stdcall RegisterCMMW(wstr long wstr) @ stdcall SelectCMM(long) @ stdcall SetColorProfileElement(ptr long long ptr ptr) @ stdcall SetColorProfileElementReference(ptr long long) @ stdcall SetColorProfileElementSize(ptr long long) @ stdcall SetColorProfileHeader(ptr ptr) -@ stdcall SetStandardColorSpaceProfileA(ptr long ptr) -@ stdcall SetStandardColorSpaceProfileW(ptr long ptr) +@ stdcall SetStandardColorSpaceProfileA(str long str) +@ stdcall SetStandardColorSpaceProfileW(wstr long wstr) @ stdcall SpoolerCopyFileEvent(wstr wstr long) @ stdcall TranslateBitmapBits(ptr ptr long long long long ptr long long ptr long) @ stdcall TranslateColors(ptr ptr long long ptr long) -@ stdcall UninstallColorProfileA(ptr ptr long) -@ stdcall UninstallColorProfileW(ptr ptr long) -@ stdcall UnregisterCMMA(ptr long) -@ stdcall UnregisterCMMW(ptr long) +@ stdcall UninstallColorProfileA(str str long) +@ stdcall UninstallColorProfileW(wstr wstr long) +@ stdcall UnregisterCMMA(str long) +@ stdcall UnregisterCMMW(wstr long)

1 0

André Hentschel : msvcrt: Fix _CxxThrowException spec file entry.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 673ef69309347f5aacb1658027933bb66d66618e URL: http://source.winehq.org/git/wine.git/?a=commit;h=673ef69309347f5aacb165802… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:04 2017 +0100 msvcrt: Fix _CxxThrowException spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d1cd0b4..741ca2e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1,5 +1,5 @@ @ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo -@ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog @ cdecl _FindAndUnlinkFrame(ptr) ucrtbase._FindAndUnlinkFrame @ stub _GetImageBase diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a70e83..915410b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -523,7 +523,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _FindAndUnlinkFrame(ptr) @ cdecl _Getdays() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 77a4ab6..32b1644 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -843,7 +843,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise @ cdecl _FindAndUnlinkFrame(ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a447fde..e08aa33 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -826,7 +826,7 @@ @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ stub _Cbuild @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise @ stub _FCbuild diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 96413a0..d4601f8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -820,7 +820,7 @@ @ cdecl -arch=i386 _CItanh() msvcr120._CItanh @ stub _Cbuild @ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo -@ stdcall _CxxThrowException(long long) msvcr120._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog @ stub -arch=arm _FPE_Raise @ stub _FCbuild diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index ca3ff87..e67d5e2 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -108,7 +108,7 @@ @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7e6d7c0..6411144 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -102,7 +102,7 @@ @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d488651..d4821da 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -153,7 +153,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _FindAndUnlinkFrame(ptr) @ stub -arch=win64 _GetImageBase diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0157f42..0dc60df 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -150,7 +150,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _FindAndUnlinkFrame(ptr) @ cdecl _Getdays() diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 589bc1d..a426d94 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2187843..dd7db71 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -790,7 +790,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a1e14f8..17cbd78 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -864,7 +864,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcrt._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 34ad1d3..21312d2 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -116,7 +116,7 @@ @ stub _CrtSetReportFile @ cdecl _CrtSetReportHook(ptr) @ cdecl _CrtSetReportMode(long long) -@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcrt._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4bcd12e..6b349ee 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -18,7 +18,7 @@ @ stub _Cmulcc @ stub _Cmulcr @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub _Exit @ stub _FCbuild diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 1b9f3f9..fe8ae75 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -1,5 +1,5 @@ @ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo -@ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog @ cdecl _FindAndUnlinkFrame(ptr) ucrtbase._FindAndUnlinkFrame @ cdecl _IsExceptionObjectToBeDestroyed(ptr) ucrtbase._IsExceptionObjectToBeDestroyed

1 0

Huw Davies : widl: Add missing width and alignment for VARIANT.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 5a06b6b035b105d8ead9f64698f7b458fa9cfa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a06b6b035b105d8ead9f6469… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Feb 25 10:09:14 2017 +0000 widl: Add missing width and alignment for VARIANT. Spotted by André Hentschel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7904e45..4b09317 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -885,6 +885,8 @@ static int encode_type( case VT_VARIANT: *encoded_type = default_type; + *width = 8 + 2 * pointer_size; + *alignment = 8; break; case VT_LPSTR:

1 0