May 2006 - Wine-Commits - list.winehq.org

Marcus Meissner : Some documentation changes for twain split.
by Alexandre Julliard May 9, 2006

May 9, 2006

Module: wine Branch: refs/heads/master Commit: 81c2ef541983b24829ed68ca2de3335100787b3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81c2ef541983b24829ed68c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon May 8 23:15:24 2006 +0200 Some documentation changes for twain split. --- DEVELOPERS-HINTS | 4 +++- documentation/PACKAGING | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index d828e9b..2e24e96 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -64,6 +64,7 @@ DLLs (under dlls/): gdi/ - GDI (graphics) glu32/ - OpenGL Utility library (graphics) glut32/ - OpenGL Utility Toolkit + gphoto2.ds/ - Contains libgphoto2 based TWAIN datasource driver hhctrl.ocx/ - HHCTRL OCX implementation iccvid/ - Radius Cinepak Video Decoder icmp/ - ICMP protocol (networking) @@ -128,6 +129,7 @@ DLLs (under dlls/): rpcrt4/ - Remote Procedure Call runtime rsabase/ - RSA encryption rsaenh/ - Crypto API (DES, 3DES, RSA, etc.) + sane.ds/ - Contains sane based TWAIN datasource driver secur32/ - Contains Windows Security functions security/ - Security Support Provider Interface sensapi/ - System Event Notification Service @@ -144,7 +146,7 @@ DLLs (under dlls/): stdole32.tlb/ - Standard OLE typelib sti/ - Still Image service tapi32/ - Telephone interface - twain/ - TWAIN Imaging device communications + twain_32/ - TWAIN Imaging device communications unicows/ - Unicows replacement (Unicode layer for Win9x) url/ - Internet shortcut shell extension urlmon/ - URL Moniker allows binding to a URL diff --git a/documentation/PACKAGING b/documentation/PACKAGING index 0a10dbf..3443222 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -137,6 +137,12 @@ they should appear as "Suggests" or "Rec * capi4linux Used to implement our capi2032.dll. + * libgphoto2 + Used to implement our gphoto2.ds (TWAIN datasource) + + * hal, dbus-1 + Used to implement CD mount handling (via explorer.exe). + GOALS ~~~~~

1 0

Michael Stefaniuc : twain_32: Add missing HeapFree's on error patch ( found by smatch).
by Alexandre Julliard May 9, 2006

May 9, 2006

Module: wine Branch: refs/heads/master Commit: 8d7dcb65a2d7ad617a4627b988b1480930512164 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d7dcb65a2d7ad617a4627b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 9 00:51:58 2006 +0200 twain_32: Add missing HeapFree's on error patch (found by smatch). --- dlls/twain_32/dsm_ctrl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 75d5c64..53863b6 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -233,12 +233,14 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOr if (!hmod) { ERR("Failed to load TWAIN Source %s\n", modname); DSM_twCC = TWCC_OPERATIONERROR; + HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE; } newSource->hmod = hmod; newSource->dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (TWRC_SUCCESS != newSource->dsEntry (pOrigin, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, pIdentity)) { DSM_twCC = TWCC_OPERATIONERROR; + HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE; } /* Assign name and id for the opened data source */

1 0

Alexandre Julliard : msacm32.drv: Renamed msacm.drv to msacm32.drv, and moved the directory to the top-level.
by Alexandre Julliard May 9, 2006

May 9, 2006

Module: wine Branch: refs/heads/master Commit: 922b2749cc295065142d7630ccf04eebd47f0483 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=922b2749cc295065142d763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 11:36:45 2006 +0200 msacm32.drv: Renamed msacm.drv to msacm32.drv, and moved the directory to the top-level. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 7 dlls/msacm32.drv/.gitignore | 1 dlls/msacm32.drv/Makefile.in | 13 dlls/msacm32.drv/msacm32.drv.spec | 3 dlls/msacm32.drv/wavemap.c | 1238 +++++++++++++++++++++++++++++++++++++ dlls/winmm/wavemap/.gitignore | 1 dlls/winmm/wavemap/Makefile.in | 13 dlls/winmm/wavemap/msacm.drv.spec | 3 dlls/winmm/wavemap/wavemap.c | 1238 ------------------------------------- dlls/winmm/winemm.h | 2 12 files changed, 1260 insertions(+), 1265 deletions(-) create mode 100644 dlls/msacm32.drv/.gitignore create mode 100644 dlls/msacm32.drv/Makefile.in create mode 100644 dlls/msacm32.drv/msacm32.drv.spec create mode 100644 dlls/msacm32.drv/wavemap.c delete mode 100644 dlls/winmm/wavemap/.gitignore delete mode 100644 dlls/winmm/wavemap/Makefile.in delete mode 100644 dlls/winmm/wavemap/msacm.drv.spec delete mode 100644 dlls/winmm/wavemap/wavemap.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=922b2749cc295065142…

1 0

Alexandre Julliard : mciwave: Renamed mciwave.drv to mciwave.dll, and moved the directory to the top-level.
by Alexandre Julliard May 9, 2006

May 9, 2006

Module: wine Branch: refs/heads/master Commit: 252398d28635ad58dccc1690072a91aaca0bf732 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=252398d28635ad58dccc169… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 9 11:32:21 2006 +0200 mciwave: Renamed mciwave.drv to mciwave.dll, and moved the directory to the top-level. --- configure | 4 configure.ac | 2 dlls/Makefile.in | 7 dlls/mciwave/.gitignore | 1 dlls/mciwave/Makefile.in | 13 dlls/mciwave/mciwave.c | 1668 +++++++++++++++++++++++++++++++++++ dlls/mciwave/mciwave.spec | 1 dlls/winmm/mciwave/.gitignore | 1 dlls/winmm/mciwave/Makefile.in | 13 dlls/winmm/mciwave/mciwave.c | 1668 ----------------------------------- dlls/winmm/mciwave/mciwave.drv.spec | 1 tools/wine.inf | 4 12 files changed, 1689 insertions(+), 1694 deletions(-) create mode 100644 dlls/mciwave/.gitignore create mode 100644 dlls/mciwave/Makefile.in create mode 100644 dlls/mciwave/mciwave.c create mode 100644 dlls/mciwave/mciwave.spec delete mode 100644 dlls/winmm/mciwave/.gitignore delete mode 100644 dlls/winmm/mciwave/Makefile.in delete mode 100644 dlls/winmm/mciwave/mciwave.c delete mode 100644 dlls/winmm/mciwave/mciwave.drv.spec Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=252398d28635ad58dcc…

1 0

lostwages/ templates/en/download-deb.template ...
by Jeremy Newman May 8, 2006

May 8, 2006

ChangeSet ID: 24641 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/05/08 16:19:47 Modified files: templates/en : download-deb.template Added files: images/distro : synaptic-repository-binary3.png synaptic-repository-source3.png Removed files: images/distro : synaptic-repository-binary2.png synaptic-repository-source2.png Log message: Scott Ritchie <scott(a)open-vote.org> Revamp download-deb page to use new APT server, new screenshots, different distros Patch: http://cvs.winehq.org/patch.py?id=24641 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/images/distro/synaptic-repository-binary3.png Added 1.1 +0 -0 lostwages/images/distro/synaptic-repository-source3.png 1.1 Removed +0 -0 lostwages/images/distro/synaptic-repository-binary2.png 1.1 Removed +0 -0 lostwages/images/distro/synaptic-repository-source2.png 1.8 1.9 +45 -28 lostwages/templates/en/download-deb.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.8 lostwages/templates/en/download-deb.template:1.9 --- lostwages/templates/en/download-deb.template:1.8 8 May 2006 21:19:47 -0000 +++ lostwages/templates/en/download-deb.template 8 May 2006 21:19:47 -0000 @@ -1,48 +1,62 @@  -<h1><a name="debian"></a><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"> -Wine for Ubuntu, Debian, and Debian-based distributions</h1> +<h1><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Linux" border="0"> +Wine for Ubuntu, Debian, and Debian-based distributions +<img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></h1> Debian and Debian-based distributions, such as Ubuntu, utilize a special tool for managing packages known as APT. APT is able to automagically install all of the needed dependencies for a software package, as well as keep the package up to date, by scanning what are known as APT repositories. Debian-based distributions have their own repositories of software, many of which include -Wine, however we keep the latest available packages here for download. +Wine, however we keep our own repository of the latest available packages here +for download. + +Packages here are designed to function on Ubuntu Dapper (6.06) and Ubuntu +Breezy (5.10). The Dapper packages may work on Debian unstable, however this is +not supported. None of these packages will work at this time for Debian stable +(sarge), however a backport could become available at a future date. -Packages here are designed to function on Debian unstable and the latest stable -Ubuntu, and they should replace the older Debian-provided ones. <h2>Installing from the WineHQ APT Repository with Synaptic:</h2> To install Wine from the WineHQ APT repository, you need to configure APT to look in the right place for the Wine packages. On Ubuntu systems, and those using the Synaptic Package Manager, this can be done easily by opening up -Synaptic and selecting Settings->Repositories. Then click add, select custom, -and enter the following: - -deb http://wine.sourceforge.net/apt/ binary/ +Synaptic (System->Administration->Synaptic Package Manager) and selecting +Settings->Repositories. Then click add, select custom, and enter one of the +following: + +For Ubuntu Dapper (6.06): +deb http://wine.budgetdedicated.com/apt dapper main +For Ubuntu Breezy (5.10): +deb http://wine.budgetdedicated.com/apt breezy main -<img src="{$root}/images/distro/synaptic-repository-binary2.png" alt="Synaptic Package Repository Screenshot" border="0"> +<img src="{$root}/images/distro/synaptic-repository-binary3.png" alt="Synaptic Package Repository Screenshot" border="0"> Then, simply click reload and search for the package 'wine' for installation. -If you already have a 'wine' package installed, selecting mark all upgrades and -opting for the "smart upgrade" option should update Wine to the newest version. +If you already have a 'wine' package installed, selecting mark all upgrades +should update Wine to the newest version. + <h2>Getting source packages from the repository</h2> Currently, we only have i386 binary packages available. If you do not use an -i386 architecture, or wish to compile the package in an optimized way, you can -build the wine package using the source repository instead. To do this, add a -source repository with the the following: - -deb-src http://wine.sourceforge.net/apt/ source/ +i386 architecture, or wish to compile the package in a special or optimized way, +you can build the wine package using the source repository instead. To do this, +add a source repository with one of the following: + +For Ubuntu Dapper (6.06): +deb-src http://wine.budgetdedicated.com/apt dapper main +For Ubuntu Breezy (5.10): +deb-src http://wine.budgetdedicated.com/apt breezy main Then, see the instructions below for building the package in the console. Most users, however, will neither need nor want to do this. -<img src="{$root}/images/distro/synaptic-repository-source2.png" alt="Synaptic Package Repository Screenshot" border="0"> +<img src="{$root}/images/distro/synaptic-repository-source3.png" alt="Synaptic Package Repository Screenshot" border="0"> + <h2>Installing from the WineHQ APT Repository with the console:</h2> @@ -54,23 +68,25 @@ use your favorite text editor to open th console editor by typing 'nano /etc/apt/sources.list' and then add the following lines to the end: -deb http://wine.sourceforge.net/apt/ binary/ -deb-src http://wine.sourceforge.net/apt/ source/ +For Ubuntu Dapper (6.06): +deb http://wine.budgetdedicated.com/apt dapper main +deb-src http://wine.budgetdedicated.com/apt dapper main +For Ubuntu Breezy (5.10): +deb http://wine.budgetdedicated.com/apt breezy main +deb-src http://wine.budgetdedicated.com/apt breezy main Then, you can run 'apt-get update' to update APT's package information. Finally, to install Wine, do 'apt-get install wine'. -If you want to make sure that apt-get will install the WineHQ wine package -instead of the Debian wine package (which usually has the same version), -then add something like the following entry to /etc/apt/preferences: +If you are using Debian and want to make sure that apt-get will install the +WineHQ Wine package instead of the Debian Wine package (which usually confuses +APT by having the same version number), then you will need to add something like +the following entry to /etc/apt/preferences: Package: wine Pin: release l=WineHQ APT Repository Pin-Priority: 1000 -Or alternatively use a modified rule to adjust the installation relationship -between WineHQ and Debian packages in a different way. - <h2>Building the Wine Package from Source using APT:</h2> APT also allows easy compilation from source of a package. This is useful if @@ -92,5 +108,6 @@ as root. packages are available here: <a href=http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=…>Ubuntu/Debian Unstable Packages</a> -If you wish to use these packages, you'll have to install them by hand -using dpkg -i +If you wish to use these packages, you'll have to install them by hand, +such as by using dpkg -i +

1 0

lostwages/templates/en cvs.template
by Jeremy Newman May 8, 2006

May 8, 2006

ChangeSet ID: 24640 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/05/08 16:18:00 Modified files: templates/en : cvs.template Log message: Scott Ritchie <scott(a)open-vote.org> Fully remove EU server from CVS page Patch: http://cvs.winehq.org/patch.py?id=24640 Old revision New revision Changes Path 1.24 1.25 +0 -10 lostwages/templates/en/cvs.template Index: lostwages/templates/en/cvs.template diff -u -p lostwages/templates/en/cvs.template:1.24 lostwages/templates/en/cvs.template:1.25 --- lostwages/templates/en/cvs.template:1.24 8 May 2006 21:18: 0 -0000 +++ lostwages/templates/en/cvs.template 8 May 2006 21:18: 0 -0000 @@ -50,16 +50,6 @@ To connect to the US server, run </td></tr> </table> -To connect to the EU server, run - - <table width="500" border=0 cellpadding=10><tr><td class=black> - - export CVSROOT=:pserver:cvs(a)rhlx01.fht-esslingen.de:/home/wine - cvs login - - </td></tr> - </table> - Use "cvs" as the password (without the quotes). Note that <code>/home/wine</code> is a path on the server, not on your machine.

1 0

Marcus Meissner : gphoto.ds: Implemented a libgphoto2 import driver, based on the sane.ds driver.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 40e7ef3a1dc92dcb198835ede0de8bb2725b417b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40e7ef3a1dc92dcb198835e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon May 8 20:09:37 2006 +0200 gphoto.ds: Implemented a libgphoto2 import driver, based on the sane.ds driver. Wrote a GUI import dialog. With help from Aric Stewart. --- configure | 321 ++++++++++++++++++- configure.ac | 32 ++ dlls/Makefile.in | 1 dlls/gphoto2.ds/.gitignore | 2 dlls/gphoto2.ds/Makefile.in | 22 + dlls/gphoto2.ds/capability.c | 553 ++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/ds_ctrl.c | 610 +++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/ds_image.c | 673 +++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/gphoto2.ds.spec | 1 dlls/gphoto2.ds/gphoto2_En.rc | 53 +++ dlls/gphoto2.ds/gphoto2_i.h | 260 +++++++++++++++ dlls/gphoto2.ds/gphoto2_main.c | 676 +++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/resource.h | 30 ++ dlls/gphoto2.ds/rsrc.rc | 29 ++ dlls/gphoto2.ds/ui.c | 257 +++++++++++++++ include/config.h.in | 3 16 files changed, 3521 insertions(+), 2 deletions(-) create mode 100644 dlls/gphoto2.ds/.gitignore create mode 100644 dlls/gphoto2.ds/Makefile.in create mode 100644 dlls/gphoto2.ds/capability.c create mode 100644 dlls/gphoto2.ds/ds_ctrl.c create mode 100644 dlls/gphoto2.ds/ds_image.c create mode 100644 dlls/gphoto2.ds/gphoto2.ds.spec create mode 100644 dlls/gphoto2.ds/gphoto2_En.rc create mode 100644 dlls/gphoto2.ds/gphoto2_i.h create mode 100644 dlls/gphoto2.ds/gphoto2_main.c create mode 100644 dlls/gphoto2.ds/resource.h create mode 100644 dlls/gphoto2.ds/rsrc.rc create mode 100644 dlls/gphoto2.ds/ui.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=40e7ef3a1dc92dcb198…

1 0

Marcus Meissner : twain_32: Split out the sane specific parts from twain_32 code.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 125efed86ab4352318340b7f2603a36c8eab82a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=125efed86ab4352318340b7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon May 8 20:05:42 2006 +0200 twain_32: Split out the sane specific parts from twain_32 code. Autoprobing via DG_CONTROL/DAT_IDENTITY/MSG_GET. --- configure | 3 configure.ac | 1 dlls/Makefile.in | 1 dlls/sane.ds/.gitignore | 2 dlls/sane.ds/Makefile.in | 22 + dlls/sane.ds/capability.c | 247 ++++++++++ dlls/sane.ds/ds_ctrl.c | 640 +++++++++++++++++++++++++ dlls/sane.ds/ds_image.c | 513 ++++++++++++++++++++ dlls/sane.ds/resource.h | 23 + dlls/sane.ds/rsrc.rc | 33 + dlls/sane.ds/sane.ds.spec | 1 dlls/sane.ds/sane_De.rc | 40 ++ dlls/sane.ds/sane_En.rc | 40 ++ dlls/sane.ds/sane_Fi.rc | 40 ++ dlls/sane.ds/sane_Fr.rc | 40 ++ dlls/sane.ds/sane_Ko.rc | 41 ++ dlls/sane.ds/sane_No.rc | 40 ++ dlls/sane.ds/sane_i.h | 217 ++++++++ dlls/sane.ds/sane_main.c | 611 ++++++++++++++++++++++++ dlls/sane.ds/ui.c | 1066 ++++++++++++++++++++++++++++++++++++++++++ dlls/twain_32/.gitignore | 1 dlls/twain_32/Makefile.in | 14 - dlls/twain_32/capability.c | 249 ---------- dlls/twain_32/ds_audio.c | 50 -- dlls/twain_32/ds_ctrl.c | 727 ---------------------------- dlls/twain_32/ds_image.c | 531 --------------------- dlls/twain_32/dsm_ctrl.c | 571 +++++++++------------- dlls/twain_32/resource.h | 23 - dlls/twain_32/rsrc.rc | 33 - dlls/twain_32/twain32_main.c | 515 +------------------- dlls/twain_32/twain_De.rc | 40 -- dlls/twain_32/twain_En.rc | 40 -- dlls/twain_32/twain_Fi.rc | 40 -- dlls/twain_32/twain_Fr.rc | 40 -- dlls/twain_32/twain_Ko.rc | 41 -- dlls/twain_32/twain_No.rc | 40 -- dlls/twain_32/twain_i.h | 179 ------- dlls/twain_32/ui.c | 1074 ------------------------------------------ 38 files changed, 3883 insertions(+), 3946 deletions(-) create mode 100644 dlls/sane.ds/.gitignore create mode 100644 dlls/sane.ds/Makefile.in create mode 100644 dlls/sane.ds/capability.c create mode 100644 dlls/sane.ds/ds_ctrl.c create mode 100644 dlls/sane.ds/ds_image.c create mode 100644 dlls/sane.ds/resource.h create mode 100644 dlls/sane.ds/rsrc.rc create mode 100644 dlls/sane.ds/sane.ds.spec create mode 100644 dlls/sane.ds/sane_De.rc create mode 100644 dlls/sane.ds/sane_En.rc create mode 100644 dlls/sane.ds/sane_Fi.rc create mode 100644 dlls/sane.ds/sane_Fr.rc create mode 100644 dlls/sane.ds/sane_Ko.rc create mode 100644 dlls/sane.ds/sane_No.rc create mode 100644 dlls/sane.ds/sane_i.h create mode 100644 dlls/sane.ds/sane_main.c create mode 100644 dlls/sane.ds/ui.c delete mode 100644 dlls/twain_32/capability.c delete mode 100644 dlls/twain_32/ds_audio.c delete mode 100644 dlls/twain_32/ds_ctrl.c delete mode 100644 dlls/twain_32/ds_image.c delete mode 100644 dlls/twain_32/resource.h delete mode 100644 dlls/twain_32/rsrc.rc delete mode 100644 dlls/twain_32/twain_De.rc delete mode 100644 dlls/twain_32/twain_En.rc delete mode 100644 dlls/twain_32/twain_Fi.rc delete mode 100644 dlls/twain_32/twain_Fr.rc delete mode 100644 dlls/twain_32/twain_Ko.rc delete mode 100644 dlls/twain_32/twain_No.rc delete mode 100644 dlls/twain_32/ui.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=125efed86ab43523183…

1 0

Marcus Meissner : twain_32: Moved twain.h to the include directory.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: 1d5e2be0de5a8f6df9efa3bbbae447e67b17f7dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d5e2be0de5a8f6df9efa3b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon May 8 20:04:18 2006 +0200 twain_32: Moved twain.h to the include directory. --- dlls/twain_32/twain.h | 1870 ------------------------------------------------- include/Makefile.in | 1 include/twain.h | 1870 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1871 insertions(+), 1870 deletions(-) delete mode 100644 dlls/twain_32/twain.h create mode 100644 include/twain.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1d5e2be0de5a8f6df9e…

1 0

Huw Davies : oleaut32: Preserve the 'auto' features before copying over the masked unmarshaled ones.
by Alexandre Julliard May 8, 2006

May 8, 2006

Module: wine Branch: refs/heads/master Commit: df40c966a09fc54012bd00068c8252687df23f4f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df40c966a09fc54012bd000… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 8 17:24:51 2006 +0100 oleaut32: Preserve the 'auto' features before copying over the masked unmarshaled ones. --- dlls/oleaut32/tests/usrmarshal.c | 4 ---- dlls/oleaut32/usrmarshal.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index a3db860..b0f3808 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -181,9 +181,7 @@ static void test_marshal_LPSAFEARRAY(voi ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal\n"); SafeArrayGetVartype(lpsa, &vt); SafeArrayGetVartype(lpsa2, &vt2); - todo_wine { ok(vt == vt2, "vts differ %x %x\n", vt, vt2); - } LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); } HeapFree(GetProcessHeap(), 0, buffer); @@ -865,9 +863,7 @@ static void test_marshal_VARIANT(void) ok(bound == bound2, "array ubounds differ\n"); SafeArrayGetVartype(V_ARRAY(&v), &vt); SafeArrayGetVartype(V_ARRAY(&v2), &vt2); - todo_wine { ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); - } VARIANT_UserFree(&umcb.Flags, &v2); } HeapFree(GetProcessHeap(), 0, buffer); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 562983a..002df90 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1004,7 +1004,8 @@ unsigned char * WINAPI LPSAFEARRAY_UserU /* be careful about which flags we set since they could be a security * risk */ - (*ppsa)->fFeatures = wiresa->fFeatures & ~(FADF_AUTOSETFLAGS); + (*ppsa)->fFeatures &= FADF_AUTOSETFLAGS; + (*ppsa)->fFeatures |= (wiresa->fFeatures & ~(FADF_AUTOSETFLAGS)); /* FIXME: there should be a limit on how large wiresa->cbElements can be */ (*ppsa)->cbElements = wiresa->cbElements; (*ppsa)->cLocks = LOWORD(wiresa->cLocks);

1 0