March 2019 - Wine-commits - list.winehq.org

Michael Stefaniuc : Release 3.0.5.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 52cf0bc5471b7eb61b1c31004870caae3f8fbeb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52cf0bc5471b7eb61b1c3100… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Feb 10 21:06:33 2019 +0100 Release 3.0.5. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 540 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +-- 4 files changed, 277 insertions(+), 288 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52cf0bc5471b7eb61b1c…

1 0

Tag wine-3.0.5 : Alexandre Julliard : Release 3.0.5
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: refs/tags/wine-3.0.5 Tag: 410e987aab85a698fa3fd35ed3bd7609cee83e58 URL: https://source.winehq.org/git/wine.git/?a=tag;h=410e987aab85a698fa3fd35ed3b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Mar 3 20:19:46 2019 +0100 Release 3.0.5

1 0

Alexandre Julliard : commdlg: Implement custom template support in 16-bit file dialogs.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 7b4be95809569d0b41880ec08bc91432cc6ad3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b4be95809569d0b41880ec0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 11:24:00 2018 +0100 commdlg: Implement custom template support in 16-bit file dialogs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0e9cb103400c58480778894cb0e4a3d2dec9a3b4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 136 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 7e2fda7..1238dc9 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -18,18 +18,120 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include <assert.h> #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wine/winbase16.h" #include "wingdi.h" #include "winuser.h" +#include "winternl.h" #include "commdlg.h" #include "cdlg16.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(commdlg); + +static inline WORD get_word( const char **ptr ) +{ + WORD ret = *(WORD *)*ptr; + *ptr += sizeof(WORD); + return ret; +} + +static inline void copy_string( WORD **out, const char **in, DWORD maxlen ) +{ + DWORD len = MultiByteToWideChar( CP_ACP, 0, *in, -1, *out, maxlen ); + *in += strlen(*in) + 1; + *out += len; +} + +static inline void copy_dword( WORD **out, const char **in ) +{ + *(DWORD *)*out = *(DWORD *)*in; + *in += sizeof(DWORD); + *out += sizeof(DWORD) / sizeof(WORD); +} + +static LPDLGTEMPLATEA convert_dialog( const char *p, DWORD size ) +{ + LPDLGTEMPLATEA dlg; + WORD len, count, *out, *end; + + if (!(dlg = HeapAlloc( GetProcessHeap(), 0, size * 2 ))) return NULL; + out = (WORD *)dlg; + end = out + size; + copy_dword( &out, &p ); /* style */ + *out++ = 0; *out++ = 0; /* exstyle */ + *out++ = count = (BYTE)*p++; /* count */ + *out++ = get_word( &p ); /* x */ + *out++ = get_word( &p ); /* y */ + *out++ = get_word( &p ); /* cx */ + *out++ = get_word( &p ); /* cy */ + + if ((BYTE)*p == 0xff) /* menu */ + { + p++; + *out++ = 0xffff; + *out++ = get_word( &p ); + } + else copy_string( &out, &p, end - out ); + + copy_string( &out, &p, end - out ); /* class */ + copy_string( &out, &p, end - out ); /* caption */ + + if (dlg->style & DS_SETFONT) + { + *out++ = get_word( &p ); /* point size */ + copy_string( &out, &p, end - out ); /* face name */ + } + + /* controls */ + while (count--) + { + WORD x = get_word( &p ); + WORD y = get_word( &p ); + WORD cx = get_word( &p ); + WORD cy = get_word( &p ); + WORD id = get_word( &p ); + + out = (WORD *)(((UINT_PTR)out + 3) & ~3); + + copy_dword( &out, &p ); /* style */ + *out++ = 0; *out++ = 0; /* exstyle */ + *out++ = x; + *out++ = y; + *out++ = cx; + *out++ = cy; + *out++ = id; + + if (*p & 0x80) /* class */ + { + *out++ = 0xffff; + *out++ = (BYTE)*p++; + } + else copy_string( &out, &p, end - out ); + + if (*p & 0x80) /* window */ + { + *out++ = 0xffff; + *out++ = get_word( &p ); + } + else copy_string( &out, &p, end - out ); + + len = (BYTE)*p++; /* data */ + *out++ = (len + 1) & ~1; + memcpy( out, p, len ); + p += len; + out += (len + 1) / sizeof(WORD); + } + + assert( out <= end ); + return dlg; +} + static UINT_PTR CALLBACK dummy_hook( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { return FALSE; @@ -68,6 +170,7 @@ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, L BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/ { LPOPENFILENAME16 lpofn = MapSL(ofn); + LPDLGTEMPLATEA template = NULL; OPENFILENAMEA ofn32; BOOL ret; @@ -93,7 +196,20 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) - FIXME( "custom templates no longer supported, using default\n" ); + { + HRSRC16 res = FindResource16( lpofn->hInstance, MapSL(lpofn->lpTemplateName), (LPCSTR)RT_DIALOG ); + HGLOBAL16 handle = LoadResource16( lpofn->hInstance, res ); + DWORD size = SizeofResource16( lpofn->hInstance, res ); + void *ptr = LockResource16( handle ); + + if (ptr && (template = convert_dialog( ptr, size ))) + { + ofn32.hInstance = (HINSTANCE)template; + ofn32.Flags |= OFN_ENABLETEMPLATEHANDLE; + } + FreeResource16( handle ); + } + if (lpofn->Flags & OFN_ENABLEHOOK) FIXME( "custom hook %p no longer supported\n", lpofn->lpfnHook ); @@ -103,6 +219,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w lpofn->nFileOffset = ofn32.nFileOffset; lpofn->nFileExtension = ofn32.nFileExtension; } + HeapFree( GetProcessHeap(), 0, template ); return ret; } @@ -121,6 +238,7 @@ BOOL16 WINAPI GetOpenFileName16( SEGPTR ofn ) /* [in/out] address of structure w BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure with data*/ { LPOPENFILENAME16 lpofn = MapSL(ofn); + LPDLGTEMPLATEA template = NULL; OPENFILENAMEA ofn32; BOOL ret; @@ -146,7 +264,20 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w ofn32.lpfnHook = dummy_hook; /* this is to force old 3.1 dialog style */ if (lpofn->Flags & OFN_ENABLETEMPLATE) - FIXME( "custom templates no longer supported, using default\n" ); + { + HRSRC16 res = FindResource16( lpofn->hInstance, MapSL(lpofn->lpTemplateName), (LPCSTR)RT_DIALOG ); + HGLOBAL16 handle = LoadResource16( lpofn->hInstance, res ); + DWORD size = SizeofResource16( lpofn->hInstance, res ); + void *ptr = LockResource16( handle ); + + if (ptr && (template = convert_dialog( ptr, size ))) + { + ofn32.hInstance = (HINSTANCE)template; + ofn32.Flags |= OFN_ENABLETEMPLATEHANDLE; + } + FreeResource16( handle ); + } + if (lpofn->Flags & OFN_ENABLEHOOK) FIXME( "custom hook %p no longer supported\n", lpofn->lpfnHook ); @@ -156,6 +287,7 @@ BOOL16 WINAPI GetSaveFileName16( SEGPTR ofn ) /* [in/out] address of structure w lpofn->nFileOffset = ofn32.nFileOffset; lpofn->nFileExtension = ofn32.nFileExtension; } + HeapFree( GetProcessHeap(), 0, template ); return ret; }

1 0

Alexandre Julliard : commdlg: Add support for 16-bit file dialog hooks.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: ab37df3c3f2093a54b77bffc7111e05d76ceeac5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab37df3c3f2093a54b77bffc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 13 13:39:39 2018 +0100 commdlg: Add support for 16-bit file dialog hooks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 59df6651b88456b38ac816de0a07a544aae346e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 408 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 404 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab37df3c3f2093a54b77…

1 0

Alexandre Julliard : ntdll: Also store FPU registers in RtlRaiseException( ).
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 0dbeb9c8e94421381ae369e8f01facf0d88eefe7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dbeb9c8e94421381ae369e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 17:24:48 2019 +0100 ntdll: Also store FPU registers in RtlRaiseException(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44485 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc80a0032927421d61b95659af570c21439e4a76) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_i386.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b411749..d3470e0 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2791,6 +2791,19 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL } +/******************************************************************* + * raise_exception_full_context + * + * Raise an exception with the full CPU context. + */ +void raise_exception_full_context( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +{ + save_fpu( context ); + /* FIXME: extended registers, debug registers */ + RtlRaiseStatus( NtRaiseException( rec, context, first_chance )); +} + + /*********************************************************************** * RtlRaiseException (NTDLL.@) */ @@ -2812,9 +2825,7 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "pushl $1\n\t" "pushl %eax\n\t" "pushl %ecx\n\t" - "call " __ASM_NAME("NtRaiseException") __ASM_STDCALL(12) "\n\t" - "pushl %eax\n\t" - "call " __ASM_NAME("RtlRaiseStatus") __ASM_STDCALL(4) "\n\t" + "call " __ASM_NAME("raise_exception_full_context") "\n\t" "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t")

1 0

Zhiyi Zhang : riched20: Fix a use after free.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: ceea7138b4d1cec4006e09fc16f43157b144baa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceea7138b4d1cec4006e09fc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 2 00:03:29 2019 +0800 riched20: Fix a use after free. In ME_DestroyEditor(), the item list is being freed when calling get_total_width() in destroy_para(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46328 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 62d80cff6917d6809614885f833358baeb310f20) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index daafe80..617a618 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3126,13 +3126,13 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) void ME_DestroyEditor(ME_TextEditor *editor) { - ME_DisplayItem *pFirst = editor->pBuffer->pFirst; - ME_DisplayItem *p = pFirst, *pNext = NULL; + ME_DisplayItem *p = editor->pBuffer->pFirst, *pNext = NULL; ME_Style *s, *cursor2; int i; ME_ClearTempStyle(editor); ME_EmptyUndoStack(editor); + editor->pBuffer->pFirst = NULL; while(p) { pNext = p->next; ME_DestroyDisplayItem(p);

1 0

Olivier F. R. Dierick : explorer: Don' t change Z-order of the taskbar when displaying it.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 2076cb6c33d75098bfe3b32130ce25f140c0a654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2076cb6c33d75098bfe3b321… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Mon Jan 7 01:51:18 2019 +0100 explorer: Don't change Z-order of the taskbar when displaying it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5afd80307ed2487998c0ccd552f883560ac24cfd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 9e58ad4..a75b92c 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -766,8 +766,8 @@ static void do_show_systray(void) tray_width = GetSystemMetrics( SM_CXSCREEN ); tray_height = max( icon_cy, size.cy ); start_button_width = size.cx; - SetWindowPos( tray_window, HWND_TOPMOST, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, - tray_width, tray_height, SWP_NOACTIVATE | SWP_SHOWWINDOW ); + SetWindowPos( tray_window, 0, 0, GetSystemMetrics( SM_CYSCREEN ) - tray_height, + tray_width, tray_height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); sync_taskbar_buttons(); }

1 0

Paul Gofman : d3dx9: Return correct comment length from get_instr_length() .
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: 373156d002fc5f3883fc1f8d7d08a5d3e8d0e73b URL: https://source.winehq.org/git/wine.git/?a=commit;h=373156d002fc5f3883fc1f8d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jan 9 20:17:52 2019 +0100 d3dx9: Return correct comment length from get_instr_length(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46435 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 807e5fc04af7a7ea563af1e7da6ebe6662536e6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index f372494..ac5b824 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2419,18 +2419,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 2f01a46..b8363af 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6534,6 +6534,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */

1 0

Alexandre Julliard : msi: Return an error code instead of a button id in msi_change_media().
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: def4f69223e2b7444f922101e106b2c1bb7707ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=def4f69223e2b7444f922101… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 19:39:13 2019 +0100 msi: Return an error code instead of a button id in msi_change_media(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a47343b97369e5f64bb78a7421f2d75258da282a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 3d4a8c0..5f8c26a 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -97,7 +97,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) msiobj_release(&record->hdr); msi_free(source_dir); - return r; + return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT; } static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )

1 0

Hans Leidekker : msi: Only perform the media check if the label of the disk entry differs from the last.
by Alexandre Julliard 03 Mar '19

03 Mar '19

Module: wine Branch: oldstable Commit: bc2095b94a2790efd50da6f739fb87b6c404efee URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc2095b94a2790efd50da6f7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 7 08:55:15 2019 +0100 msi: Only perform the media check if the label of the disk entry differs from the last. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40433 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 85fea53af80d324a4cf7f80a45f43fed8d8d65e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/media.c | 26 +++++++++++++++++--------- dlls/msi/msipriv.h | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 5f8c26a..09aac09 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -664,6 +664,7 @@ void msi_free_media_info(MSIMEDIAINFO *mi) msi_free(mi->disk_prompt); msi_free(mi->cabinet); msi_free(mi->volume_label); + msi_free(mi->last_volume); msi_free(mi); } @@ -898,20 +899,27 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) } } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1) + if (mi->volume_label) { - WCHAR *source = msi_dup_property( package->db, szSourceDir ); - BOOL match = source_matches_volume( mi, source ); - msi_free( source ); - - if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) + /* assume first volume is in the drive */ + if (mi->last_volume && strcmpiW( mi->last_volume, mi->volume_label )) { - if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + WCHAR *source = msi_dup_property( package->db, szSourceDir ); + BOOL match = source_matches_volume( mi, source ); + msi_free( source ); + + if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) { - msi_free( cabinet_file ); - return rc; + if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + { + msi_free( cabinet_file ); + return rc; + } } } + + msi_free(mi->last_volume); + mi->last_volume = strdupW(mi->volume_label); } if (mi->cabinet) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 27d654b..fdafeec 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -170,6 +170,7 @@ typedef struct tagMSIMEDIAINFO LPWSTR disk_prompt; LPWSTR cabinet; LPWSTR volume_label; + LPWSTR last_volume; BOOL is_continuous; BOOL is_extracted; WCHAR sourcedir[MAX_PATH];

1 0