September 2011 - Wine-commits

Octavian Voicu : ntdll: Fix two buffer overflow conditions in RtlDosPathNameToNtPathName_U.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: ce60eb845968d80e693566dd9bbf284fed31bc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce60eb845968d80e693566dd9… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Tue Sep 6 15:23:42 2011 +0300 ntdll: Fix two buffer overflow conditions in RtlDosPathNameToNtPathName_U. --- dlls/ntdll/path.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 3207720..6138fa8 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -383,8 +383,14 @@ BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR dos_path, if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz))) return FALSE; sz = RtlGetFullPathName_U(dos_path, sz, ptr, file_part); } + sz += (1 /* NUL */ + 4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); + if (sz > MAXWORD) + { + if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); + return FALSE; + } - ntpath->MaximumLength = sz + (4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); + ntpath->MaximumLength = sz; ntpath->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, ntpath->MaximumLength); if (!ntpath->Buffer) {

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: f74a897f0eb47bea874b9247a24ad0dd61aa3507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74a897f0eb47bea874b9247a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 6 17:34:42 2011 +0200 po: Update German translation. --- po/de.po | 36 ++++++------------------------------ 1 files changed, 6 insertions(+), 30 deletions(-) diff --git a/po/de.po b/po/de.po index ddc271f..0a68e4d 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-01 18:05+0200\n" +"PO-Revision-Date: 2011-09-06 08:07+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -688,7 +688,6 @@ msgid "Prefer Signed Data" msgstr "Signierte Daten bevorzugen" #: crypt32.rc:53 cryptdlg.rc:31 -#, fuzzy msgctxt "Certification Practice Statement" msgid "CPS" msgstr "CPS" @@ -1226,7 +1225,6 @@ msgid "Subject Type=" msgstr "Subject Typ=" #: crypt32.rc:195 -#, fuzzy msgctxt "Certificate Authority" msgid "CA" msgstr "Zertifikationsautorität" @@ -1257,7 +1255,6 @@ msgid "Access Method=" msgstr "Zugriffsmethode=" #: crypt32.rc:202 -#, fuzzy msgctxt "Online Certificate Status Protocol" msgid "OCSP" msgstr "OCSP" @@ -2354,9 +2351,8 @@ msgid "URI to be encoded contains invalid characters" msgstr "Zu verschlüsselnde URI enthält ungültige Zeichen" #: jscript.rc:48 -#, fuzzy msgid "URI to be decoded is incorrect" -msgstr "Zu verschlüsselnde URI enthält ungültige Zeichen" +msgstr "Zu entschlüsselnde URI ist ungültig" #: jscript.rc:50 msgid "Array length must be a finite positive integer" @@ -3853,9 +3849,8 @@ msgid "Perform operation even when nothing changed\n" msgstr "Operation durchführen, auch wenn sich nichts ändert\n" #: winerror.mc:1896 -#, fuzzy msgid "The user profile is invalid\n" -msgstr "Das Benutzerprofil ist ungültig." +msgstr "Das Benutzerprofil ist ungültig\n" #: winerror.mc:1901 msgid "Not supported on Small Business Server\n" @@ -4518,9 +4513,8 @@ msgid "Installer service failed.\n" msgstr "Installer Dienst gescheitert.\n" #: winerror.mc:2731 -#, fuzzy msgid "Installation aborted by user\n" -msgstr "Setup-Programme" +msgstr "Installation von Benutzer abgebrochen\n" #: winerror.mc:2736 msgid "Installation failure\n" @@ -5922,13 +5916,8 @@ msgid "Set as &Desktop Item" msgstr "Als Desktopelement einrichten..." #: shdoclc.rc:46 shdoclc.rc:95 shdoclc.rc:117 user32.rc:62 -#, fuzzy msgid "Select &All" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Alles &auswählen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Alles markieren" +msgstr "&Alles markieren" #: shdoclc.rc:47 shdoclc.rc:79 shdoclc.rc:92 shdoclc.rc:132 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:59 wineconsole.rc:30 wordpad.rc:103 @@ -6037,13 +6026,8 @@ msgid "&Delete" msgstr "&Löschen" #: shdoclc.rc:100 shell32.rc:94 -#, fuzzy msgid "&Select" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Auswählen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Aus&wählen" +msgstr "Aus&wählen" #: shdoclc.rc:102 msgid "&Cell" @@ -6769,19 +6753,16 @@ msgid "%ld bytes" msgstr "%ld Bytes" #: shlwapi.rc:28 -#, fuzzy msgctxt "time unit: hours" msgid " hr" msgstr " Std" #: shlwapi.rc:29 -#, fuzzy msgctxt "time unit: minutes" msgid " min" msgstr " Min" #: shlwapi.rc:30 -#, fuzzy msgctxt "time unit: seconds" msgid " sec" msgstr " Sek" @@ -9951,12 +9932,10 @@ msgid "&Realtime" msgstr "&Echtzeit" #: taskmgr.rc:160 -#, fuzzy msgid "&Above Normal" msgstr "&Höher als Normal" #: taskmgr.rc:164 -#, fuzzy msgid "&Below Normal" msgstr "N&iedriger als Normal" @@ -11333,13 +11312,11 @@ msgid "Pages" msgstr "Seiten" #: wordpad.rc:172 -#, fuzzy msgctxt "unit: centimeter" msgid "cm" msgstr "cm" #: wordpad.rc:173 -#, fuzzy msgctxt "unit: inch" msgid "in" msgstr "in" @@ -11349,7 +11326,6 @@ msgid "inch" msgstr "Zoll" #: wordpad.rc:175 -#, fuzzy msgctxt "unit: point" msgid "pt" msgstr "pt"

1 0

Frédéric Delanoy : cmd: Get rid of obsolete autoexec.bat handling code.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 54c2f6491dbe1493bebc2bb00053998d413a7cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c2f6491dbe1493bebc2bb00… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 01:13:07 2011 +0200 cmd: Get rid of obsolete autoexec.bat handling code. --- programs/cmd/wcmdmain.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ce07111..ed1b46c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2252,11 +2252,8 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR *cmd = NULL; WCHAR string[1024]; WCHAR envvar[4]; - HANDLE h; int opt_q; int opt_t = 0; - static const WCHAR autoexec[] = {'\\','a','u','t','o','e','x','e','c','.', - 'b','a','t','\0'}; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; char ansiVersion[100]; @@ -2575,19 +2572,6 @@ int wmain (int argc, WCHAR *argvW[]) } /* - * If there is an AUTOEXEC.BAT file, try to execute it. - */ - - GetFullPathNameW (autoexec, sizeof(string)/sizeof(WCHAR), string, NULL); - h = CreateFileW(string, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h != INVALID_HANDLE_VALUE) { - CloseHandle (h); -#if 0 - WCMD_batch (autoexec, autoexec, 0, NULL, INVALID_HANDLE_VALUE); -#endif - } - -/* * Loop forever getting commands and executing them. */

1 0

Alexandre Julliard : mountmgr.sys: Include system headers before Windows headers.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 2fff57a5e7f501dbb736b4edb7903324dabccfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fff57a5e7f501dbb736b4edb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 12:11:41 2011 +0200 mountmgr.sys: Include system headers before Windows headers. --- dlls/mountmgr.sys/diskarb.c | 5 +++-- dlls/mountmgr.sys/hal.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index d3912ca..9a7616e 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -26,6 +26,9 @@ #include <stdarg.h> #include <stdio.h> #include <sys/time.h> +#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H +#include <DiskArbitration/DiskArbitration.h> +#endif #include "mountmgr.h" #include "wine/debug.h" @@ -34,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H -#include <DiskArbitration/DiskArbitration.h> - static void appeared_callback( DADiskRef disk, void *context ) { CFDictionaryRef dict = DADiskCopyDescription( disk ); diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 82a70e9..d369879 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -26,6 +26,10 @@ #include <stdarg.h> #include <stdio.h> #include <sys/time.h> +#ifdef SONAME_LIBHAL +# include <dbus/dbus.h> +# include <hal/libhal.h> +#endif #include "mountmgr.h" #include "winnls.h" @@ -39,9 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef SONAME_LIBHAL -#include <dbus/dbus.h> -#include <hal/libhal.h> - #define DBUS_FUNCS \ DO_FUNC(dbus_bus_get); \ DO_FUNC(dbus_connection_close); \

1 0

Alexandre Julliard : kernel32: Include system headers before Windows headers.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 3e4a9cb4d4cb0431546a3af94c9a4091e95a7a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e4a9cb4d4cb0431546a3af94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 12:11:46 2011 +0200 kernel32: Include system headers before Windows headers. --- dlls/kernel32/process.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b0eba7c..3c6ae63 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -41,6 +41,13 @@ # include <sys/prctl.h> #endif #include <sys/types.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifdef __APPLE__ +#include <CoreFoundation/CoreFoundation.h> +#include <pthread.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -57,9 +64,6 @@ WINE_DECLARE_DEBUG_CHANNEL(file); WINE_DECLARE_DEBUG_CHANNEL(relay); #ifdef __APPLE__ -#include <CoreFoundation/CoreFoundation.h> -#include <pthread.h> -#include <unistd.h> extern char **__wine_get_main_environment(void); #else extern char **__wine_main_environ;

1 0

Alexandre Julliard : openal32: Include system headers before Windows headers.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 34a7180caf14fe7006b66e5da94b076e1713182d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a7180caf14fe7006b66e5da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 12:11:55 2011 +0200 openal32: Include system headers before Windows headers. --- dlls/openal32/openal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 9e0a8f2..6a8e8f1 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -25,10 +25,6 @@ #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - #ifdef HAVE_AL_AL_H #include <AL/al.h> #include <AL/alc.h> @@ -37,6 +33,10 @@ #include <OpenAL/alc.h> #endif +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(openal32); static ALCboolean (ALC_APIENTRY*alcSetThreadContext)(ALCcontext *context);

1 0

Alexandre Julliard : qcap: Include system headers before Windows headers.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: b870cd1a162e84accbce1255be2394915214c0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b870cd1a162e84accbce1255b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 12:12:05 2011 +0200 qcap: Include system headers before Windows headers. --- dlls/qcap/v4l.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index fadcd49..a7995e2 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -24,29 +24,14 @@ #include "config.h" #include "wine/port.h" -#include "wine/library.h" #define NONAMELESSSTRUCT #define NONAMELESSUNION #define COBJMACROS #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "wine/debug.h" - -#include "capture.h" -#include "qcap_main.h" - #include <stdio.h> #include <fcntl.h> - #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -69,6 +54,20 @@ #include <unistd.h> #endif +#include "windef.h" +#include "winbase.h" +#include "wtypes.h" +#include "wingdi.h" +#include "winuser.h" +#include "dshow.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "wine/debug.h" +#include "wine/library.h" + +#include "capture.h" +#include "qcap_main.h" + WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); #ifdef HAVE_LINUX_VIDEODEV_H

1 0

Christian Costa : attrib: Move implementation from cmd. exe to the standalone command.
by Alexandre Julliard 06 Sep '11

06 Sep '11

1 0

André Hentschel : dbghelp: Add some new dwarf enumerations.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 650e000bc99ee8928ed4bd83e8df78a15a618e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=650e000bc99ee8928ed4bd83e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 5 20:55:30 2011 +0200 dbghelp: Add some new dwarf enumerations. --- dlls/dbghelp/dwarf.h | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 0605da3..683d4e1 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -282,7 +282,13 @@ typedef enum dwarf_type_e DW_ATE_unsigned = 0x7, DW_ATE_unsigned_char = 0x8, /* Dwarf3 new values */ - DW_ATE_imaginary_float = 0x9 + DW_ATE_imaginary_float = 0x9, + DW_ATE_packed_decimal = 0xa, + DW_ATE_numeric_string = 0xb, + DW_ATE_edited = 0xc, + DW_ATE_signed_fixed = 0xd, + DW_ATE_unsigned_fixed = 0xe, + DW_ATE_decimal_float = 0xf, } dwarf_type_t; typedef enum dwarf_operation_e @@ -454,6 +460,11 @@ typedef enum dwarf_operation_e DW_OP_GNU_encoded_addr = 0xf1, DW_OP_GNU_implicit_pointer = 0xf2, DW_OP_GNU_entry_value = 0xf3, + DW_OP_GNU_const_type = 0xf4, + DW_OP_GNU_regval_type = 0xf5, + DW_OP_GNU_deref_type = 0xf6, + DW_OP_GNU_convert = 0xf7, + DW_OP_GNU_reinterpret = 0xf9, } dwarf_operation_t; enum dwarf_calling_convention

1 0

Alexandre Julliard : gdi32: Add a SetDIBitsToDevice implementation in the null driver using PutImage.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 6f275874f359dce37c38936ed78800c611121697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f275874f359dce37c38936ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 13:27:03 2011 +0200 gdi32: Add a SetDIBitsToDevice implementation in the null driver using PutImage. --- dlls/gdi32/dib.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/driver.c | 7 --- dlls/gdi32/gdi_private.h | 3 + dlls/gdi32/tests/bitmap.c | 5 ++ 4 files changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 927a74f..c1de074 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -610,6 +610,107 @@ done: } +INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWORD cy, + INT x_src, INT y_src, UINT startscan, UINT lines, + const void *bits, BITMAPINFO *src_info, UINT coloruse ) +{ + DC *dc = get_nulldrv_dc( dev ); + char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits src_bits; + DWORD err; + UINT height; + BOOL top_down; + POINT pt; + RECT rect; + + top_down = (src_info->bmiHeader.biHeight < 0); + height = abs( src_info->bmiHeader.biHeight ); + + src_bits.ptr = (void *)bits; + src_bits.is_copy = FALSE; + src_bits.free = NULL; + + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; + + if (!lines || (startscan >= height)) return 0; + if (!top_down && lines > height - startscan) lines = height - startscan; + + /* map src to top-down coordinates with startscan as origin */ + src.x = x_src; + src.y = startscan + lines - (y_src + cy); + src.width = cx; + src.height = cy; + if (src.y > 0) + { + if (!top_down) + { + /* get rid of unnecessary lines */ + if (src.y >= lines) return 0; + lines -= src.y; + src.y = 0; + } + else if (src.y >= lines) return lines; + } + src_info->bmiHeader.biHeight = top_down ? -lines : lines; + + src.visrect.left = src.x; + src.visrect.top = src.y; + src.visrect.right = src.x + cx; + src.visrect.bottom = src.y + cy; + rect.left = 0; + rect.top = 0; + rect.right = src_info->bmiHeader.biWidth; + rect.bottom = abs( src_info->bmiHeader.biHeight ); + if (!intersect_rect( &src.visrect, &src.visrect, &rect )) return 0; + + pt.x = x_dst; + pt.y = y_dst; + LPtoDP( dev->hdc, &pt, 1 ); + dst.x = pt.x; + dst.y = pt.y; + dst.width = cx; + dst.height = cy; + if (GetLayout( dev->hdc ) & LAYOUT_RTL) dst.x -= cx - 1; + + dst.visrect.left = dst.x; + dst.visrect.top = dst.y; + dst.visrect.right = dst.x + cx; + dst.visrect.bottom = dst.y + cy; + if (get_clip_box( dc, &rect )) intersect_rect( &dst.visrect, &dst.visrect, &rect ); + + offset_rect( &src.visrect, dst.x - src.x, dst.y - src.y ); + intersect_rect( &rect, &src.visrect, &dst.visrect ); + src.visrect = dst.visrect = rect; + offset_rect( &src.visrect, src.x - dst.x, src.y - dst.y ); + if (is_rect_empty( &dst.visrect )) return lines; + + dev = GET_DC_PHYSDEV( dc, pPutImage ); + memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = dev->funcs->pPutImage( dev, 0, 0, dst_info, &src_bits, &src, &dst, SRCCOPY ); + if (err == ERROR_BAD_FORMAT) + { + void *ptr; + + dst_info->bmiHeader.biWidth = src.visrect.right - src.visrect.left; + ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); + if (ptr) + { + err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); + if (src_bits.free) src_bits.free( &src_bits ); + src_bits.ptr = ptr; + src_bits.is_copy = TRUE; + src_bits.free = free_heap_bits; + if (!err) err = dev->funcs->pPutImage( dev, 0, 0, dst_info, &src_bits, &src, &dst, SRCCOPY ); + } + else err = ERROR_OUTOFMEMORY; + } + if (err) lines = 0; + if (src_bits.free) src_bits.free( &src_bits ); + return lines; +} + /*********************************************************************** * SetDIBitsToDevice (GDI32.@) */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 6233525..5beb04d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -502,13 +502,6 @@ static UINT nulldrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const R return 0; } -static INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, - INT x_src, INT y_src, UINT start, UINT lines, - const void *bits, BITMAPINFO *info, UINT coloruse ) -{ - return 0; -} - static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 82dbc36..c4ed75a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -499,6 +499,9 @@ extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, + INT x_src, INT y_src, UINT start, UINT lines, + const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern INT nulldrv_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 6a80232..a2dbfd9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4265,6 +4265,11 @@ static void test_SetDIBitsToDevice(void) for (i = 0; i < 64; i++) ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); memset( dib_bits, 0xaa, 64 * 4 ); + ret = SetDIBitsToDevice( hdc, 0, 2, 8, 4, 0, -1, 3, 12, data, info, DIB_RGB_COLORS ); + ok( ret == 0, "got %d\n", ret ); + for (i = 0; i < 64; i++) ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + SetMapMode( hdc, MM_ANISOTROPIC ); SetWindowExtEx( hdc, 3, 3, NULL ); ret = SetDIBitsToDevice( hdc, 2, 2, 2, 2, 1, 2, 1, 5, data, info, DIB_RGB_COLORS );

1 0