[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:03:40 UTC 2012


The following commit has been merged in the wheezy branch:
commit ed465818c60f95ed34dad7f29a76f6c3c8b21c50
Author: Owen Rudge <owen at owenrudge.net>
Date:   Mon May 14 15:23:29 2012 +0100

    user32: Correct return value when buffer too short in GetUserObjectInformation.
    (cherry picked from commit 83f67ff998097c92cb5d3eef128969d25c6588e5)

diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c
index 8126b31..770245d 100644
--- a/dlls/user32/winstation.c
+++ b/dlls/user32/winstation.c
@@ -484,7 +484,7 @@ BOOL WINAPI GetUserObjectInformationA( HANDLE handle, INT index, LPVOID info, DW
         if (needed) *needed = lenA;
         if (lenA > len)
         {
-            SetLastError( ERROR_MORE_DATA );
+            SetLastError( ERROR_INSUFFICIENT_BUFFER );
             return FALSE;
         }
         if (info) WideCharToMultiByte( CP_ACP, 0, buffer, -1, info, len, NULL, NULL );
@@ -541,7 +541,7 @@ BOOL WINAPI GetUserObjectInformationW( HANDLE handle, INT index, LPVOID info, DW
                 if (needed) *needed = size;
                 if (len < size)
                 {
-                    SetLastError( ERROR_MORE_DATA );
+                    SetLastError( ERROR_INSUFFICIENT_BUFFER );
                     ret = FALSE;
                 }
                 else memcpy( info, reply->is_desktop ? desktopW : winstationW, size );
@@ -567,7 +567,7 @@ BOOL WINAPI GetUserObjectInformationW( HANDLE handle, INT index, LPVOID info, DW
                     if (needed) *needed = size;
                     if (len < size)
                     {
-                        SetLastError( ERROR_MORE_DATA );
+                        SetLastError( ERROR_INSUFFICIENT_BUFFER );
                         ret = FALSE;
                     }
                     else memcpy( info, buffer, size );

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list