commit 14.1.1 upon wine-1.7.25

dlls/advapi32/advapi32.spec

@@ -375,7 +375,7 @@
 @ stub I_ScSetServiceBitsA
 # @ stub I_ScSetServiceBitsW
 # @ stub IdentifyCodeAuthzLevelW
-@ stdcall ImpersonateAnonymousToken(long)
+# @ stub ImpersonateAnonymousToken
 @ stdcall ImpersonateLoggedOnUser(long)
 @ stdcall ImpersonateNamedPipeClient(long)
 @ stdcall ImpersonateSelf(long)

dlls/advapi32/security.c

@@ -2541,15 +2541,6 @@ BOOL WINAPI ImpersonateLoggedOnUser(HANDLE hToken)
 }
 
 /******************************************************************************
- * ImpersonateAnonymousToken [ADVAPI32.@]
- */
-BOOL WINAPI ImpersonateAnonymousToken( HANDLE thread )
-{
-    TRACE("(%p)\n", thread);
-    return set_ntstatus( NtImpersonateAnonymousToken( thread ) );
-}
-
-/******************************************************************************
  * AccessCheck [ADVAPI32.@]
  */
 BOOL WINAPI

dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec

@@ -45,7 +45,7 @@
 @ stub RaiseFailFastException
 @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) kernel32.RegisterWaitForSingleObject
 @ stdcall SetConsoleTitleA(str) kernel32.SetConsoleTitleA
-@ stdcall SetFileCompletionNotificationModes(long long) kernel32.SetFileCompletionNotificationModes
+@ stub SetFileCompletionNotificationModes
 @ stdcall SetHandleCount(long) kernel32.SetHandleCount
 @ stdcall SetMailslotInfo(long long) kernel32.SetMailslotInfo
 @ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW

dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec

@@ -58,7 +58,7 @@
 @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount
 @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
 @ stub GetWindowsAccountDomainSid
-@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken
+@ stub ImpersonateAnonymousToken
 @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
 @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
 @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl

dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec

@@ -64,7 +64,7 @@
 @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount
 @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
 @ stub GetWindowsAccountDomainSid
-@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken
+@ stub ImpersonateAnonymousToken
 @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
 @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
 @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl

dlls/kernel32/file.c

@@ -1030,16 +1030,6 @@ BOOL WINAPI SetEndOfFile( HANDLE hFile )
     return FALSE;
 }
 
-/**************************************************************************
- *           SetFileCompletionNotificationModes   (KERNEL32.@)
- */
-BOOL WINAPI SetFileCompletionNotificationModes( HANDLE handle, UCHAR flags )
-{
-    FIXME("%p %x - stub\n", handle, flags);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
 BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS class, VOID *info, DWORD size )
 {
     FIXME("%p %u %p %u - stub\n", file, class, info, size);

dlls/kernel32/kernel32.spec

@@ -1136,7 +1136,6 @@
 @ stdcall SetFileApisToOEM()
 @ stdcall SetFileAttributesA(str long)
 @ stdcall SetFileAttributesW(wstr long)
-@ stdcall SetFileCompletionNotificationModes(long long)
 @ stdcall SetFileInformationByHandle(long long ptr long)
 @ stdcall SetFilePointer(long long ptr long)
 @ stdcall SetFilePointerEx(long int64 ptr long)

dlls/kernel32/process.c

@@ -2651,33 +2651,6 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A
         return FALSE;
     if (hFile == INVALID_HANDLE_VALUE) goto done;
 
-    /* CROSSOVER HACK: bug 13322 (winehq bug 39403)
-     * Insert --no-sandbox in command line of Steam's web helper process to
-     * work around problems hooking our ntdll exports. */
-    {
-        static const WCHAR steamwebhelperexeW[] = {'s','t','e','a','m','w','e','b','h','e','l','p','e','r','.','e','x','e',0};
-        static const WCHAR nosandboxW[] = {' ','-','-','n','o','-','s','a','n','d','b','o','x',0};
-
-        if (strstrW(name, steamwebhelperexeW))
-        {
-            LPWSTR new_command_line;
-
-            new_command_line = HeapAlloc(GetProcessHeap(), 0,
-                sizeof(WCHAR) * (strlenW(tidy_cmdline) + strlenW(nosandboxW) + 1));
-
-            if (!new_command_line) return FALSE;
-
-            strcpyW(new_command_line, tidy_cmdline);
-            strcatW(new_command_line, nosandboxW);
-
-            TRACE("CrossOver hack changing command line to %s\n", debugstr_w(new_command_line));
-
-            if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline );
-            tidy_cmdline = new_command_line;
-        }
-    }
-    /* end CROSSOVER HACK */
-
     /* Warn if unsupported features are used */
 
     if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS |

dlls/msi/automation.c

@@ -1832,41 +1832,13 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags,
                                                 EXCEPINFO* pExcepInfo,
                                                 UINT* puArgErr)
 {
-    UINT ret;
-    HRESULT hr;
-    MSIHANDLE hsuminfo;
-    IDispatch *dispatch;
-    VARIANTARG varg0, varg1;
-
-    if (!(wFlags & DISPATCH_PROPERTYGET))
+    if (!(wFlags & DISPATCH_METHOD))
         return DISP_E_MEMBERNOTFOUND;
 
-    VariantInit(&varg0);
-    hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr);
-    if (FAILED(hr))
-        return hr;
-
-    VariantInit(&varg1);
-    hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr);
-    if (FAILED(hr))
-        return hr;
-
-    V_VT(pVarResult) = VT_DISPATCH;
-
-    ret = MsiGetSummaryInformationW(0, V_BSTR(&varg0), V_I4(&varg1), &hsuminfo);
-    if (ret != ERROR_SUCCESS)
-    {
-        hr = DISP_E_EXCEPTION;
-        goto done;
-    }
-
-    hr = create_summaryinfo(hsuminfo, &dispatch);
-    if (SUCCEEDED(hr))
-        V_DISPATCH(pVarResult) = dispatch;
+    FIXME("\n");
 
-done:
-    VariantClear(&varg0);
-    return hr;
+    VariantInit(pVarResult);
+    return S_OK;
 }
 
 static HRESULT InstallerImpl_UILevel(WORD wFlags,

dlls/msi/tests/automation.c

@@ -1128,25 +1128,6 @@ static HRESULT Installer_UILevelPut(int level)
     return invoke(pInstaller, "UILevel", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY);
 }
 
-static HRESULT Installer_SummaryInformation(BSTR PackagePath, int UpdateCount, IDispatch **pSumInfo)
-{
-    VARIANT varresult;
-    VARIANTARG vararg[2];
-    DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0};
-    HRESULT hr;
-
-    VariantInit(&vararg[1]);
-    V_VT(&vararg[1]) = VT_BSTR;
-    V_BSTR(&vararg[1]) = SysAllocString(PackagePath);
-    VariantInit(&vararg[0]);
-    V_VT(&vararg[0]) = VT_I4;
-    V_I4(&vararg[0]) = UpdateCount;
-
-    hr = invoke(pInstaller, "SummaryInformation", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_DISPATCH);
-    *pSumInfo = V_DISPATCH(&varresult);
-    return hr;
-}
-
 static HRESULT Session_Installer(IDispatch *pSession, IDispatch **pInst)
 {
     VARIANT varresult;
@@ -2621,7 +2602,7 @@ static void test_Installer(void)
     static const WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 };
     WCHAR szPath[MAX_PATH];
     HRESULT hr;
-    IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL, *pSumInfo = NULL;
+    IDispatch *pSession = NULL, *pDatabase = NULL, *pRecord = NULL, *pStringList = NULL;
     int iValue, iCount;
 
     if (!pInstaller) return;
@@ -2697,18 +2678,6 @@ static void test_Installer(void)
         IDispatch_Release(pDatabase);
     }
 
-    /* Installer::SummaryInformation */
-    hr = Installer_SummaryInformation(szPath, 0, &pSumInfo);
-    ok(hr == S_OK, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr);
-    if (hr == S_OK)
-    {
-        test_SummaryInfo(pSumInfo, summary_info, sizeof(summary_info)/sizeof(msi_summary_info), TRUE);
-        IDispatch_Release(pSumInfo);
-    }
-
-    hr = Installer_SummaryInformation(NULL, 0, &pSumInfo);
-    ok(hr == DISP_E_EXCEPTION, "Installer_SummaryInformation failed, hresult 0x%08x\n", hr);
-
     /* Installer::RegistryValue */
     test_Installer_RegistryValue();
 

dlls/ntdll/ntdll.spec

@@ -182,7 +182,7 @@
 @ stub NtGetPlugPlayEvent
 @ stdcall NtGetTickCount()
 @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr)
-@ stdcall NtImpersonateAnonymousToken(long)
+@ stub NtImpersonateAnonymousToken
 @ stub NtImpersonateClientOfPort
 @ stub NtImpersonateThread
 @ stub NtInitializeRegistry

dlls/ntdll/sec.c

@@ -1521,16 +1521,6 @@ RtlImpersonateSelf(SECURITY_IMPERSONATION_LEVEL ImpersonationLevel)
 }
 
 /******************************************************************************
- *  NtImpersonateAnonymousToken      [NTDLL.@]
- */
-NTSTATUS WINAPI
-NtImpersonateAnonymousToken(HANDLE thread)
-{
-    FIXME("(%p): stub\n", thread);
-    return STATUS_NOT_IMPLEMENTED;
-}
-
-/******************************************************************************
  *  NtAccessCheck		[NTDLL.@]
  *  ZwAccessCheck		[NTDLL.@]
  *

dlls/ole32/stubmanager.c

@@ -38,8 +38,6 @@
 #include "rpc.h"
 
 #include "wine/debug.h"
-#include "wine/exception.h"
-
 #include "compobj_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
@@ -253,18 +251,7 @@ static void stub_manager_delete(struct stub_manager *m)
         IExternalConnection_Release(m->extern_conn);
 
     CoTaskMemFree(m->oxid_info.psa);
-
-    /* Some broken apps crash in object destructors. We have a test showing
-     * that on winxp+ those crashes are caught and ignored. */
-    __TRY
-    {
-        IUnknown_Release(m->object);
-    }
-    __EXCEPT_PAGE_FAULT
-    {
-        ERR("Got page fault when releasing stub!\n");
-    }
-    __ENDTRY
+    IUnknown_Release(m->object);
 
     DEBUG_CLEAR_CRITSEC_NAME(&m->lock);
     DeleteCriticalSection(&m->lock);

dlls/ole32/tests/marshal.c

@@ -195,24 +195,6 @@ static const IUnknownVtbl TestUnknown_Vtbl =
 
 static IUnknown Test_Unknown = { &TestUnknown_Vtbl };
 
-static ULONG WINAPI TestCrash_IUnknown_Release(LPUNKNOWN iface)
-{
-    UnlockModule();
-    if(!cLocks) {
-        trace("crashing...\n");
-        *(int**)0xc = 0;
-    }
-    return 1; /* non-heap-based object */
-}
-
-static const IUnknownVtbl TestCrashUnknown_Vtbl =
-{
-    Test_IUnknown_QueryInterface,
-    Test_IUnknown_AddRef,
-    TestCrash_IUnknown_Release,
-};
-
-static IUnknown TestCrash_Unknown = { &TestCrashUnknown_Vtbl };
 
 static HRESULT WINAPI Test_IClassFactory_QueryInterface(
     LPCLASSFACTORY iface,
@@ -1100,63 +1082,6 @@ static void test_no_couninitialize_client(void)
     end_host_object(host_tid, host_thread);
 }
 
-static BOOL crash_thread_success;
-
-static DWORD CALLBACK crash_couninitialize_proc(void *p)
-{
-    IStream *stream;
-    HRESULT hr;
-
-    cLocks = 0;
-
-    CoInitialize(NULL);
-
-    hr = CreateStreamOnHGlobal(NULL, TRUE, &stream);
-    ok_ole_success(hr, CreateStreamOnHGlobal);
-
-    hr = CoMarshalInterface(stream, &IID_IUnknown, &TestCrash_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
-    ok_ole_success(hr, CoMarshalInterface);
-
-    IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL);
-
-    hr = CoReleaseMarshalData(stream);
-    ok_ole_success(hr, CoReleaseMarshalData);
-
-    ok_no_locks();
-
-    hr = CoMarshalInterface(stream, &IID_IUnknown, &TestCrash_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL);
-    ok_ole_success(hr, CoMarshalInterface);
-
-    ok_more_than_one_lock();
-
-    trace("CoUninitialize >>>\n");
-    CoUninitialize();
-    trace("CoUninitialize <<<\n");
-
-    ok_no_locks();
-
-    IStream_Release(stream);
-    crash_thread_success = TRUE;
-    return 0;
-}
-
-static void test_crash_couninitialize(void)
-{
-    HANDLE thread;
-    DWORD tid;
-
-    if(!GetProcAddress(GetModuleHandleA("kernel32.dll"), "CreateActCtxW")) {
-        win_skip("Skipping crash tests on win2k.\n");
-        return;
-    }
-
-    crash_thread_success = FALSE;
-    thread = CreateThread(NULL, 0, crash_couninitialize_proc, NULL, 0, &tid);
-    ok(!WaitForSingleObject(thread, 10000), "wait timed out\n");
-    CloseHandle(thread);
-    ok(crash_thread_success, "Crash thread failed\n");
-}
-
 /* tests success case of a same-thread table-weak marshal, unmarshal, unmarshal */
 static void test_tableweak_marshal_and_unmarshal_twice(void)
 {
@@ -3624,7 +3549,6 @@ START_TEST(marshal)
 
     test_globalinterfacetable();
     test_manualresetevent();
-    test_crash_couninitialize();
 
     /* must be last test as channel hooks can't be unregistered */
     test_channel_hook();

dlls/secur32/schannel_gnutls.c

@@ -479,9 +479,7 @@ BOOL schan_imp_init(void)
 
 if (1) { /* CROSSOVER HACK - bug 10151 */
     const char *libgnutls_name_candidates[] = {SONAME_LIBGNUTLS,
-                                               "libgnutls.so.30",
                                                "libgnutls.so.28",
-                                               "libgnutls-deb0.so.28",
                                                "libgnutls.so.26",
                                                NULL};
     int i;

dlls/vbscript/tests/regexp.vbs

@@ -174,21 +174,4 @@ Call ok(x.IgnoreCase = false, "RegExp.IgnoreCase = " & x.IgnoreCase)
 Call ok(x.Global = false, "RegExp.Global = " & x.Global)
 Call ok(x.Multiline = false, "RegExp.Multiline = " & x.Multiline)
 
-set matches = x.execute("test")
-Call ok(matches.Count = 1, "matches.Count = " & matches.Count)
-x.pattern = ""
-set matches = x.execute("test")
-Call ok(matches.Count = 1, "matches.Count = " & matches.Count)
-set match = matches.item(0)
-Call ok(match.Value = "", "match.Value = " & match.Value)
-x.global = true
-set matches = x.execute("test")
-Call ok(matches.Count = 5, "matches.Count = " & matches.Count)
-set match = matches.item(0)
-Call ok(match.Value = "", "match.Value = " & match.Value)
-set match = matches.item(4)
-Call ok(match.Value = "", "match.Value = " & match.Value)
-matches = x.test("test")
-Call ok(matches = true, "matches = " & matches)
-
 Call reportSuccess()

dlls/vbscript/vbregexp.c

@@ -1189,23 +1189,29 @@ static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern)
 static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern)
 {
     RegExp2 *This = impl_from_IRegExp2(iface);
-    WCHAR *new_pattern;
+    WCHAR *p;
+    DWORD size;
 
     TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(pattern));
 
-    if(pattern && *pattern) {
-        SIZE_T size = (SysStringLen(pattern)+1) * sizeof(WCHAR);
-        new_pattern = heap_alloc(size);
-        if(!new_pattern)
-            return E_OUTOFMEMORY;
-        memcpy(new_pattern, pattern, size);
-    }else {
-        new_pattern = NULL;
+    if(!pattern) {
+        heap_free(This->pattern);
+        if(This->regexp) {
+            regexp_destroy(This->regexp);
+            This->regexp = NULL;
+        }
+        This->pattern = NULL;
+        return S_OK;
     }
 
-    heap_free(This->pattern);
-    This->pattern = new_pattern;
+    size = (SysStringLen(pattern)+1) * sizeof(WCHAR);
+    p = heap_alloc(size);
+    if(!p)
+        return E_OUTOFMEMORY;
 
+    heap_free(This->pattern);
+    This->pattern = p;
+    memcpy(p, pattern, size);
     if(This->regexp) {
         regexp_destroy(This->regexp);
         This->regexp = NULL;

dlls/wined3d/directx.c

@@ -872,101 +872,6 @@ static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_re
     return gl_vendor == GL_VENDOR_FGLRX;
 }
 
-static BOOL match_broken_round(const struct wined3d_gl_info *gl_info, const char *gl_renderer,
-        enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device)
-{
-    const char *shader =
-        "#version 120\n"
-        "#extension GL_EXT_gpu_shader4 : enable\n"
-        "void main()\n"
-        "{\n"
-        "    vec4 color;\n"
-        "    vec4 rounded = round(gl_MultiTexCoord0.yxzw);\n"
-        "    /* all(rounded == gl_MultiTexCoord1) fails for some reason */\n"
-        "    if (all(equal(rounded, gl_MultiTexCoord1)))\n"
-        "    {\n"
-        "        color = vec4(0.0, 1.0, 0.0, 0.0);\n"
-        "    }\n"
-        "    else\n"
-        "    {\n"
-        "        color = vec4(1.0, 0.0, 0.0, 0.0);\n"
-        "    }\n"
-        "    gl_FrontColor = color;\n"
-        "    gl_Position = gl_Vertex;\n"
-        "}\n";
-    GLuint tex, fbo;
-    GLuint prog, vs;
-    GLenum status;
-    DWORD check;
-    unsigned char red, green, blue;
-
-    if (!gl_info->supported[EXT_GPU_SHADER4]) return FALSE;
-
-    if (wined3d_settings.offscreen_rendering_mode != ORM_FBO)
-    {
-        WARN("FBOs not available, guessing broken glsl round from driver info\n");
-        return gl_vendor == GL_VENDOR_APPLE && card_vendor == HW_VENDOR_AMD;
-    }
-
-    gl_info->gl_ops.gl.p_glGenTextures(1, &tex);
-    gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex);
-    gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 1, 1, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
-    checkGLcall("glTexImage2D");
-    gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, 0);
-
-    gl_info->fbo_ops.glGenFramebuffers(1, &fbo);
-    gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-    gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0);
-    checkGLcall("glFramebufferTexture2D");
-
-    status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    if (status != GL_FRAMEBUFFER_COMPLETE) ERR("FBO status %#x\n", status);
-    checkGLcall("glCheckFramebufferStatus");
-
-    vs = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER));
-    GL_EXTCALL(glShaderSourceARB(vs, 1, &shader, 0));
-    GL_EXTCALL(glCompileShaderARB(vs));
-
-    prog = GL_EXTCALL(glCreateProgramObjectARB());
-    GL_EXTCALL(glAttachObjectARB(prog, vs));
-    GL_EXTCALL(glLinkProgramARB(prog));
-    GL_EXTCALL(glDeleteObjectARB(vs));
-    GL_EXTCALL(glUseProgramObjectARB(prog));
-    checkGLcall("round test shader setup");
-
-    gl_info->gl_ops.gl.p_glBegin(GL_QUADS);
-    GL_EXTCALL(glMultiTexCoord4fARB(0, 1.0, 2.0, 3.0, 4.0));
-    /* Note that the result is swizzled */
-    GL_EXTCALL(glMultiTexCoord4fARB(1, 2.0, 1.0, 3.0, 4.0));
-    gl_info->gl_ops.gl.p_glVertex3f(-1.0, -1.0, -0.5);
-    gl_info->gl_ops.gl.p_glVertex3f(-1.0,  1.0, -0.5);
-    gl_info->gl_ops.gl.p_glVertex3f( 1.0,  1.0, -0.5);
-    gl_info->gl_ops.gl.p_glVertex3f( 1.0, -1.0, -0.5);
-    gl_info->gl_ops.gl.p_glEnd();
-    checkGLcall("round test draw");
-
-    gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex);
-    gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, &check);
-    GL_EXTCALL(glUseProgramObjectARB(0));
-    GL_EXTCALL(glDeleteObjectARB(prog));
-
-    gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0);
-    gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo);
-    gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, 0);
-    gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex);
-    checkGLcall("round test teardown");
-
-    TRACE("GLSL round test color: %08x\n", check);
-    red = (check & 0x00ff0000) >> 16;
-    green = (check & 0x0000ff00) >> 8;
-    blue = (check & 0x000000ff);
-    /* If round behaves correctly green is returned. Return FALSE in this
-     * case(don't enable quirk). For any other color return TRUE */
-    return (red > 0x10) || (green < 0xf0) || (blue > 0x10);
-}
-
 static void quirk_arb_constants(struct wined3d_gl_info *gl_info)
 {
     TRACE("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->limits.arb_vs_native_constants);
@@ -1252,11 +1157,6 @@ static void quirk_limited_tex_filtering(struct wined3d_gl_info *gl_info)
     gl_info->quirks |= WINED3D_QUIRK_LIMITED_TEX_FILTERING;
 }
 
-static void broken_round_quirk(struct wined3d_gl_info *gl_info)
-{
-    gl_info->quirks |= WINED3D_CX_QUIRK_BROKEN_ROUND;
-}
-
 static void quirk_apple_double_buffer(struct wined3d_gl_info *gl_info)
 {
     gl_info->quirks |= WINED3D_CX_QUIRK_APPLE_DOUBLE_BUFFER;
@@ -1410,11 +1310,6 @@ static const struct driver_quirk quirk_table[] =
         "Render to FBO quirk"
     },
     {
-        match_broken_round,
-        broken_round_quirk,
-        "Broken GLSL round"
-    },
-    {
         match_apple,
         quirk_apple_double_buffer,
         "Apple double buffered context bug (9330)"

dlls/wined3d/glsl_shader.c

@@ -2508,7 +2508,7 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins)
         /* We need to *round* to the nearest int here. */
         unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask);
 
-        if (gl_info->supported[EXT_GPU_SHADER4] && !(gl_info->quirks & WINED3D_CX_QUIRK_BROKEN_ROUND))
+        if (gl_info->supported[EXT_GPU_SHADER4])
         {
             if (mask_size > 1)
                 shader_addline(buffer, "ivec%d(round(%s)));\n", mask_size, src0_param.param_str);

dlls/wined3d/surface.c

@@ -5320,10 +5320,7 @@ release:
 
         if (dst_surface->container->swapchain
                 && dst_surface->container == dst_surface->container->swapchain->front_buffer)
-        {
-            dst_surface->lockedRect = *dst_rect;
             dst_surface->surface_ops->surface_frontbuffer_updated(dst_surface);
-        }
     }
     if (src_surface && src_surface != dst_surface && src_data)
         wined3d_resource_release_map_ptr(&src_surface->resource, context);

dlls/wined3d/wined3d_private.h

@@ -72,7 +72,6 @@
 #define WINED3D_CX_QUIRK_BROKEN_ARA             0x00100000
 #define WINED3D_CX_QUIRK_BLIT                   0x00200000
 #define WINED3D_CX_QUIRK_RENDER_TO_FBO          0x00800000
-#define WINED3D_CX_QUIRK_BROKEN_ROUND           0x01000000
 
 /* Texture format fixups */
 

dlls/winex11.drv/mouse.c

@@ -131,7 +131,6 @@ static Cursor create_cursor( HANDLE handle );
 
 #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
 static BOOL xinput2_available;
-static BOOL broken_rawevents;
 #define MAKE_FUNCPTR(f) static typeof(f) * p##f
 MAKE_FUNCPTR(XIFreeDeviceInfo);
 MAKE_FUNCPTR(XIQueryDevice);
@@ -1580,15 +1579,7 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev )
     if (!hwnd)
     {
         struct x11drv_thread_data *thread_data = x11drv_thread_data();
-        if (thread_data->warp_serial)
-        {
-            if ((long)(event->serial - thread_data->warp_serial) < 0)
-            {
-                TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial );
-                return;
-            }
-            thread_data->warp_serial = 0;  /* we caught up now */
-        }
+        if (thread_data->warp_serial && (long)(event->serial - thread_data->warp_serial) < 0) return;
     }
 
     send_mouse_input( hwnd, event->window, event->state, &input );
@@ -1678,7 +1669,7 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev )
         break;
     }
 
-    if (broken_rawevents && thread_data->warp_serial)
+    if (thread_data->warp_serial)
     {
         if ((long)(xev->serial - thread_data->warp_serial) < 0)
         {
@@ -1725,12 +1716,6 @@ void X11DRV_XInput2_Init(void)
 #undef LOAD_FUNCPTR
 
     xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error );
-
-    /* Until version 1.10.4 rawinput was broken in XOrg, see
-     * https://bugs.freedesktop.org/show_bug.cgi?id=30068 */
-    broken_rawevents  = strstr(XServerVendor( gdi_display ), "X.Org") &&
-                        XVendorRelease( gdi_display ) < 11004000;
-
 #else
     TRACE( "X Input 2 support not compiled in.\n" );
 #endif

dlls/wininet/internet.c

@@ -1330,8 +1330,9 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet,
     HINTERNET rc = NULL;
     DWORD res = ERROR_SUCCESS;
 
-    TRACE("(%p, %s, %u, %s, %p, %u, %x, %lx)\n", hInternet, debugstr_w(lpszServerName),
-          nServerPort, debugstr_w(lpszUserName), lpszPassword, dwService, dwFlags, dwContext);
+    TRACE("(%p, %s, %i, %s, %s, %i, %x, %lx)\n", hInternet, debugstr_w(lpszServerName),
+	  nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword),
+	  dwService, dwFlags, dwContext);
 
     if (!lpszServerName)
     {

include/winbase.h

@@ -2328,7 +2328,6 @@ WINBASEAPI VOID        WINAPI SetFileApisToOEM(void);
 WINBASEAPI BOOL        WINAPI SetFileAttributesA(LPCSTR,DWORD);
 WINBASEAPI BOOL        WINAPI SetFileAttributesW(LPCWSTR,DWORD);
 #define                       SetFileAttributes WINELIB_NAME_AW(SetFileAttributes)
-WINBASEAPI BOOL        WINAPI SetFileCompletionNotificationModes(HANDLE,UCHAR);
 WINBASEAPI DWORD       WINAPI SetFilePointer(HANDLE,LONG,LPLONG,DWORD);
 WINBASEAPI BOOL        WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,LARGE_INTEGER*,DWORD);
 WINADVAPI  BOOL        WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);