November 2016 - Wine-commits

Jeremy Newman : cleanup html_select and bootstrapify
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: 41f501cbfdeebaba6bf49f084f1a58d141f0c0fd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=41f501cbfdeebaba6bf49f08… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 09:25:23 2016 -0600 cleanup html_select and bootstrapify --- include/html.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/html.php b/include/html.php index 943e879..173b299 100644 --- a/include/html.php +++ b/include/html.php @@ -111,17 +111,17 @@ function html_frame_end($text = "") function html_select($name, $values, $default = null, $descs = null) { - $str = "<select name='$name'>\n"; + $str = "<select name=\"{$name}\" class=\"form-control form-control-inline\">\n"; while(list($idx, $value) = each($values)) { $desc = $value; if($descs) - $desc = $descs[$idx]; + $desc = $descs[$idx]; if($value == $default) - $str .= " <option selected value='$value'>$desc\n"; + $str .= " <option selected value=\"{$value}\">{$desc}</option>\n"; else - $str .= " <option value='$value'>$desc\n"; + $str .= " <option value=\"{$value}\">{$desc}</option>\n"; } $str .= "</select>\n";

1 0

Jeremy Newman : reformat and cleanup the user preferences form
by Jeremy Newman 22 Nov '16

22 Nov '16

Module: appdb Branch: master Commit: 95389edc24ceaf6d3ffa2bf99675a3071ceef244 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=95389edc24ceaf6d3ffa2bf9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Nov 22 09:26:29 2016 -0600 reformat and cleanup the user preferences form * drop some unused prefs * remove unnessessary function and include calls * bootstrapify --- include/form_edit.php | 42 ---------- preferences.php | 213 +++++++++++++++++++++++--------------------------- tables/prefs_list.sql | 6 -- 3 files changed, 98 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=95389edc24ceaf6d3ffa…

1 0

Alexandre Julliard : configure: Add fallback link command line for libudev.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 32fa34bf09e20c6f0ab5a4b8f3b4bdc0e90afdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fa34bf09e20c6f0ab5a4b8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 17:11:33 2016 -0600 configure: Add fallback link command line for libudev. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3cade53..1d8f3c6 100755 --- a/configure +++ b/configure @@ -12989,7 +12989,7 @@ if ${UDEV_LIBS:+false} :; then : fi fi - +UDEV_LIBS=${UDEV_LIBS:-"-ludev"} $as_echo "$as_me:${as_lineno-$LINENO}: libudev cflags: $UDEV_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: libudev libs: $UDEV_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS diff --git a/configure.ac b/configure.ac index 32a0987..43f8a24 100644 --- a/configure.ac +++ b/configure.ac @@ -1524,7 +1524,7 @@ WINE_NOTICE_WITH(oss,[test "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes] dnl **** Check for libudev **** if test "x$with_udev" != "xno" then - WINE_PACKAGE_FLAGS(UDEV,[libudev],,,, + WINE_PACKAGE_FLAGS(UDEV,[libudev],[-ludev],,, [AC_CHECK_HEADERS(libudev.h, [AC_CHECK_LIB(udev,udev_new, AC_DEFINE(HAVE_UDEV,1,[Define to 1 if you have the `udev' library (-ludev).]),

1 0

Carlos Garnacho : winex11: Always use the client pointer for raw events.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 64c27d62b528a72924499c7c587c0780882ccff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c27d62b528a72924499c7c5… Author: Carlos Garnacho <carlosg(a)gnome.org> Date: Fri Nov 18 12:43:18 2016 +0100 winex11: Always use the client pointer for raw events. Use XI2's client pointer, it will be the master pointer affected by X core calls, and even if it doesn't currently have relative X/Y capabilities, it will gain those as soon as a slave device with such capabilities is used. Signed-off-by: Carlos Garnacho <carlosg(a)gnome.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a120fae..186899f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -132,6 +132,7 @@ static Cursor create_cursor( HANDLE handle ); static BOOL xinput2_available; static BOOL broken_rawevents; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(XIGetClientPointer); MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIQueryDevice); MAKE_FUNCPTR(XIQueryVersion); @@ -255,7 +256,7 @@ static void enable_xinput2(void) XIEventMask mask; XIDeviceInfo *devices; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; - int i, j, count; + int i; if (!xinput2_available) return; @@ -272,29 +273,8 @@ static void enable_xinput2(void) if (data->xi2_state == xi_unavailable) return; if (data->xi2_devices) pXIFreeDeviceInfo( data->xi2_devices ); + if (!pXIGetClientPointer( data->display, None, &data->xi2_core_pointer )) return; data->xi2_devices = devices = pXIQueryDevice( data->display, XIAllDevices, &data->xi2_device_count ); - for (i = 0; i < data->xi2_device_count; ++i) - { - if (devices[i].use != XIMasterPointer) continue; - for (j = count = 0; j < devices[i].num_classes; j++) - { - XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; - - if (devices[i].classes[j]->type != XIValuatorClass) continue; - TRACE( "Device %u (%s) num %u %f,%f res %u mode %u label %s\n", - devices[i].deviceid, debugstr_a(devices[i].name), - class->number, class->min, class->max, class->resolution, class->mode, - XGetAtomName( data->display, class->label )); - if (class->label == x11drv_atom( Rel_X ) || class->label == x11drv_atom( Rel_Y )) count++; - /* workaround for drivers that don't provide labels */ - if (!class->label && class->number <= 1 && class->mode == XIModeRelative) count++; - } - if (count < 2) continue; - TRACE( "Using %u (%s) as core pointer\n", - devices[i].deviceid, debugstr_a(devices[i].name) ); - data->xi2_core_pointer = devices[i].deviceid; - break; - } mask.mask = mask_bits; mask.mask_len = sizeof(mask_bits); @@ -1729,6 +1709,7 @@ void X11DRV_XInput2_Init(void) return; \ } + LOAD_FUNCPTR(XIGetClientPointer); LOAD_FUNCPTR(XIFreeDeviceInfo); LOAD_FUNCPTR(XIQueryDevice); LOAD_FUNCPTR(XIQueryVersion);

1 0

Fabian Maurer : dmloader: Better error reporting in IDirectMusicLoaderImpl_SetObject.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: ca0f6c0d51c2fe2909a3c40c4491c79f64eb21a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0f6c0d51c2fe2909a3c40c4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 21 00:31:01 2016 +0100 dmloader: Better error reporting in IDirectMusicLoaderImpl_SetObject. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 967b093..0822891 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -422,7 +422,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac /* attach stream */ hr = IDirectMusicLoaderFileStream_Attach (pStream, wszFileName, iface); if (FAILED(hr)) { - ERR(": could not attach stream to file\n"); + ERR(": could not attach stream to file %s, make sure it exists\n", debugstr_w(wszFileName)); IStream_Release (pStream); return DMUS_E_LOADER_FAILEDOPEN; }

1 0

Akihiro Sagawa : strmbase: Add null pointer checks to BaseControlVideoImpls.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 0638213243d0799734a75c182a81f886257d0970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0638213243d0799734a75c182… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 20 15:33:21 2016 +0900 strmbase: Add null pointer checks to BaseControlVideoImpls. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index ec3a076..be65886 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -95,6 +95,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_AvgTimePerFrame(IBasicVideo *iface, REFT VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); + if (!pAvgTimePerFrame) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -112,6 +114,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_BitRate(IBasicVideo *iface, LONG *pBitRa TRACE("(%p/%p)->(%p)\n", This, iface, pBitRate); + if (!pBitRate) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -127,6 +131,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_BitErrorRate(IBasicVideo *iface, LONG *p TRACE("(%p/%p)->(%p)\n", This, iface, pBitErrorRate); + if (!pBitErrorRate) + return E_POINTER; if (!This->pPin->pConnectedTo) return VFW_E_NOT_CONNECTED; @@ -141,6 +147,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoWidth(IBasicVideo *iface, LONG *pVi BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoWidth); + if (!pVideoWidth) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pVideoWidth = vih->bmiHeader.biWidth; @@ -154,6 +162,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoHeight(IBasicVideo *iface, LONG *pV BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); + if (!pVideoHeight) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pVideoHeight = abs(vih->bmiHeader.biHeight); @@ -180,6 +190,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceLeft(IBasicVideo *iface, LONG *pSo BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceLeft); + if (!pSourceLeft) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceLeft = SourceRect.left; @@ -205,6 +217,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceWidth(IBasicVideo *iface, LONG *pS BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceWidth); + if (!pSourceWidth) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceWidth = SourceRect.right - SourceRect.left; @@ -230,6 +244,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceTop(IBasicVideo *iface, LONG *pSou BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceTop); + if (!pSourceTop) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceTop = SourceRect.top; @@ -255,6 +271,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_SourceHeight(IBasicVideo *iface, LONG *p BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pSourceHeight); + if (!pSourceHeight) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pSourceHeight = SourceRect.bottom - SourceRect.top; @@ -281,6 +299,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationLeft(IBasicVideo *iface, LONG BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationLeft); + if (!pDestinationLeft) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationLeft = DestRect.left; @@ -306,6 +326,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationWidth(IBasicVideo *iface, LON BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationWidth); + if (!pDestinationWidth) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationWidth = DestRect.right - DestRect.left; @@ -331,6 +353,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationTop(IBasicVideo *iface, LONG BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationTop); + if (!pDestinationTop) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationTop = DestRect.top; @@ -356,6 +380,8 @@ HRESULT WINAPI BaseControlVideoImpl_get_DestinationHeight(IBasicVideo *iface, LO BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pDestinationHeight); + if (!pDestinationHeight) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pDestinationHeight = DestRect.right - DestRect.left; @@ -381,6 +407,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetSourcePosition(IBasicVideo *iface, LONG * BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); + if (!pLeft || !pTop || !pWidth || !pHeight) + return E_POINTER; This->pFuncsTable->pfnGetSourceRect(This, &SourceRect); *pLeft = SourceRect.left; @@ -418,6 +446,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetDestinationPosition(IBasicVideo *iface, L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p, %p, %p)\n", This, iface, pLeft, pTop, pWidth, pHeight); + if (!pLeft || !pTop || !pWidth || !pHeight) + return E_POINTER; This->pFuncsTable->pfnGetTargetRect(This, &DestRect); *pLeft = DestRect.left; @@ -442,6 +472,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoSize(IBasicVideo *iface, LONG *pWidt BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pWidth, pHeight); + if (!pWidth || !pHeight) + return E_POINTER; vih = This->pFuncsTable->pfnGetVideoFormat(This); *pHeight = vih->bmiHeader.biHeight; @@ -455,6 +487,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + if (!pRetrieved || !pPalette) + return E_POINTER; if (pRetrieved) *pRetrieved = 0; @@ -464,6 +498,8 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L HRESULT WINAPI BaseControlVideoImpl_GetCurrentImage(IBasicVideo *iface, LONG *pBufferSize, LONG *pDIBImage) { BaseControlVideo *This = impl_from_IBasicVideo(iface); + if (!pBufferSize || !pDIBImage) + return E_POINTER; return This->pFuncsTable->pfnGetStaticImage(This, pBufferSize, pDIBImage); }

1 0

Akihiro Sagawa : wineqtdecoder: Always pass non-NULL preferred allocator to IAsyncReader:: RequestAllocator.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 4def77e4f8b1b16dc95309e4a40ce84ca7630cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4def77e4f8b1b16dc95309e4a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Nov 20 15:33:19 2016 +0900 wineqtdecoder: Always pass non-NULL preferred allocator to IAsyncReader::RequestAllocator. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 4e12242..1d5b808 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1101,6 +1101,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, HRESULT hr = S_OK; ALLOCATOR_PROPERTIES props; QTInPin *This = impl_from_IPin(iface); + IMemAllocator *pAlloc; TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); @@ -1150,8 +1151,18 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, props.cbAlign = 1; props.cbBuffer = impl_from_IBaseFilter(This->pin.pinInfo.pFilter)->outputSize + props.cbAlign; props.cbPrefix = 0; + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, + &IID_IMemAllocator, (LPVOID *)&pAlloc); + if (SUCCEEDED(hr)) + { + /* A certain IAsyncReader::RequestAllocator expects to be passed + non-NULL preferred allocator */ + hr = IAsyncReader_RequestAllocator(This->pReader, pAlloc, &props, &This->pAlloc); + if (FAILED(hr)) + WARN("Can't get an allocator, got %08x\n", hr); + IMemAllocator_Release(pAlloc); + } - hr = IAsyncReader_RequestAllocator(This->pReader, NULL, &props, &This->pAlloc); if (SUCCEEDED(hr)) { CopyMediaType(&This->pin.mtCurrent, pmt);

1 0

Daniel Lehman : opengl32: Set last error on invalid hdc to wglCreateContextAttribsARB.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: ed4271fae953732d262357aa99a7dd8d673aede0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4271fae953732d262357aa9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 19 08:07:13 2016 -0800 opengl32: Set last error on invalid hdc to wglCreateContextAttribsARB. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 7 ++++--- dlls/opengl32/wgl.c | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3f203ab..5a0e786 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -884,12 +884,13 @@ static void test_opengl3(HDC hdc) { HGLRC gl3Ctx; DWORD error; + SetLastError(0xdeadbeef); gl3Ctx = pwglCreateContextAttribsARB((HDC)0xdeadbeef, 0, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid HDC passed\n"); error = GetLastError(); - todo_wine ok(error == ERROR_DC_NOT_FOUND || - broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ - "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); + ok(error == ERROR_DC_NOT_FOUND || + broken(error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_DATA)), /* Nvidia Vista + Win7 */ + "Expected ERROR_DC_NOT_FOUND, got error=%x\n", error); wglDeleteContext(gl3Ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 932b217..8e61348 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -274,7 +274,12 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib struct opengl_context *context; struct opengl_funcs *funcs = get_dc_funcs( hdc ); - if (!funcs || !funcs->ext.p_wglCreateContextAttribsARB) return 0; + if (!funcs) + { + SetLastError( ERROR_DC_NOT_FOUND ); + return 0; + } + if (!funcs->ext.p_wglCreateContextAttribsARB) return 0; if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; if ((drv_ctx = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context->drv_ctx : NULL, attribs )))

1 0

Daniel Lehman : opengl32: Set last error on invalid share in wglCreateContextAttribsARB.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: 37ee3870a2f94d3960d989dd0cc454b8e1ec7aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37ee3870a2f94d3960d989dd0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat Nov 19 08:07:14 2016 -0800 opengl32: Set last error on invalid share in wglCreateContextAttribsARB. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 5 +++-- dlls/opengl32/wgl.c | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 5a0e786..7552d44 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -898,12 +898,13 @@ static void test_opengl3(HDC hdc) { HGLRC gl3Ctx; DWORD error; + SetLastError(0xdeadbeef); gl3Ctx = pwglCreateContextAttribsARB(hdc, (HGLRC)0xdeadbeef, 0); ok(gl3Ctx == 0, "pwglCreateContextAttribsARB using an invalid shareList passed\n"); error = GetLastError(); /* The Nvidia implementation seems to return hresults instead of win32 error codes */ - todo_wine ok(error == ERROR_INVALID_OPERATION || - error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); + ok(error == ERROR_INVALID_OPERATION || + error == NVIDIA_HRESULT_FROM_WIN32(ERROR_INVALID_OPERATION), "Expected ERROR_INVALID_OPERATION, got error=%x\n", error); wglDeleteContext(gl3Ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 8e61348..863dea2 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -280,7 +280,11 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib return 0; } if (!funcs->ext.p_wglCreateContextAttribsARB) return 0; - if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) return 0; + if (share && !(share_ptr = get_handle_ptr( share, HANDLE_CONTEXT ))) + { + SetLastError( ERROR_INVALID_OPERATION ); + return 0; + } if ((drv_ctx = funcs->ext.p_wglCreateContextAttribsARB( hdc, share_ptr ? share_ptr->u.context->drv_ctx : NULL, attribs ))) {

1 0

Andrey Gusev : ext-ms-win-domainjoin-netjoin-l1-1-0: Add dll.
by Alexandre Julliard 22 Nov '16

22 Nov '16

Module: wine Branch: master Commit: c0c806854f893222a67306acb0b2947ca5b69c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c806854f893222a67306acb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Nov 19 12:56:38 2016 +0200 ext-ms-win-domainjoin-netjoin-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 + .../Makefile.in | 1 + .../ext-ms-win-domainjoin-netjoin-l1-1-0.spec | 25 ++++++++++++++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 33 insertions(+) diff --git a/configure b/configure index 1d8f3c6..35343e1 100755 --- a/configure +++ b/configure @@ -1169,6 +1169,7 @@ enable_dxva2 enable_esent enable_evr enable_explorerframe +enable_ext_ms_win_domainjoin_netjoin_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 @@ -17947,6 +17948,7 @@ wine_fn_config_dll esent enable_esent wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test +wine_fn_config_dll ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index 43f8a24..256dcee 100644 --- a/configure.ac +++ b/configure.ac @@ -3012,6 +3012,7 @@ WINE_CONFIG_DLL(esent) WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) +WINE_CONFIG_DLL(ext-ms-win-domainjoin-netjoin-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/Makefile.in b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/Makefile.in new file mode 100644 index 0000000..3011558 --- /dev/null +++ b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-domainjoin-netjoin-l1-1-0.dll diff --git a/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/ext-ms-win-domainjoin-netjoin-l1-1-0.spec b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/ext-ms-win-domainjoin-netjoin-l1-1-0.spec new file mode 100644 index 0000000..0abeffe --- /dev/null +++ b/dlls/ext-ms-win-domainjoin-netjoin-l1-1-0/ext-ms-win-domainjoin-netjoin-l1-1-0.spec @@ -0,0 +1,25 @@ +@ stub NetpAvoidNetlogonSpnSet +@ stub NetpChangeMachineName +@ stub NetpCheckOfflineLsaPolicyUpdate +@ stub NetpCompleteOfflineDomainJoin +@ stub NetpContinueProvisioningPackageInstall +@ stub NetpControlServices +@ stub NetpCrackNamesStatus2Win32Error +@ stub NetpDoDomainJoin +@ stub NetpDomainJoinLicensingCheck +@ stub NetpFreeLdapLsaDomainInfo +@ stub NetpGetJoinInformation +@ stub NetpGetListOfJoinableOUs +@ stub NetpGetLsaPrimaryDomain +@ stub NetpGetMachineAccountName +@ stub NetpGetNewMachineName +@ stub NetpIsSetupInProgress +@ stub NetpLogPrintHelper +@ stub NetpMachineValidToJoin +@ stub NetpManageIPCConnect +@ stub NetpQueryService +@ stub NetpSeparateUserAndDomain +@ stub NetpUnJoinDomain +@ stub NetpValidateName +@ stub NetSetuppCloseLog +@ stub NetSetuppOpenLog diff --git a/tools/make_specfiles b/tools/make_specfiles index 60e5b16..629c838 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -137,6 +137,10 @@ my @dll_groups = "api-ms-win-service-winsvc-l1-2-0", ], [ + "netapi32", + "ext-ms-win-domainjoin-netjoin-l1-1-0", + ], + [ "ntdll", "api-ms-win-core-xstate-l1-1-0", ],

1 0