James Hawkins : msi: Publish media disks whether the drive type is removable or not.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5538fa0290cf9f96c06c9289d41c758c78a9932c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5538fa0290cf9f96c06c9289d4...

Author: James Hawkins 
Date:   Mon Jun 23 23:02:16 2008 -0500

msi: Publish media disks whether the drive type is removable or not.

---

dlls/msi/files.c         |    7 +++----
 dlls/msi/tests/install.c |    5 +----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index 64869b1..c6e70d9 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -544,10 +544,9 @@ UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi)
         options |= MSISOURCETYPE_NETWORK;
     }

-    if (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)
-        msi_package_add_media_disk(package, package->Context,
-                                   MSICODE_PRODUCT, mi->disk_id,
-                                   mi->volume_label, mi->disk_prompt);
+    msi_package_add_media_disk(package, package->Context,
+                               MSICODE_PRODUCT, mi->disk_id,
+                               mi->volume_label, mi->disk_prompt);

msi_package_add_info(package, package->Context,
                          options, INSTALLPROPERTY_LASTUSEDSOURCEW, source);
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index c48ac8e..7778a96 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -2559,10 +2559,7 @@ static void test_publish_publishproduct(void)
     res = RegOpenKeyA(sourcelist, "Media", &media);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

-    todo_wine
-    {
-        CHECK_DEL_REG_STR(media, "1", "DISK1;");
-    }
+    CHECK_DEL_REG_STR(media, "1", "DISK1;");

RegDeleteKeyA(media, "");
     RegCloseKey(media);