Merge commit '338d700a23c221290e884852f05961781a0f201f'

diff --cc dlls/kernel32/volume.c
Simple merge

diff --cc dlls/mshtml/htmldoc.c
Simple merge

diff --cc dlls/mshtml/mshtml_private.h
Simple merge

diff --cc dlls/msi/action.c
Simple merge

diff --cc dlls/ntdll/directory.c
Simple merge

diff --cc dlls/user32/winpos.c
Simple merge

diff --cc dlls/winex11.drv/opengl.c
index 33ed12d32bd9d442e50431528e28b52a990e00e5,feead5f3b55ccd73f5edbccd12dbbcd15115379e..00f01f8e7dcde54cae830026176f9cdfbbd1c87e
--- 1/dlls/winex11.drv/opengl.c
--- 2/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@@ -2250,9 -2270,8 +2270,9 @@@ static void WINAPI X11DRV_wglGetInteger
  void flush_gl_drawable(X11DRV_PDEVICE *physDev)
  {
      int w, h;
 +    XGCValues gcvalues;
  
-     if (!physDev->gl_copy)
+     if (!physDev->gl_copy || !physDev->current_pf)
          return;
  
      w = physDev->dc_rect.right - physDev->dc_rect.left;

diff --cc dlls/ws2_32/socket.c
Simple merge

diff --cc programs/winemenubuilder/winemenubuilder.c
Simple merge

diff --cc tools/wine.inf.in
Simple merge