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

Zebediah Figura : quartz/tests: Add some tests for IEnumMediaTypes().
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: f8b6b55c5f2e10f2bf3b988b896fc96bab9c4b0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8b6b55c5f2e10f2bf3b988b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 27 20:22:26 2019 -0500 quartz/tests: Add some tests for IEnumMediaTypes(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 78 +++++++++++++++- dlls/quartz/tests/avisplit.c | 119 ++++++++++++++++++++++++ dlls/quartz/tests/dsoundrender.c | 82 +++++++++++++++++ dlls/quartz/tests/filesource.c | 107 ++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 188 ++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 45 +++++++++ dlls/quartz/tests/vmr7.c | 46 ++++++++++ dlls/quartz/tests/vmr9.c | 46 ++++++++++ dlls/quartz/tests/waveparser.c | 119 ++++++++++++++++++++++++ 9 files changed, 829 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f8b6b55c5f2e10f2bf3b…

1 0

Alexandre Julliard : xpssvcs: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: cb9e8fcc87e929320a686f3f720e4be25912d805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9e8fcc87e929320a686f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:55 2019 +0200 xpssvcs: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xpssvcs/Makefile.in | 2 ++ dlls/xpssvcs/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xpssvcs/Makefile.in b/dlls/xpssvcs/Makefile.in index ba07c0d..bb41d26 100644 --- a/dlls/xpssvcs/Makefile.in +++ b/dlls/xpssvcs/Makefile.in @@ -1,4 +1,6 @@ MODULE = xpssvcs.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/xpssvcs/main.c b/dlls/xpssvcs/main.c index 36ec42d..39fb3c3 100644 --- a/dlls/xpssvcs/main.c +++ b/dlls/xpssvcs/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : xmllite: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 705d089259399538141e82d3ac1d06dc4515355a URL: https://source.winehq.org/git/wine.git/?a=commit;h=705d089259399538141e82d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:21 2019 +0200 xmllite: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/Makefile.in | 2 ++ dlls/xmllite/reader.c | 19 ++++++++--------- dlls/xmllite/writer.c | 53 ++++++++++++++++++++++++------------------------ 3 files changed, 37 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=705d089259399538141e…

1 0

Alexandre Julliard : xinput1: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 0115cba69d245c5841c762cf02652a00980143a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0115cba69d245c5841c762cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:48:47 2019 +0200 xinput1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 2 ++ dlls/xinput1_2/Makefile.in | 2 ++ dlls/xinput1_3/Makefile.in | 2 ++ dlls/xinput1_3/hid.c | 9 +++------ dlls/xinput1_3/xinput_main.c | 1 - dlls/xinput1_4/Makefile.in | 2 ++ dlls/xinput9_1_0/Makefile.in | 2 ++ 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index d1c4258..a2b17a2 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 822ec15..fd38c6f 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 9c873f9..3b4968f 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index dc5601c..aa46f35 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> @@ -44,7 +42,6 @@ #include "xinput.h" #include "xinput_private.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xinput); @@ -190,7 +187,7 @@ static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_ private->current_report = 0; private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - size = (strlenW(path) + 1) * sizeof(WCHAR); + size = (lstrlenW(path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); memcpy(private->device_path, path, size); private->enabled = TRUE; @@ -238,13 +235,13 @@ void HID_find_gamepads(xinput_controller *devices) &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) continue; - if (!strstrW(data->DevicePath, ig)) + if (!wcsstr(data->DevicePath, ig)) continue; for (i = 0; i < XUSER_MAX_COUNT; i++) { struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].connected && !strcmpW(data->DevicePath, private->device_path)) + if (devices[i].connected && !wcscmp(data->DevicePath, private->device_path)) break; } if (i != XUSER_MAX_COUNT) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index c412887..57337e0 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <assert.h> #include <stdarg.h> #include <string.h> diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 7acb9dc..cdf4b4f 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index c07022a..dc8739c 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c

1 0

Alexandre Julliard : wuaueng: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 55604f852b0adccbfd82b27d1cb311d289340b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55604f852b0adccbfd82b27d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:45:34 2019 +0200 wuaueng: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuaueng/Makefile.in | 2 ++ dlls/wuaueng/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in index c3307bd..c74d7d9 100644 --- a/dlls/wuaueng/Makefile.in +++ b/dlls/wuaueng/Makefile.in @@ -1,5 +1,7 @@ MODULE = wuaueng.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/wuaueng/main.c b/dlls/wuaueng/main.c index 8e11b01..d49d3b0 100644 --- a/dlls/wuaueng/main.c +++ b/dlls/wuaueng/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : wuapi: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 8e23f1c7e02a4479e34ece19ab4b1333d4573e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e23f1c7e02a4479e34ece19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:45:26 2019 +0200 wuapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuapi/Makefile.in | 2 ++ dlls/wuapi/downloader.c | 1 - dlls/wuapi/installer.c | 1 - dlls/wuapi/main.c | 1 - dlls/wuapi/searcher.c | 1 - dlls/wuapi/session.c | 1 - dlls/wuapi/systeminfo.c | 1 - dlls/wuapi/updates.c | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index ea11838..fbabf93 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = wuapi.dll IMPORTS = uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ downloader.c \ installer.c \ diff --git a/dlls/wuapi/downloader.c b/dlls/wuapi/downloader.c index e17e155..ff66dd1 100644 --- a/dlls/wuapi/downloader.c +++ b/dlls/wuapi/downloader.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index 46c8699..3761482 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index 0527ee5..c2ed95e 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c index 1ca8020..697536b 100644 --- a/dlls/wuapi/searcher.c +++ b/dlls/wuapi/searcher.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/session.c b/dlls/wuapi/session.c index acc7cb0..29365dd 100644 --- a/dlls/wuapi/session.c +++ b/dlls/wuapi/session.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/systeminfo.c b/dlls/wuapi/systeminfo.c index 7c62bed..6424e1b 100644 --- a/dlls/wuapi/systeminfo.c +++ b/dlls/wuapi/systeminfo.c @@ -21,7 +21,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index 4f6648c..249f07a 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : wshom.ocx: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: df8f838928d6754365558503dcc39ab911e4adc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8f838928d6754365558503… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:44:17 2019 +0200 wshom.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/Makefile.in | 2 ++ dlls/wshom.ocx/shell.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index b1949ed..6cbec44 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,6 +1,8 @@ MODULE = wshom.ocx IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ shell.c \ wshom_main.c diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 57f1746..5d58ac7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -25,7 +25,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -656,11 +655,11 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, } folder = V_BSTR(index); - if (!strcmpiW(folder, desktopW)) + if (!wcsicmp(folder, desktopW)) kind = CSIDL_DESKTOP; - else if (!strcmpiW(folder, allusersdesktopW)) + else if (!wcsicmp(folder, allusersdesktopW)) kind = CSIDL_COMMON_DESKTOPDIRECTORY; - else if (!strcmpiW(folder, allusersprogramsW)) + else if (!wcsicmp(folder, allusersprogramsW)) kind = CSIDL_COMMON_PROGRAMS; else { @@ -923,7 +922,7 @@ static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *Ic hr = IShellLinkW_GetIconLocation(This->link, buffW, ARRAY_SIZE(buffW), &icon); if (FAILED(hr)) return hr; - sprintfW(pathW, fmtW, buffW, icon); + swprintf(pathW, ARRAY_SIZE(pathW), fmtW, buffW, icon); *IconPath = SysAllocString(pathW); if (!*IconPath) return E_OUTOFMEMORY; @@ -941,7 +940,7 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico TRACE("(%p)->(%s)\n", This, debugstr_w(IconPath)); /* scan for icon id */ - ptr = strrchrW(IconPath, ','); + ptr = wcsrchr(IconPath, ','); if (!ptr) { WARN("icon index not found\n"); @@ -951,10 +950,10 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico path = SysAllocStringLen(IconPath, ptr-IconPath); /* skip spaces if any */ - while (isspaceW(*++ptr)) + while (iswspace(*++ptr)) ; - icon = atoiW(ptr); + icon = wcstol(ptr, NULL, 10); hr = IShellLinkW_SetIconLocation(This->link, path, icon); SysFreeString(path); @@ -1225,8 +1224,8 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) WCHAR *ret, *ptr; BOOL in_quotes = FALSE; - if (!(ret = heap_alloc((strlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; - strcpyW( ret, cmd ); + if (!(ret = heap_alloc((lstrlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + lstrcpyW( ret, cmd ); *params = NULL; for (ptr = ret; *ptr; ptr++) @@ -1429,9 +1428,9 @@ static HKEY get_root_key(const WCHAR *path) int i; for (i = 0; i < ARRAY_SIZE(rootkeys); i++) { - if (!strncmpW(path, rootkeys[i].full, strlenW(rootkeys[i].full))) + if (!wcsncmp(path, rootkeys[i].full, lstrlenW(rootkeys[i].full))) return rootkeys[i].hkey; - if (rootkeys[i].abbrev[0] && !strncmpW(path, rootkeys[i].abbrev, strlenW(rootkeys[i].abbrev))) + if (rootkeys[i].abbrev[0] && !wcsncmp(path, rootkeys[i].abbrev, lstrlenW(rootkeys[i].abbrev))) return rootkeys[i].hkey; } @@ -1444,17 +1443,17 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) *value = NULL; /* at least one separator should be present */ - *subkey = strchrW(path, '\\'); + *subkey = wcschr(path, '\\'); if (!*subkey) return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); /* default value or not */ - if ((*subkey)[strlenW(*subkey)-1] == '\\') { + if ((*subkey)[lstrlenW(*subkey)-1] == '\\') { (*subkey)++; *value = NULL; } else { - *value = strrchrW(*subkey, '\\'); + *value = wcsrchr(*subkey, '\\'); if (*value - *subkey > 1) { unsigned int len = *value - *subkey - 1; WCHAR *ret; @@ -1566,7 +1565,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v bound.cElements = 0; while (*ptr) { bound.cElements++; - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; } sa = SafeArrayCreate(VT_VARIANT, 1, &bound); @@ -1583,7 +1582,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v while (*ptr) { V_VT(v) = VT_BSTR; V_BSTR(v) = SysAllocString(ptr); - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; v++; } @@ -1641,13 +1640,13 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * if (V_VT(type) != VT_BSTR) return E_INVALIDARG; - if (!strcmpW(V_BSTR(type), regszW)) + if (!wcscmp(V_BSTR(type), regszW)) regtype = REG_SZ; - else if (!strcmpW(V_BSTR(type), regdwordW)) + else if (!wcscmp(V_BSTR(type), regdwordW)) regtype = REG_DWORD; - else if (!strcmpW(V_BSTR(type), regexpandszW)) + else if (!wcscmp(V_BSTR(type), regexpandszW)) regtype = REG_EXPAND_SZ; - else if (!strcmpW(V_BSTR(type), regbinaryW)) + else if (!wcscmp(V_BSTR(type), regbinaryW)) regtype = REG_BINARY; else { FIXME("unrecognized value type %s\n", debugstr_w(V_BSTR(type)));

1 0

Alexandre Julliard : wpc: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: ff084c8b7ba6715e8489b4903dbbc2843ffda4fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff084c8b7ba6715e8489b490… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:43:03 2019 +0200 wpc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in index 829a769..5d8ea2e 100644 --- a/dlls/wpc/Makefile.in +++ b/dlls/wpc/Makefile.in @@ -1,5 +1,7 @@ MODULE = wpc.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ wpc.c

1 0

Alexandre Julliard : wmvcore: Build with msvcrt.
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 3e9566a3fb776304d20b442c1d293a15097e60ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9566a3fb776304d20b442c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:42:45 2019 +0200 wmvcore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 19d32f6..c0b5827 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -2,6 +2,8 @@ MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ reader.c \ wmvcore_main.c \

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_domain_shader ().
by Alexandre Julliard June 28, 2019

June 28, 2019

Module: wine Branch: master Commit: 03a06f4ef254954baa7b5b3ba5263568d706fcda URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a06f4ef254954baa7b5b3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:27 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_domain_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae08f61..a793bf7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8109,14 +8109,13 @@ static void shader_glsl_generate_ds_epilogue(const struct wined3d_gl_info *gl_in shader_glsl_fixup_position(buffer, FALSE); } -static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct ds_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; @@ -8587,6 +8586,7 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context *context, static GLuint find_glsl_domain_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ds_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ds_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -8632,7 +8632,7 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_domain_shader(context, priv, shader, args); + ret = shader_glsl_generate_domain_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders].args = *args; gl_shaders[shader_data->num_gl_shaders++].id = ret;

1 0