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

Sven Baars : cmdlgtst: Fix Dutch translation.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: bbd93e535a3df9141cd9b028d2dfedae0c36eb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd93e535a3df9141cd9b028d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon May 31 16:53:08 2010 +0200 cmdlgtst: Fix Dutch translation. --- programs/cmdlgtst/Nl.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/cmdlgtst/Nl.rc b/programs/cmdlgtst/Nl.rc index 245794d..db8b66b 100644 --- a/programs/cmdlgtst/Nl.rc +++ b/programs/cmdlgtst/Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + CmdlgtstMenu MENU { POPUP "&Bestand" @@ -40,8 +42,8 @@ CmdlgtstMenu MENU MENUITEM "&Zoek tekst", CM_U_FIND MENUITEM "&Vervang tekst", CM_U_REPLACE MENUITEM SEPARATOR - MENUITEM "&Afdrukken", CM_U_PRINT - MENUITEM "Pa&gina Opmaak", CM_U_PAGESETUP + MENUITEM "Af&drukken", CM_U_PRINT + MENUITEM "Pa&gina-instellingen", CM_U_PAGESETUP } POPUP "&Vlaggen" @@ -53,8 +55,8 @@ CmdlgtstMenu MENU MENUITEM SEPARATOR MENUITEM "&Zoek/Vervang", CM_F_FINDREPLACE MENUITEM SEPARATOR - MENUITEM "&Afdrukken", CM_F_PRINT - MENUITEM "Pa&gina Opmaak", CM_F_PAGESETUP + MENUITEM "Af&drukken", CM_F_PRINT + MENUITEM "Pa&gina-instellingen", CM_F_PAGESETUP } POPUP "&Help" @@ -146,7 +148,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13 - CONTROL "Markeert vlaggen die zijn gezet door het systeem en moeten worden gewist door de gebruiker.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "Markeert vlaggen die zijn ingesteld door het systeem en moeten worden gewist door de gebruiker.", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287 @@ -258,7 +260,7 @@ FONT 8, "MS Shell Dlg" LTEXT "Vlaggen kunnen worden gezet in het Vlaggen menu.", -1, 12, 96, 168, 12 LTEXT "De kleurkeuze-dialoog verandert de achtergrondkleur.", -1, 12, 120, 168, 12 LTEXT "De lettertype-dialoog verandert alle lettertypen, en de kleur van het lettertype als CF_EFFECTS is gezet.", -1, 12, 144, 168, 24 - LTEXT "De linker bovenhoek geeft de lange en de korte bestandsnaam weer van het laatste successvol geopende of opgeslagen bestand.", -1, 12, 180, 168, 24 + LTEXT "De linker bovenhoek geeft de lange en de korte bestandsnaam weer van het laatste succesvol geopende of opgeslagen bestand.", -1, 12, 180, 168, 24 LTEXT "(c) 1999-2000, Eric Williams. De rechten voor dit programma zijn gelijk aan die verleend onder de WINE licentie. Hamster geen code... deel het!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 @@ -278,7 +280,7 @@ BEGIN COMBOBOX cmb1, 150, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL LTEXT "L&ade:", stc3, 16, 132, 36, 8 COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Orientatie", grp1, 8, 156, 64, 56, BS_GROUPBOX + GROUPBOX "Oriëntatie", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Staand", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Randen", grp4, 80, 156, 152, 56, BS_GROUPBOX

1 0

Matteo Bruni : d3dx9: Allow modifiers on the ps dcl input instruction.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 7de630ef2fb85ce44aa9cde46cfaa81450b68c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de630ef2fb85ce44aa9cde46… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sun May 30 22:24:54 2010 +0200 d3dx9: Allow modifiers on the ps dcl input instruction. --- dlls/d3dx9_36/asmparser.c | 60 +++++++++++++++++++++---------------- dlls/d3dx9_36/asmshader.y | 24 +++++++++++---- dlls/d3dx9_36/bytecodewriter.c | 4 ++- dlls/d3dx9_36/d3dx9_36_private.h | 5 ++- dlls/d3dx9_36/tests/asm.c | 14 +++++++++ 5 files changed, 71 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7de630ef2fb85ce44aa9c…

1 0

Luca Bennati : comdlg32: Fix Italian Translation.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 7e264e5b50745d471b245016a39ebdf63a5dc727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e264e5b50745d471b245016a… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon May 31 10:52:04 2010 +0200 comdlg32: Fix Italian Translation. --- dlls/comdlg32/cdlg_It.rc | 82 ++++++++++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e264e5b50745d471b245…

1 0

André Hentschel : equartz: Add ntdll to imports.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 57408882b6029f48dad84bdc30068759062962c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57408882b6029f48dad84bdc3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 13:35:28 2010 +0200 equartz: Add ntdll to imports. --- dlls/quartz/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 1c0092e..9796227 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 kernel32 +IMPORTS = strmiids uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 kernel32 ntdll EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL C_SRCS = \

1 0

Matteo Bruni : d3dx9: Allow modifiers on the ps dcl sampler instruction.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 25d4fe681702aaacc3454a8c3eac9a04c49077f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d4fe681702aaacc3454a8c3… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sun May 30 22:57:13 2010 +0200 d3dx9: Allow modifiers on the ps dcl sampler instruction. --- dlls/d3dx9_36/asmparser.c | 14 ++++++++++++-- dlls/d3dx9_36/asmshader.y | 13 +++++++++---- dlls/d3dx9_36/bytecodewriter.c | 13 ++++++++----- dlls/d3dx9_36/d3dx9_36_private.h | 8 +++++--- dlls/d3dx9_36/tests/asm.c | 13 +++++++++++++ 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 3c29da8..0869ee6 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -133,9 +133,19 @@ static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, } } -static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, DWORD regnum, unsigned int line_no) { +static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, + DWORD mod, DWORD regnum, + unsigned int line_no) { if(!This->shader) return; - if(!record_sampler(This->shader, samptype, regnum)) { + if(mod != 0 && + (This->shader->version != BWRITERPS_VERSION(3, 0) || + (mod != BWRITERSPDM_MSAMPCENTROID && + mod != BWRITERSPDM_PARTIALPRECISION))) { + asmparser_message(This, "Line %u: Unsupported modifier in dcl instruction\n", This->line_no); + set_parse_status(This, PARSE_ERR); + return; + } + if(!record_sampler(This->shader, samptype, mod, regnum)) { ERR("Out of memory\n"); set_parse_status(This, PARSE_ERR); } diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index c0c289c..9bd84a3 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -573,19 +573,24 @@ instruction: INSTR_ADD omods dreg ',' sregs reg.writemask = $5; asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, $3.mod, &reg); } - | INSTR_DCL sampdcl REG_SAMPLER + | INSTR_DCL sampdcl omods REG_SAMPLER { TRACE("Sampler declared\n"); - asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3, asm_ctx.line_no); + if($3.shift != 0) { + asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no); } - | INSTR_DCL sampdcl REG_INPUT + | INSTR_DCL sampdcl omods REG_INPUT { TRACE("Error rule: sampler decl of input reg\n"); asmparser_message(&asm_ctx, "Line %u: Sampler declarations of input regs is not valid\n", asm_ctx.line_no); set_parse_status(&asm_ctx, PARSE_WARN); } - | INSTR_DCL sampdcl REG_OUTPUT + | INSTR_DCL sampdcl omods REG_OUTPUT { TRACE("Error rule: sampler decl of output reg\n"); asmparser_message(&asm_ctx, "Line %u: Sampler declarations of output regs is not valid\n", diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 3d05dad..84fefee 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -257,7 +257,7 @@ BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_ return TRUE; } -BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD regnum) { +BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD mod, DWORD regnum) { unsigned int i; if(!shader) return FALSE; @@ -290,6 +290,7 @@ BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD regnum) } shader->samplers[shader->num_samplers].type = samptype; + shader->samplers[shader->num_samplers].mod = mod; shader->samplers[shader->num_samplers].regnum = regnum; shader->num_samplers++; return TRUE; @@ -1151,9 +1152,9 @@ static void write_samplers(const struct bwriter_shader *shader, struct bytecode_ DWORD instr_dcl = D3DSIO_DCL | (2 << D3DSI_INSTLENGTH_SHIFT); DWORD token; const DWORD reg = (1<<31) | - ((D3DSPR_SAMPLER << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) | - ((D3DSPR_SAMPLER << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2) | - D3DSP_WRITEMASK_ALL; + ((D3DSPR_SAMPLER << D3DSP_REGTYPE_SHIFT) & D3DSP_REGTYPE_MASK) | + ((D3DSPR_SAMPLER << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2) | + D3DSP_WRITEMASK_ALL; for(i = 0; i < shader->num_samplers; i++) { /* Write the DCL instruction */ @@ -1162,7 +1163,9 @@ static void write_samplers(const struct bwriter_shader *shader, struct bytecode_ /* Already shifted */ token |= (d3d9_sampler(shader->samplers[i].type)) & D3DSP_TEXTURETYPE_MASK; put_dword(buffer, token); - put_dword(buffer, reg | (shader->samplers[i].regnum & D3DSP_REGNUM_MASK)); + token = reg | (shader->samplers[i].regnum & D3DSP_REGNUM_MASK); + token |= d3d9_dstmod(shader->samplers[i].mod); + put_dword(buffer, token); } } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index c1a4195..2daf1be 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -191,6 +191,7 @@ struct declaration { struct samplerdecl { DWORD type; DWORD regnum; + DWORD mod; }; #define INSTRARRAY_INITIAL_SIZE 8 @@ -272,8 +273,8 @@ struct asmparser_backend { const struct shader_reg *reg); void (*dcl_input)(struct asm_parser *This, DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg); - void (*dcl_sampler)(struct asm_parser *This, DWORD samptype, DWORD regnum, - unsigned int line_no); + void (*dcl_sampler)(struct asm_parser *This, DWORD samptype, DWORD mod, + DWORD regnum, unsigned int line_no); void (*end)(struct asm_parser *This); @@ -288,7 +289,8 @@ BOOL add_constF(struct bwriter_shader *shader, DWORD reg, float x, float y, floa BOOL add_constI(struct bwriter_shader *shader, DWORD reg, INT x, INT y, INT z, INT w); BOOL add_constB(struct bwriter_shader *shader, DWORD reg, BOOL x); BOOL record_declaration(struct bwriter_shader *shader, DWORD usage, DWORD usage_idx, DWORD mod, BOOL output, DWORD regnum, DWORD writemask); -BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, DWORD regnum); +BOOL record_sampler(struct bwriter_shader *shader, DWORD samptype, + DWORD mod, DWORD regnum); #define MESSAGEBUFFER_INITIAL_SIZE 256 diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 59ed942..cc0b6ae 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1185,6 +1185,16 @@ static void ps_3_0_test(void) { "dcl_texcoord0_centroid v0\n", {0xffff0300, 0x0200001f, 0x80000005, 0x904f0000, 0x0000ffff} }, + { /* shader 13 */ + "ps_3_0\n" + "dcl_2d_centroid s0\n", + {0xffff0300, 0x0200001f, 0x90000000, 0xa04f0800, 0x0000ffff} + }, + { /* shader 14 */ + "ps_3_0\n" + "dcl_2d_pp s0\n", + {0xffff0300, 0x0200001f, 0x90000000, 0xa02f0800, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1323,6 +1333,9 @@ static void failure_test(void) { /* shader 41: no modifier allowed with dcl instruction in vs */ "vs_3_0\n" "dcl_texcoord0_centroid v0\n", + /* shader 42: no modifiers with vs dcl sampler instruction */ + "vs_3_0\n" + "dcl_2d_pp s0\n", }; HRESULT hr; unsigned int i;

1 0

Sven Baars : oleview: Fix Dutch translation.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: fd41f70b210821b173543afcc14a84df4091eb92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd41f70b210821b173543afcc… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon May 31 16:05:46 2010 +0200 oleview: Fix Dutch translation. --- programs/oleview/Nl.rc | 96 ++++++++++++++++++++++++----------------------- 1 files changed, 49 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd41f70b210821b173543…

1 0

Hans Leidekker : msi: Pass the control name to ControlEvent_SubscribeToEvent instead of uninitialized memory .
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: e1a63fd5c254c91d8e5fd079a00073db31d91cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a63fd5c254c91d8e5fd079a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 31 12:13:00 2010 +0200 msi: Pass the control name to ControlEvent_SubscribeToEvent instead of uninitialized memory. --- dlls/msi/dialog.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2a00aa7..1b129e0 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -774,7 +774,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; struct msi_text_info *info; - LPCWSTR text, ptr, prop; + LPCWSTR text, ptr, prop, control_name; LPWSTR font_name; TRACE("%p %p\n", dialog, rec); @@ -787,6 +787,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec ) if( !info ) return ERROR_SUCCESS; + control_name = MSI_RecordGetString( rec, 2 ); control->attributes = MSI_RecordGetInteger( rec, 8 ); prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); @@ -805,7 +806,7 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec ) SetPropW( control->hwnd, szButtonData, info ); ControlEvent_SubscribeToEvent( dialog->package, dialog, - szSelectionPath, control->name, szSelectionPath ); + szSelectionPath, control_name, szSelectionPath ); return ERROR_SUCCESS; } @@ -2390,7 +2391,7 @@ done: static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; - LPCWSTR prop; + LPCWSTR prop, control_name; MSIPACKAGE *package = dialog->package; DWORD style; struct msi_selection_tree_info *info; @@ -2410,6 +2411,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) } control->handler = msi_dialog_seltree_handler; + control_name = MSI_RecordGetString( rec, 2 ); control->attributes = MSI_RecordGetInteger( rec, 8 ); prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); @@ -2422,7 +2424,7 @@ static UINT msi_dialog_selection_tree( msi_dialog *dialog, MSIRECORD *rec ) SetPropW( control->hwnd, szButtonData, info ); ControlEvent_SubscribeToEvent( dialog->package, dialog, - szSelectionPath, control->name, szProperty ); + szSelectionPath, control_name, szProperty ); /* initialize it */ msi_seltree_create_imagelist( control->hwnd );

1 0

Luca Bennati : shell32: Update Italian translation.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 26ad889d7998804ce84ad789b9bea3ac5c61f7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ad889d7998804ce84ad789b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun May 30 16:36:56 2010 +0200 shell32: Update Italian translation. --- dlls/shell32/shell32_It.rc | 123 ++++++++++++++++++++++++++++++++----------- 1 files changed, 91 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26ad889d7998804ce84ad…

1 0

Hans Leidekker : msi: Improve parsing of patch summary information.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 35a0461baa03dea35df4f80afbd247173b284a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a0461baa03dea35df4f80af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 31 12:12:42 2010 +0200 msi: Improve parsing of patch summary information. --- dlls/msi/action.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 408c253..0505d33 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -496,6 +496,7 @@ UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) { MSIPATCHINFO *pi; UINT r = ERROR_SUCCESS; + WCHAR *p; pi = msi_alloc_zero( sizeof(MSIPATCHINFO) ); if (!pi) @@ -508,6 +509,30 @@ UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) return ERROR_OUTOFMEMORY; } + p = pi->patchcode; + if (*p != '{') + { + msi_free( pi->patchcode ); + msi_free( pi ); + return ERROR_PATCH_PACKAGE_INVALID; + } + + p = strchrW( p + 1, '}' ); + if (!p) + { + msi_free( pi->patchcode ); + msi_free( pi ); + return ERROR_PATCH_PACKAGE_INVALID; + } + + if (p[1]) + { + FIXME("patch obsoletes %s\n", debugstr_w(p + 1)); + p[1] = 0; + } + + TRACE("patch code %s\n", debugstr_w(pi->patchcode)); + pi->transforms = msi_suminfo_dup_string( si, PID_LASTAUTHOR ); if (!pi->transforms) {

1 0

Hans Leidekker : msi: Advance to the right cabinet in ACTION_MsiPublishAssemblies.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: d17ebc4032e8828bcdfce9927be84d0809606996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17ebc4032e8828bcdfce9927… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 31 12:12:01 2010 +0200 msi: Advance to the right cabinet in ACTION_MsiPublishAssemblies. --- dlls/msi/action.c | 42 +++++++++++++++++++++--------------------- dlls/msi/media.c | 8 +++----- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c5354de..408c253 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6919,33 +6919,33 @@ static UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) if (assembly->installed && !mi->is_continuous) continue; - if (assembly->file->Sequence > mi->last_sequence || mi->is_continuous || - (assembly->file->IsCompressed && !mi->is_extracted)) + if (assembly->file->IsCompressed) { - MSICABDATA data; - - r = ready_media(package, assembly->file, mi); - if (r != ERROR_SUCCESS) + if (assembly->file->disk_id != mi->disk_id || mi->is_continuous) { - ERR("Failed to ready media\n"); - break; - } + MSICABDATA data; - data.mi = mi; - data.package = package; - data.cb = installassembly_cb; - data.user = &assemblies; + r = ready_media(package, assembly->file, mi); + if (r != ERROR_SUCCESS) + { + ERR("Failed to ready media\n"); + break; + } - if (assembly->file->IsCompressed && - !msi_cabextract(package, mi, &data)) - { - ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet)); - r = ERROR_FUNCTION_FAILED; - break; + data.mi = mi; + data.package = package; + data.cb = installassembly_cb; + data.user = &assemblies; + + if (!msi_cabextract(package, mi, &data)) + { + ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet)); + r = ERROR_FUNCTION_FAILED; + break; + } } } - - if (!assembly->file->IsCompressed) + else { LPWSTR source = resolve_file_source(package, assembly->file); diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 49bc199..b455775 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -629,12 +629,10 @@ static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', - '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=', - ' ','%','i',' ','A','N','D',' ','`','D','i','s','k','I','d','`',' ','>','=', - ' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ', - '`','D','i','s','k','I','d','`',0}; + '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=',' ','%','i', + ' ','O','R','D','E','R',' ','B','Y',' ','`','D','i','s','k','I','d','`',0}; - row = MSI_QueryGetRecord(package->db, query, file->Sequence, mi->disk_id); + row = MSI_QueryGetRecord(package->db, query, file->Sequence); if (!row) { TRACE("Unable to query row\n");

1 0