June 2019 - Wine-commits - list.winehq.org

Jeff Smith : d3drm: Implement d3drm_frame3_AddScale().
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 06321dcb1d708f94cfb64ad33e0f0950c52a1dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=06321dcb1d708f94cfb64ad3… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Jun 20 02:47:53 2019 +0430 d3drm: Implement d3drm_frame3_AddScale(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/frame.c | 59 +++++++++++++++++++++++++++++++++++++++++++----- dlls/d3drm/tests/d3drm.c | 45 ++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index e614af6..af1a3ac 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -1078,25 +1078,72 @@ static HRESULT WINAPI d3drm_frame1_AddTranslation(IDirect3DRMFrame *iface, static HRESULT WINAPI d3drm_frame3_AddScale(IDirect3DRMFrame3 *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + switch (type) + { + case D3DRMCOMBINE_REPLACE: + frame->transform = identity; + frame->transform._11 = sx; + frame->transform._22 = sy; + frame->transform._33 = sz; + break; + + case D3DRMCOMBINE_BEFORE: + frame->transform._11 *= sx; + frame->transform._12 *= sx; + frame->transform._13 *= sx; + frame->transform._21 *= sy; + frame->transform._22 *= sy; + frame->transform._23 *= sy; + frame->transform._31 *= sz; + frame->transform._32 *= sz; + frame->transform._33 *= sz; + break; + + case D3DRMCOMBINE_AFTER: + frame->transform._11 *= sx; + frame->transform._12 *= sy; + frame->transform._13 *= sz; + frame->transform._21 *= sx; + frame->transform._22 *= sy; + frame->transform._23 *= sz; + frame->transform._31 *= sx; + frame->transform._32 *= sy; + frame->transform._33 *= sz; + frame->transform._41 *= sx; + frame->transform._42 *= sy; + frame->transform._43 *= sz; + break; + + default: + FIXME("Unhandled type %#x.\n", type); + return D3DRMERR_BADVALUE; + } + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame2_AddScale(IDirect3DRMFrame2 *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + return d3drm_frame3_AddScale(&frame->IDirect3DRMFrame3_iface, type, sx, sy, sz); } static HRESULT WINAPI d3drm_frame1_AddScale(IDirect3DRMFrame *iface, D3DRMCOMBINETYPE type, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) { - FIXME("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e stub!\n", iface, type, sx, sy, sz); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface); - return E_NOTIMPL; + TRACE("iface %p, type %#x, sx %.8e, sy %.8e, sz %.8e.\n", iface, type, sx, sy, sz); + + return d3drm_frame3_AddScale(&frame->IDirect3DRMFrame3_iface, type, sx, sy, sz); } static HRESULT WINAPI d3drm_frame3_AddRotation(IDirect3DRMFrame3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a2fde98..0d18d08 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2870,6 +2870,51 @@ static void test_frame_transform(void) 0.0f, 0.0f, 2.0f, 0.0f, 3.0f, 3.0f, 3.0f, 1.0f, 1); + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_REPLACE, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_BEFORE, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f, 1); + + frame_set_transform(frame, + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 3.0f, 3.0f, 3.0f, 1.0f); + hr = IDirect3DRMFrame_AddScale(frame, D3DRMCOMBINE_AFTER, 2.0f, 2.0f, 2.0f); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DRMFrame_GetTransform(frame, matrix); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + expect_matrix(matrix, + 2.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 2.0f, 0.0f, + 6.0f, 6.0f, 6.0f, 1.0f, 1); + IDirect3DRMFrame_Release(frame); IDirect3DRM_Release(d3drm); }

1 0

Alexandre Julliard : sensapi: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: c8d80e83188933fb7257aaad70e3d0c691c0b08e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8d80e83188933fb7257aaad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:09:35 2019 +0200 sensapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sensapi/Makefile.in | 2 ++ dlls/sensapi/sensapi.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/sensapi/Makefile.in b/dlls/sensapi/Makefile.in index 8c88a26..98d96cf 100644 --- a/dlls/sensapi/Makefile.in +++ b/dlls/sensapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = sensapi.dll IMPORTLIB = sensapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ sensapi.c diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 0d2f212..0588036 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -22,8 +22,6 @@ * connections. For Wine we just report that we are always connected. */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> @@ -39,7 +37,6 @@ #include "uuids.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(sensapi);

1 0

Alexandre Julliard : serialui: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 0fb1d847e1421fe0e323e54efc257b2262cfd6ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fb1d847e1421fe0e323e54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:09:50 2019 +0200 serialui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/Makefile.in | 2 ++ dlls/serialui/confdlg.c | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 6c22afd..2f1377f 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -1,6 +1,8 @@ MODULE = serialui.dll IMPORTS = user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ confdlg.c diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index cc33505..45419ed 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -28,16 +28,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/unicode.h" - #include <string.h> #include <stdarg.h> #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winreg.h" #include "wingdi.h" #include "winuser.h" @@ -353,7 +350,7 @@ static INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM w return FALSE; SetWindowLongPtrW(hWnd, DWLP_USER, lParam); GetWindowTextW(hWnd, format, ARRAY_SIZE(format)); - snprintfW(szTitle, ARRAY_SIZE(szTitle), format, info->lpszDevice); + swprintf(szTitle, ARRAY_SIZE(szTitle), format, info->lpszDevice); SetWindowTextW(hWnd, szTitle); SERIALUI_DCBToDialogInfo(hWnd, info); return TRUE; @@ -501,7 +498,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( if(r != ERROR_SUCCESS) return FALSE; - snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); + swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { @@ -574,7 +571,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); if(r != ERROR_SUCCESS) return r; - snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); + swprintf(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) {

1 0

Alexandre Julliard : setupx: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 4fe7fcabb2d9fbf1f73e1a2d1dc896f6ddcd5950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe7fcabb2d9fbf1f73e1a2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:10:04 2019 +0200 setupx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupx.dll16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in index d7d6555..fa23cf1 100644 --- a/dlls/setupx.dll16/Makefile.in +++ b/dlls/setupx.dll16/Makefile.in @@ -1,7 +1,7 @@ MODULE = setupx.dll16 IMPORTS = setupapi user32 advapi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,setupapi.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,setupapi.dll C_SRCS = \ devinst16.c \

1 0

Alexandre Julliard : sfc: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 1ee679779e6b0d9353e794308be06bcd9accf5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ee679779e6b0d9353e79430… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:10:17 2019 +0200 sfc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in index 1d4916e..942d801 100644 --- a/dlls/sfc/Makefile.in +++ b/dlls/sfc/Makefile.in @@ -2,4 +2,6 @@ MODULE = sfc.dll IMPORTLIB = sfc IMPORTS = sfc_os +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = sfc_main.c

1 0

Alexandre Julliard : sfc_os: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: aa79882a2692db253a9b95ec04d7ab171c61d180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa79882a2692db253a9b95ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:10:23 2019 +0200 sfc_os: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc_os/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index 047850b..1329b2e 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -1,4 +1,6 @@ MODULE = sfc_os.dll IMPORTLIB = sfc_os +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = sfc_os.c

1 0

Alexandre Julliard : shcore: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 8c9f593e3be64337e39d3c9dc6e7f8a356c46d16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c9f593e3be64337e39d3c9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:10:42 2019 +0200 shcore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/Makefile.in | 2 ++ dlls/shcore/main.c | 18 ++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index ccef84e..2e33b3e 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,5 +1,7 @@ MODULE = shcore.dll IMPORTS = user32 gdi32 ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index fdf878e..6a62479 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define COBJMACROS @@ -33,7 +32,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shcore); @@ -389,12 +387,12 @@ WCHAR** WINAPI CommandLineToArgvW(const WCHAR *cmdline, int *numargs) * with it. This way the caller can make a single LocalFree() call to free * both, as per MSDN. */ - argv = LocalAlloc(LMEM_FIXED, (argc + 1) * sizeof(WCHAR *) + (strlenW(cmdline) + 1) * sizeof(WCHAR)); + argv = LocalAlloc(LMEM_FIXED, (argc + 1) * sizeof(WCHAR *) + (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); if (!argv) return NULL; /* --- Then split and copy the arguments */ - argv[0] = d = strcpyW((WCHAR *)(argv + argc + 1), cmdline); + argv[0] = d = lstrcpyW((WCHAR *)(argv + argc + 1), cmdline); argc = 1; /* The first argument, the executable path, follows special rules */ if (*d == '"') @@ -1005,7 +1003,7 @@ static HRESULT WINAPI filestream_Stat(IStream *iface, STATSTG *statstg, DWORD fl statstg->pwcsName = NULL; else { - int len = strlenW(stream->u.file.path); + int len = lstrlenW(stream->u.file.path); if ((statstg->pwcsName = CoTaskMemAlloc((len + 1) * sizeof(WCHAR)))) memcpy(statstg->pwcsName, stream->u.file.path, (len + 1) * sizeof(WCHAR)); } @@ -1116,7 +1114,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(const WCHAR *path, DWORD mode, DWORD attri stream->u.file.handle = hFile; stream->u.file.mode = mode; - len = strlenW(path); + len = lstrlenW(path); stream->u.file.path = heap_alloc((len + 1) * sizeof(WCHAR)); memcpy(stream->u.file.path, path, (len + 1) * sizeof(WCHAR)); @@ -1651,7 +1649,7 @@ HRESULT WINAPI SHStrDupW(const WCHAR *src, WCHAR **dest) if (!src) return E_INVALIDARG; - len = (strlenW(src) + 1) * sizeof(WCHAR); + len = (lstrlenW(src) + 1) * sizeof(WCHAR); *dest = CoTaskMemAlloc(len); if (!*dest) return E_OUTOFMEMORY; @@ -1741,7 +1739,7 @@ DWORD WINAPI SHUnicodeToUnicode(const WCHAR *src, WCHAR *dest, int dest_len) return 0; lstrcpynW(dest, src, dest_len); - ret = strlenW(dest); + ret = lstrlenW(dest); return src[ret] ? 0 : ret + 1; } @@ -2077,7 +2075,7 @@ DWORD WINAPI SHQueryValueExW(HKEY hkey, const WCHAR *name, DWORD *reserved, DWOR } else { - length = (strlenW(buff) + 1) * sizeof(WCHAR); + length = (lstrlenW(buff) + 1) * sizeof(WCHAR); value = heap_alloc(length); memcpy(value, buff, length); length = ExpandEnvironmentStringsW(value, buff, *buff_len / sizeof(WCHAR)); @@ -2208,7 +2206,7 @@ int WINAPI SHRegGetIntW(HKEY hkey, const WCHAR *value, int default_value) return default_value; if (*buff >= '0' && *buff <= '9') - return atoiW(buff); + return wcstol(buff, NULL, 10); return default_value; }

1 0

Alexandre Julliard : shdocvw: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 42c6ac27e88918ff33a62cfb72659dfde562b851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42c6ac27e88918ff33a62cfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:11:52 2019 +0200 shdocvw: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/Makefile.in | 2 ++ dlls/shdocvw/shdocvw.h | 1 - dlls/shdocvw/shdocvw_main.c | 3 --- dlls/shdocvw/shlinstobj.c | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 30b0a1a..7a71674 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -4,6 +4,8 @@ IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32 DELAYIMPORTS = version ole32 oleaut32 ieframe +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ shdocvw_main.c \ shlinstobj.c diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 8cac507..568fbad 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -34,7 +34,6 @@ #include "shlobj.h" #include "exdisp.h" -#include "wine/unicode.h" #include "wine/heap.h" #include "wine/list.h" diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 2657dfa..98d0d2c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -20,12 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> -#include "wine/unicode.h" #include "wine/debug.h" #include "shdocvw.h" diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 6f6786b..189c27c 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -35,7 +35,6 @@ #include "shdocvw.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);

1 0

Alexandre Julliard : shell: Build with msvcrt.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 931f2e450ad36a6e0eb9678d5791590f4c0d08f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=931f2e450ad36a6e0eb9678d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 20 09:12:13 2019 +0200 shell: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell.dll16/Makefile.in | 2 +- dlls/shell.dll16/shell.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in index dad637e..97308ee 100644 --- a/dlls/shell.dll16/Makefile.in +++ b/dlls/shell.dll16/Makefile.in @@ -1,7 +1,7 @@ MODULE = shell.dll16 IMPORTS = shell32 user32 gdi32 advapi32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,shell32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,shell32.dll C_SRCS = shell.c diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index 748db67..3e7c32a 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -20,15 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include <ctype.h> #include "windef.h"

1 0

Richard Pospesel : widl: Use FC_CHAR rather than FC_BYTE for boolean typedef to match midl.exe output.
by Alexandre Julliard 20 Jun '19

20 Jun '19

Module: wine Branch: master Commit: 28715ce34e9e406fc3761031bd0b52b2600b3333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28715ce34e9e406fc3761031… Author: Richard Pospesel <richard(a)torproject.org> Date: Wed Jun 5 18:34:14 2019 -0700 widl: Use FC_CHAR rather than FC_BYTE for boolean typedef to match midl.exe output. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47041 Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5d91085..1e5c8e1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1208,7 +1208,7 @@ void init_types(void) decl_builtin_basic("double", TYPE_BASIC_DOUBLE); decl_builtin_basic("error_status_t", TYPE_BASIC_ERROR_STATUS_T); decl_builtin_basic("handle_t", TYPE_BASIC_HANDLE); - decl_builtin_alias("boolean", type_new_basic(TYPE_BASIC_BYTE)); + decl_builtin_alias("boolean", type_new_basic(TYPE_BASIC_CHAR)); } static str_list_t *append_str(str_list_t *list, char *str)

1 0