February 2017 - Wine-commits

Jacek Caban : mshtml/tests: Added COM aggregation tests.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: fdcd7e60c2c8b8a9e06cd26def7b2a73a058a612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcd7e60c2c8b8a9e06cd26de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 2 16:10:13 2017 +0100 mshtml/tests: Added COM aggregation tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 90d5b41..cb6c9b0 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -50,6 +50,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_IProxyManager,0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa,0x00,0x40,0x47,0x70); +DEFINE_GUID(outer_test_iid,0xabcabc00,0,0,0,0,0,0,0,0,0,0x66); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -203,6 +204,8 @@ DEFINE_EXPECT(EnumConnections); DEFINE_EXPECT(EnumConnections_Next); DEFINE_EXPECT(WindowClosing); DEFINE_EXPECT(NavigateWithBindCtx); +DEFINE_EXPECT(outer_QI_IPersistMoniker); +DEFINE_EXPECT(outer_QI_test); static BOOL is_ie9plus; static IUnknown *doc_unk; @@ -8541,6 +8544,73 @@ static void test_ServiceProvider(void) release_document(doc); } +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IPersistMoniker)) { + CHECK_EXPECT(outer_QI_IPersistMoniker); + *ppv = NULL; + return E_NOINTERFACE; + } + if(IsEqualGUID(riid, &outer_test_iid)) { + CHECK_EXPECT(outer_QI_test); + *ppv = (IUnknown*)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + +static void test_com_aggregation(const CLSID *clsid) +{ + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; + IUnknown *unk, *unk2, *unk3; + HRESULT hres; + + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + + SET_EXPECT(outer_QI_IPersistMoniker); /* Some IE version QI for that. */ + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + SET_CALLED(outer_QI_IPersistMoniker); + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&unk2); + ok(hres == S_OK, "Coult not get IDispatch iface: %08x\n", hres); + + SET_EXPECT(outer_QI_test); + hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); + CHECK_CALLED(outer_QI_test); + ok(hres == S_OK, "Coult not get IInternetProtocol iface: %08x\n", hres); + ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); + + IUnknown_Release(unk2); + IUnknown_Release(unk); + + unk = (void*)0xdeadbeef; + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IDispatch, (void**)&unk); + ok(hres == E_INVALIDARG, "CreateInstance returned: %08x\n", hres); + ok(!unk, "unk = %p\n", unk); + + IClassFactory_Release(class_factory); +} + START_TEST(htmldoc) { CoInitialize(NULL); @@ -8578,6 +8648,7 @@ START_TEST(htmldoc) test_UIActivate(TRUE, TRUE, TRUE); test_HTMLDoc_ISupportErrorInfo(); test_ServiceProvider(); + test_com_aggregation(&CLSID_HTMLDocument); DestroyWindow(container_hwnd); CoUninitialize();

1 0

Józef Kucia : comdlg32/tests: Add test for OLE initialization in file dialogs.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 5dda6495eb9cc6f0d9f35a3720f78d6f963d7070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dda6495eb9cc6f0d9f35a372… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 16:10:05 2017 +0100 comdlg32/tests: Add test for OLE initialization in file dialogs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 9270b66..89aa8fa 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1266,6 +1266,74 @@ static void test_directory_filename(void) todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret); } +static UINT_PTR WINAPI test_ole_init_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HRESULT hr; + + hr = OleInitialize(NULL); + ok(hr == S_FALSE, "OleInitialize() returned %#x\n", hr); + OleUninitialize(); + + if (msg == WM_NOTIFY) + PostMessageA(GetParent(dlg), WM_COMMAND, IDCANCEL, 0); + return FALSE; +} + +static LRESULT CALLBACK hook_proc(int code, WPARAM wp, LPARAM lp) +{ + static BOOL first_dlg = TRUE; + HRESULT hr; + + if (code == HCBT_CREATEWND) + { + CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; + + if (c->lpcs->lpszClass == (LPWSTR)WC_DIALOG) + { + /* OleInitialize() creates a window for the main apartment. Since + * Vista OleInitialize() is called before the file dialog is + * created. SimCity 2000 expects that the first window created + * after GetOpenFileA() is a file dialog window. Mark Vista+ + * behavior as broken. */ + hr = OleInitialize(NULL); + todo_wine_if(first_dlg) + ok((first_dlg ? hr == S_OK : hr == S_FALSE) + || broken(first_dlg && hr == S_FALSE), + "OleInitialize() returned %#x (first dialog %#x)\n", hr, first_dlg); + OleUninitialize(); + first_dlg = FALSE; + } + } + + return CallNextHookEx(NULL, code, wp, lp); +} + +static void test_ole_initialization(void) +{ + char file[MAX_PATH] = {0}; + OPENFILENAMEA ofn = {0}; + HRESULT hr; + HHOOK hook; + BOOL ret; + + hook = SetWindowsHookExW(WH_CBT, hook_proc, NULL, GetCurrentThreadId()); + + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400A; + ofn.lpstrFile = file; + ofn.nMaxFile = MAX_PATH; + ofn.lpfnHook = test_ole_init_wndproc; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER; + ofn.hInstance = GetModuleHandleA(NULL); + ret = GetOpenFileNameA(&ofn); + ok(!ret, "GetOpenFileNameA returned %#x\n", ret); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "OleInitialize() returned %#x\n", hr); + OleUninitialize(); + + UnhookWindowsHookEx(hook); +} + START_TEST(filedlg) { test_DialogCancel(); @@ -1280,4 +1348,5 @@ START_TEST(filedlg) test_extension(); test_null_filename(); test_directory_filename(); + test_ole_initialization(); }

1 0

Józef Kucia : comdlg32: Delay OleInitialize() until after file dialog window is created.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 1707df3da2ae288897ca60e21d7ec778ef77a184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1707df3da2ae288897ca60e21… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 16:10:06 2017 +0100 comdlg32: Delay OleInitialize() until after file dialog window is created. This fixes a problem exposed by commit f65e04770dc5748521a0de73814cea0b085bf3f8. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 ++++++------ dlls/comdlg32/filedlgbrowser.h | 1 + dlls/comdlg32/tests/filedlg.c | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d0d00b3..8a83163 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -252,7 +252,6 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) void *template; HRSRC hRes; HANDLE hDlgTmpl = 0; - HRESULT hr; /* test for missing functionality */ if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS) @@ -297,9 +296,6 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) fodInfos->HookMsg.sharevistring = RegisterWindowMessageW(SHAREVISTRINGW); } - /* Some shell namespace extensions depend on COM being initialized. */ - hr = OleInitialize(NULL); - if (fodInfos->unicode) lRes = DialogBoxIndirectParamW(COMDLG32_hInstance, template, @@ -312,7 +308,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); - if (SUCCEEDED(hr)) + if (fodInfos->ole_initialized) OleUninitialize(); /* Unable to create the dialog */ @@ -1262,7 +1258,11 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l int gripx = GetSystemMetrics( SM_CYHSCROLL); int gripy = GetSystemMetrics( SM_CYVSCROLL); - /* Adds the FileOpenDlgInfos in the property list of the dialog + /* Some shell namespace extensions depend on COM being initialized. */ + if (SUCCEEDED(OleInitialize(NULL))) + fodInfos->ole_initialized = TRUE; + + /* Adds the FileOpenDlgInfos in the property list of the dialog so it will be easily accessible through a GetPropA(...) */ SetPropA(hwnd, FileOpenDlgInfosStr, fodInfos); diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index 60f0e7e..6d108a9 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -92,6 +92,7 @@ typedef struct UINT sharevistring; } HookMsg; + BOOL ole_initialized; } FileOpenDlgInfos; /*********************************************************************** diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 89aa8fa..ff973a7 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1296,7 +1296,6 @@ static LRESULT CALLBACK hook_proc(int code, WPARAM wp, LPARAM lp) * after GetOpenFileA() is a file dialog window. Mark Vista+ * behavior as broken. */ hr = OleInitialize(NULL); - todo_wine_if(first_dlg) ok((first_dlg ? hr == S_OK : hr == S_FALSE) || broken(first_dlg && hr == S_FALSE), "OleInitialize() returned %#x (first dialog %#x)\n", hr, first_dlg);

1 0

Aric Stewart : hidclass.sys: IOCTL_HID_GET_INPUT_REPORT has report ID as first byte.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 1ccb1719cb33c15c7a25854e9fdeef376104a6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccb1719cb33c15c7a25854e9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 2 10:35:55 2017 -0600 hidclass.sys: IOCTL_HID_GET_INPUT_REPORT has report ID as first byte. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 1 + dlls/hidclass.sys/device.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ff47e30..91fade4 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -356,6 +356,7 @@ static void test_get_input_report(void) if (rc) { + ok(data[0] == 0, "Report ID (0) is not the first byte of the data\n"); report[0] = 0; for (i = 0; i < Caps.InputReportByteLength && i < Caps.InputReportByteLength; i++) { diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ff9655e..40d458a 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -584,19 +584,30 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_GET_INPUT_REPORT: { - HID_XFER_PACKET packet; + HID_XFER_PACKET *packet; + UINT packet_size = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); + ULONG out_length; + + packet = HeapAlloc(GetProcessHeap(), 0, packet_size); if (extension->preparseData->InputReports[0].reportID) - packet.reportId = buffer[0]; + packet->reportId = buffer[0]; else - packet.reportId = 0; - packet.reportBuffer = buffer; - packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + packet->reportId = 0; + packet->reportBuffer = (BYTE *)packet + sizeof(*packet); + packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength - 1; - call_minidriver(IOCTL_HID_GET_INPUT_REPORT, device, NULL, 0, &packet, sizeof(packet)); - irp->IoStatus.Information = packet.reportBufferLen; - irp->IoStatus.u.Status = STATUS_SUCCESS; + rc = call_minidriver(IOCTL_HID_GET_INPUT_REPORT, device, NULL, 0, packet, sizeof(*packet)); + if (rc == STATUS_SUCCESS) + { + rc = copy_packet_into_buffer(packet, buffer, irpsp->Parameters.DeviceIoControl.OutputBufferLength, &out_length); + irp->IoStatus.Information = out_length; + } + else + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = rc; + HeapFree(GetProcessHeap(), 0, packet); break; } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS:

1 0

Aric Stewart : loader: Start winebus service by default.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 45d82a2464b535c484b0a6e96f9851f9db573edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d82a2464b535c484b0a6e96… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 2 10:38:55 2017 -0600 loader: Start winebus service by default. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3f723be..9a55b38 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3255,7 +3255,7 @@ DisplayName="Platform Bus Kernel" ServiceBinary="%12%\winebus.sys" LoadOrderGroup="WinePlugPlay" ServiceType=1 -StartType=3 +StartType=2 ErrorControl=1 [WineHIDService]

1 0

Alexandre Julliard : ole32: Don't set zero-size clipboard data, this no longer works.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 77e566a3cbd0341ffeff7e8b7f42369622ac240a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e566a3cbd0341ffeff7e8b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 18:51:10 2017 +0100 ole32: Don't set zero-size clipboard data, this no longer works. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index e3c93c9..b547cdf 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1110,7 +1110,7 @@ static HRESULT get_current_dataobject(IDataObject **data) h = GetClipboardData(wine_marshal_clipboard_format); if(!h) return S_FALSE; - if(GlobalSize(h) == 0) return S_FALSE; + if(GlobalSize(h) <= 1) return S_FALSE; ptr = GlobalLock(h); if(!ptr) return S_FALSE; @@ -1957,7 +1957,7 @@ static HRESULT expose_marshalled_dataobject(ole_clipbrd *clipbrd, IDataObject *d dup_global_mem(h_stm, GMEM_DDESHARE|GMEM_MOVEABLE, &h); } else /* flushed */ - h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 0); + h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 1); if(!h) return E_OUTOFMEMORY;

1 0

Alexandre Julliard : ole32: Only trace a clipboard format name if it has one.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: c85eaae44c84f9e8b996793445f3807124e7c355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c85eaae44c84f9e8b99679344… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 18:51:44 2017 +0100 ole32: Only trace a clipboard format name if it has one. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b547cdf..b42544a 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1198,9 +1198,11 @@ static HRESULT get_priv_data(ole_priv_data **data) for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) { - char buf[100]; - GetClipboardFormatNameA(cf, buf, sizeof(buf)); - TRACE("cf %04x %s\n", cf, buf); + WCHAR buf[256]; + if (GetClipboardFormatNameW(cf, buf, sizeof(buf))) + TRACE("cf %04x %s\n", cf, debugstr_w(buf)); + else + TRACE("cf %04x\n", cf); } TRACE("count %d\n", count); size += count * sizeof(ret->entries[0]);

1 0

Alexandre Julliard : ole32: Use a HWND_MESSAGE window for the clipboard.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: e31dd0f384c108e9e07cbcbe043a285c32efe855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31dd0f384c108e9e07cbcbe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 18:52:43 2017 +0100 ole32: Use a HWND_MESSAGE window for the clipboard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b42544a..6e4dd44 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2098,8 +2098,7 @@ static HWND create_clipbrd_window(void) RegisterClassExW(&class); return CreateWindowW(clipbrd_wndclass, title, WS_POPUP | WS_CLIPSIBLINGS | WS_OVERLAPPED, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, hinst, 0); + 0, 0, 0, 0, HWND_MESSAGE, NULL, hinst, 0); } /*********************************************************************

1 0

Zebediah Figura : winebuild: Use unsigned int in spec file variable parameters.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: 544ea174a61923a36b0eb2da6620f7f09a066e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=544ea174a61923a36b0eb2da6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 1 22:23:53 2017 -0600 winebuild: Use unsigned int in spec file variable parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/parser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 03b88fa..398d542 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -80,7 +80,7 @@ enum arg_type typedef struct { int n_values; - int *values; + unsigned int *values; } ORD_VARIABLE; typedef struct diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 1d7b84e..2762a8c 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -182,7 +182,7 @@ static ORDDEF *add_entry_point( DLLSPEC *spec ) static int parse_spec_variable( ORDDEF *odp, DLLSPEC *spec ) { char *endptr; - int *value_array; + unsigned int *value_array; int n_values; int value_array_size; const char *token; @@ -214,7 +214,7 @@ static int parse_spec_variable( ORDDEF *odp, DLLSPEC *spec ) if (*token == ')') break; - value_array[n_values++] = strtol(token, &endptr, 0); + value_array[n_values++] = strtoul(token, &endptr, 0); if (n_values == value_array_size) { value_array_size += 25;

1 0

Matteo Bruni : wined3d: Query supported geometry shader uniform buffers count on core profile.
by Alexandre Julliard 02 Feb '17

02 Feb '17

Module: wine Branch: master Commit: ab9cc273311168e416a364e2eed438e1d72d9926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9cc273311168e416a364e2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:07 2017 +0100 wined3d: Query supported geometry shader uniform buffers count on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d8e518ebd..54f1cc7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3532,7 +3532,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_VERTEX], gl_max); } } - if (gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) + if ((!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] || gl_info->supported[ARB_GEOMETRY_SHADER4]) + && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gl_max); gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS);

1 0