January 2011 - Wine-commits

Alexandre Julliard : setupapi: Convert string table resources to po files.
by Alexandre Julliard 12 Jan '11

12 Jan '11

1 0

Alexandre Julliard : localui: Convert string table resources to po files.
by Alexandre Julliard 12 Jan '11

12 Jan '11

1 0

Alexandre Julliard : mpr: Convert string table resources to po files.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 142d41644048b9939beb103e7b05a161327751be URL: http://source.winehq.org/git/wine.git/?a=commit;h=142d41644048b9939beb103e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 12 16:27:50 2011 +0100 mpr: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/mpr/Makefile.in | 6 ++++-- dlls/mpr/{version.rc => mpr.rc} | 11 ++++++++++- dlls/mpr/mpr_Bg.rc | 5 ----- dlls/mpr/mpr_Cs.rc | 5 ----- dlls/mpr/mpr_Da.rc | 5 ----- dlls/mpr/mpr_De.rc | 5 ----- dlls/mpr/mpr_En.rc | 5 ----- dlls/mpr/mpr_Eo.rc | 5 ----- dlls/mpr/mpr_Es.rc | 5 ----- dlls/mpr/mpr_Fr.rc | 5 ----- dlls/mpr/mpr_He.rc | 5 ----- dlls/mpr/mpr_Hu.rc | 5 ----- dlls/mpr/mpr_It.rc | 5 ----- dlls/mpr/mpr_Ja.rc | 5 ----- dlls/mpr/mpr_Ko.rc | 5 ----- dlls/mpr/mpr_Lt.rc | 5 ----- dlls/mpr/mpr_Nl.rc | 5 ----- dlls/mpr/mpr_No.rc | 5 ----- dlls/mpr/mpr_Pl.rc | 5 ----- dlls/mpr/mpr_Pt.rc | 8 -------- dlls/mpr/mpr_Ro.rc | 5 ----- dlls/mpr/mpr_Ru.rc | 5 ----- dlls/mpr/mpr_Si.rc | 5 ----- dlls/mpr/mpr_Sr.rc | 10 ---------- dlls/mpr/mpr_Sv.rc | 5 ----- dlls/mpr/mpr_Tr.rc | 5 ----- dlls/mpr/mpr_Uk.rc | 5 ----- dlls/mpr/mpr_Zh.rc | 10 ---------- po/ar.po | 4 ++++ po/bg.po | 4 ++++ po/cs.po | 4 ++++ po/da.po | 4 ++++ po/de.po | 4 ++++ po/el.po | 4 ++++ po/en.po | 4 ++++ po/en_US.po | 4 ++++ po/eo.po | 4 ++++ po/es.po | 4 ++++ po/fa.po | 4 ++++ po/fi.po | 4 ++++ po/fr.po | 4 ++++ po/he.po | 4 ++++ po/hi.po | 4 ++++ po/hu.po | 4 ++++ po/it.po | 4 ++++ po/ja.po | 4 ++++ po/ko.po | 4 ++++ po/lt.po | 4 ++++ po/ml.po | 4 ++++ po/nb_NO.po | 4 ++++ po/nl.po | 4 ++++ po/or.po | 4 ++++ po/pa.po | 4 ++++ po/pl.po | 4 ++++ po/pt_BR.po | 4 ++++ po/pt_PT.po | 4 ++++ po/rm.po | 4 ++++ po/ro.po | 4 ++++ po/ru.po | 4 ++++ po/sk.po | 4 ++++ po/sl.po | 4 ++++ po/sr_RS(a)cyrillic.po | 4 ++++ po/sr_RS(a)latin.po | 4 ++++ po/sv.po | 4 ++++ po/te.po | 4 ++++ po/th.po | 4 ++++ po/tr.po | 4 ++++ po/uk.po | 4 ++++ po/wa.po | 4 ++++ po/wine.pot | 4 ++++ po/zh_CN.po | 4 ++++ po/zh_TW.po | 4 ++++ 74 files changed, 192 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=142d41644048b9939beb1…

1 0

Alexandre Julliard : cryptui: Convert string table resources to po files.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: aa1bdef9a410b608913567a0235f64af938ee78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1bdef9a410b608913567a02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 12 15:30:17 2011 +0100 cryptui: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/cryptui/Makefile.in | 2 + dlls/cryptui/cryptui.rc | 155 ++++++++++ dlls/cryptui/cryptui_De.rc | 151 --------- dlls/cryptui/cryptui_En.rc | 151 --------- dlls/cryptui/cryptui_Fr.rc | 151 --------- dlls/cryptui/cryptui_It.rc | 151 --------- dlls/cryptui/cryptui_Ja.rc | 151 --------- dlls/cryptui/cryptui_Ko.rc | 152 --------- dlls/cryptui/cryptui_Lt.rc | 151 --------- dlls/cryptui/cryptui_Nl.rc | 151 --------- dlls/cryptui/cryptui_No.rc | 151 --------- dlls/cryptui/cryptui_Pl.rc | 151 --------- dlls/cryptui/cryptui_Pt.rc | 307 ------------------- dlls/cryptui/cryptui_Ro.rc | 151 --------- dlls/cryptui/cryptui_Sv.rc | 151 --------- dlls/cryptui/cryptui_Uk.rc | 151 --------- po/ar.po | 569 +++++++++++++++++++++++++++++++++-- po/bg.po | 574 +++++++++++++++++++++++++++++++++-- po/cs.po | 592 ++++++++++++++++++++++++++++++++++-- po/da.po | 594 ++++++++++++++++++++++++++++++++++-- po/de.po | 675 +++++++++++++++++++++++++++++++++++++++-- po/el.po | 569 +++++++++++++++++++++++++++++++++-- po/en.po | 599 +++++++++++++++++++++++++++++++++++-- po/en_US.po | 604 +++++++++++++++++++++++++++++++++++-- po/eo.po | 582 ++++++++++++++++++++++++++++++++++-- po/es.po | 594 ++++++++++++++++++++++++++++++++++-- po/fa.po | 569 +++++++++++++++++++++++++++++++++-- po/fi.po | 585 ++++++++++++++++++++++++++++++++++-- po/fr.po | 628 ++++++++++++++++++++++++++++++++++++-- po/he.po | 585 ++++++++++++++++++++++++++++++++++-- po/hi.po | 566 +++++++++++++++++++++++++++++++++-- po/hu.po | 606 +++++++++++++++++++++++++++++++++++-- po/it.po | 698 ++++++++++++++++++++++++++++++++++++++++--- po/ja.po | 612 +++++++++++++++++++++++++++++++++++-- po/ko.po | 690 +++++++++++++++++++++++++++++++++++++++--- po/lt.po | 610 +++++++++++++++++++++++++++++++++++-- po/ml.po | 566 +++++++++++++++++++++++++++++++++-- po/nb_NO.po | 703 ++++++++++++++++++++++++++++++++++++++++--- po/nl.po | 724 +++++++++++++++++++++++++++++++++++++++++--- po/or.po | 566 +++++++++++++++++++++++++++++++++-- po/pa.po | 566 +++++++++++++++++++++++++++++++++-- po/pl.po | 635 +++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 700 ++++++++++++++++++++++++++++++++++++++++--- po/pt_PT.po | 705 ++++++++++++++++++++++++++++++++++++++++--- po/rm.po | 569 +++++++++++++++++++++++++++++++++-- po/ro.po | 715 +++++++++++++++++++++++++++++++++++++++++--- po/ru.po | 594 ++++++++++++++++++++++++++++++++++-- po/sk.po | 573 +++++++++++++++++++++++++++++++++-- po/sl.po | 596 ++++++++++++++++++++++++++++++++++-- po/sr_RS(a)cyrillic.po | 581 ++++++++++++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 593 ++++++++++++++++++++++++++++++++++-- po/sv.po | 647 +++++++++++++++++++++++++++++++++++++-- po/te.po | 566 +++++++++++++++++++++++++++++++++-- po/th.po | 572 +++++++++++++++++++++++++++++++++-- po/tr.po | 588 ++++++++++++++++++++++++++++++++++-- po/uk.po | 604 +++++++++++++++++++++++++++++++++++-- po/wa.po | 573 +++++++++++++++++++++++++++++++++-- po/wine.pot | 564 +++++++++++++++++++++++++++++++++-- po/zh_CN.po | 579 +++++++++++++++++++++++++++++++++-- po/zh_TW.po | 583 ++++++++++++++++++++++++++++++++++-- 62 files changed, 25739 insertions(+), 3456 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa1bdef9a410b60891356…

1 0

Alexandre Julliard : inetcpl.cpl: Convert string table resources to po files.
by Alexandre Julliard 12 Jan '11

12 Jan '11

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 85386c2c6eaed6ea89eefef6c8948169323bbc28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85386c2c6eaed6ea89eefef6c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 11 20:30:00 2011 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/actctx.c | 5 +++-- dlls/kernel32/tests/comm.c | 6 ++++-- dlls/kernel32/tests/debugger.c | 8 ++++++-- dlls/kernel32/tests/fiber.c | 3 ++- dlls/kernel32/tests/loader.c | 31 ++++++++++++++++--------------- dlls/kernel32/tests/module.c | 11 +++++------ dlls/kernel32/tests/pipe.c | 12 +++++++++--- dlls/kernel32/tests/process.c | 9 +++++---- dlls/kernel32/tests/thread.c | 12 ++++++++---- dlls/kernel32/tests/virtual.c | 8 +++++--- 10 files changed, 63 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85386c2c6eaed6ea89eef…

1 0

Martin Petricek : gdiplus: Support for indexed formats in GdipBitmapSetPixel.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: ee3c1790265eeb7fc90ef89e20c1fa87b7b006d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3c1790265eeb7fc90ef89e2… Author: Martin Petricek <tux(a)centrum.cz> Date: Wed Jan 12 04:34:47 2011 +0100 gdiplus: Support for indexed formats in GdipBitmapSetPixel. --- dlls/gdiplus/image.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 6 ++-- 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 69f5865..a69046d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -296,6 +296,53 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, return Ok; } +static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* bitmap) { + BYTE index = 0; + int best_distance = 0x7fff; + int distance; + int i; + /* This algorithm scans entire pallete, + computes difference from desired color (all color components have equal weight) + and returns the index of color with least difference. + + Note: Maybe it could be replaced with a better algorithm for better image quality + and performance, though better algorithm would probably need some pre-built lookup + tables and thus may actually be slower if this method is called only few times per + every image. + */ + for(i=0;i<bitmap->image.palette_size;i++) { + ARGB color=bitmap->image.palette_entries[i]; + distance=abs(b-(color & 0xff)) + abs(g-(color>>8 & 0xff)) + abs(r-(color>>16 & 0xff)) + abs(a-(color>>24 & 0xff)); + if (distance<best_distance) { + best_distance=distance; + index=i; + } + } + return index; +} + +static inline void setpixel_8bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x, GpBitmap* bitmap) +{ + BYTE index = get_palette_index(r,g,b,a,bitmap); + row[x]=index; +} + +static inline void setpixel_1bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x, GpBitmap* bitmap) +{ + row[x/8] = (row[x/8] & ~(1<<(7-x%8))) | (get_palette_index(r,g,b,a,bitmap)<<(7-x%8)); +} + +static inline void setpixel_4bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x, GpBitmap* bitmap) +{ + if (x & 1) + row[x/2] = (row[x/2] & 0xf0) | get_palette_index(r,g,b,a,bitmap); + else + row[x/2] = (row[x/2] & 0x0f) | get_palette_index(r,g,b,a,bitmap)<<4; +} + static inline void setpixel_16bppGrayScale(BYTE r, BYTE g, BYTE b, BYTE a, BYTE *row, UINT x) { @@ -434,6 +481,15 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, case PixelFormat64bppPARGB: setpixel_64bppPARGB(r,g,b,a,row,x); break; + case PixelFormat8bppIndexed: + setpixel_8bppIndexed(r,g,b,a,row,x,bitmap); + break; + case PixelFormat4bppIndexed: + setpixel_4bppIndexed(r,g,b,a,row,x,bitmap); + break; + case PixelFormat1bppIndexed: + setpixel_1bppIndexed(r,g,b,a,row,x,bitmap); + break; default: FIXME("not implemented for format 0x%x\n", bitmap->format); return NotImplemented; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b2b1a0f..989e0bb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1568,7 +1568,7 @@ static void test_palette(void) expect(0xff000000, color); stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffffffff); - todo_wine ok((stat == Ok) || + ok((stat == Ok) || broken(stat == InvalidParameter) /* pre-win7 */, "stat=%.8x\n", stat); if (stat == Ok) @@ -1601,7 +1601,7 @@ static void test_palette(void) expect(0xff000000, color); stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffff00ff); - todo_wine ok((stat == Ok) || + ok((stat == Ok) || broken(stat == InvalidParameter) /* pre-win7 */, "stat=%.8x\n", stat); if (stat == Ok) @@ -1634,7 +1634,7 @@ static void test_palette(void) expect(0xff000000, color); stat = GdipBitmapSetPixel(bitmap, 0, 1, 0xffcccccc); - todo_wine ok((stat == Ok) || + ok((stat == Ok) || broken(stat == InvalidParameter) /* pre-win7 */, "stat=%.8x\n", stat); if (stat == Ok)

1 0

Alexandre Julliard : credui: Convert string table resources to po files.
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: b6e78c4e7f8d9b20ac7b629d45c6c3bf5e1e72d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e78c4e7f8d9b20ac7b629d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 12 15:19:02 2011 +0100 credui: Convert string table resources to po files. --- configure | 2 +- configure.ac | 2 +- dlls/credui/Makefile.in | 2 ++ dlls/credui/credui.rc | 14 ++++++++++++++ dlls/credui/credui_Da.rc | 10 ---------- dlls/credui/credui_De.rc | 10 ---------- dlls/credui/credui_En.rc | 10 ---------- dlls/credui/credui_Es.rc | 10 ---------- dlls/credui/credui_Fr.rc | 10 ---------- dlls/credui/credui_He.rc | 10 ---------- dlls/credui/credui_Hu.rc | 10 ---------- dlls/credui/credui_It.rc | 10 ---------- dlls/credui/credui_Ko.rc | 11 ----------- dlls/credui/credui_Lt.rc | 10 ---------- dlls/credui/credui_Nl.rc | 10 ---------- dlls/credui/credui_No.rc | 10 ---------- dlls/credui/credui_Pl.rc | 10 ---------- dlls/credui/credui_Pt.rc | 25 ------------------------- dlls/credui/credui_Ro.rc | 10 ---------- dlls/credui/credui_Ru.rc | 10 ---------- dlls/credui/credui_Si.rc | 10 ---------- dlls/credui/credui_Sr.rc | 20 -------------------- dlls/credui/credui_Sv.rc | 10 ---------- dlls/credui/credui_Uk.rc | 10 ---------- dlls/credui/credui_Zh.rc | 20 -------------------- po/ar.po | 30 ++++++++++++++++++++++++++++++ po/bg.po | 30 ++++++++++++++++++++++++++++++ po/cs.po | 31 +++++++++++++++++++++++++++++++ po/da.po | 36 ++++++++++++++++++++++++++++++++++++ po/de.po | 35 +++++++++++++++++++++++++++++++++++ po/el.po | 30 ++++++++++++++++++++++++++++++ po/en.po | 30 ++++++++++++++++++++++++++++++ po/en_US.po | 36 ++++++++++++++++++++++++++++++++++++ po/eo.po | 30 ++++++++++++++++++++++++++++++ po/es.po | 36 ++++++++++++++++++++++++++++++++++++ po/fa.po | 30 ++++++++++++++++++++++++++++++ po/fi.po | 30 ++++++++++++++++++++++++++++++ po/fr.po | 38 ++++++++++++++++++++++++++++++++++++++ po/he.po | 36 ++++++++++++++++++++++++++++++++++++ po/hi.po | 30 ++++++++++++++++++++++++++++++ po/hu.po | 37 +++++++++++++++++++++++++++++++++++++ po/it.po | 37 +++++++++++++++++++++++++++++++++++++ po/ja.po | 31 +++++++++++++++++++++++++++++++ po/ko.po | 36 ++++++++++++++++++++++++++++++++++++ po/lt.po | 38 ++++++++++++++++++++++++++++++++++++++ po/ml.po | 30 ++++++++++++++++++++++++++++++ po/nb_NO.po | 36 ++++++++++++++++++++++++++++++++++++ po/nl.po | 36 ++++++++++++++++++++++++++++++++++++ po/or.po | 30 ++++++++++++++++++++++++++++++ po/pa.po | 30 ++++++++++++++++++++++++++++++ po/pl.po | 36 ++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 36 ++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 37 +++++++++++++++++++++++++++++++++++++ po/rm.po | 30 ++++++++++++++++++++++++++++++ po/ro.po | 35 +++++++++++++++++++++++++++++++++++ po/ru.po | 35 +++++++++++++++++++++++++++++++++++ po/sk.po | 30 ++++++++++++++++++++++++++++++ po/sl.po | 34 ++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 37 +++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 37 +++++++++++++++++++++++++++++++++++++ po/sv.po | 36 ++++++++++++++++++++++++++++++++++++ po/te.po | 30 ++++++++++++++++++++++++++++++ po/th.po | 30 ++++++++++++++++++++++++++++++ po/tr.po | 31 +++++++++++++++++++++++++++++++ po/uk.po | 36 ++++++++++++++++++++++++++++++++++++ po/wa.po | 30 ++++++++++++++++++++++++++++++ po/wine.pot | 30 ++++++++++++++++++++++++++++++ po/zh_CN.po | 32 ++++++++++++++++++++++++++++++++ po/zh_TW.po | 32 ++++++++++++++++++++++++++++++++ 69 files changed, 1481 insertions(+), 248 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6e78c4e7f8d9b20ac7b6…

1 0

Hans Leidekker : msi: Fix a memory leak (valgrind).
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: 94f4c0f07ded9d282db54523e049725029a8f5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f4c0f07ded9d282db54523e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 12 14:04:13 2011 +0100 msi: Fix a memory leak (valgrind). --- dlls/msi/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7ccc7c6..8f2d116 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2735,6 +2735,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) { ERR("Could not create key %s\n", debugstr_w(keypath)); msi_free(uikey); + msi_free(keypath); return ERROR_SUCCESS; } @@ -2786,6 +2787,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(value_data); msi_free(deformated); msi_free(uikey); + msi_free(keypath); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Fix parsing of patch product codes (valgrind).
by Alexandre Julliard 12 Jan '11

12 Jan '11

Module: wine Branch: master Commit: d08378a06f90ececa883d71ea02f7619f38aef29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08378a06f90ececa883d71ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 12 14:04:28 2011 +0100 msi: Fix parsing of patch product codes (valgrind). --- dlls/msi/action.c | 3 +-- dlls/msi/msi.c | 21 +++++++++------------ dlls/msi/msipriv.h | 1 + 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8f2d116..725ea2f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -465,8 +465,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, return ERROR_SUCCESS; } - -static LPWSTR* msi_split_string( LPCWSTR str, WCHAR sep ) +WCHAR **msi_split_string( const WCHAR *str, WCHAR sep ) { LPCWSTR pc; LPWSTR p, *ret = NULL; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 266bd89..948ae35 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -299,7 +299,8 @@ done: return r; } -static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR **product_codes ) + +static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_codes ) { MSIHANDLE patch, info = 0; UINT r, type; @@ -332,23 +333,22 @@ static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR **product_cod } r = MsiSummaryInfoGetPropertyW( info, PID_TEMPLATE, &type, NULL, NULL, codes, &size ); - if (r != ERROR_SUCCESS) - msi_free( codes ); - else - *product_codes = codes; + if (r == ERROR_SUCCESS) + *product_codes = msi_split_string( codes, ';' ); done: MsiCloseHandle( info ); MsiCloseHandle( patch ); + msi_free( codes ); return r; } static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine) { - UINT r; + UINT r, i; DWORD size; LPCWSTR cmd_ptr = szCommandLine; - LPWSTR beg, end, cmd, codes = NULL; + LPWSTR cmd, *codes = NULL; BOOL succeeded = FALSE; static const WCHAR fmt[] = {'%','s',' ','P','A','T','C','H','=','"','%','s','"',0}; @@ -376,17 +376,14 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS r = MsiConfigureProductExW(szProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd); else { - beg = codes; - while ((end = strchrW(beg, '}'))) + for (i = 0; codes[i]; i++) { - *(end + 1) = '\0'; - r = MsiConfigureProductExW(beg, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd); + r = MsiConfigureProductExW(codes[i], INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd); if (r == ERROR_SUCCESS) { TRACE("patch applied\n"); succeeded = TRUE; } - beg = end + 2; } if (succeeded) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3f482ea..47a35b8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -958,6 +958,7 @@ extern void msi_feature_set_state(MSIPACKAGE *, MSIFEATURE *, INSTALLSTATE); extern MSIASSEMBLY *load_assembly(MSIPACKAGE *, MSICOMPONENT *); extern UINT install_assembly(MSIPACKAGE *, MSICOMPONENT *); extern WCHAR *font_version_from_file(const WCHAR *); +extern WCHAR **msi_split_string(const WCHAR *, WCHAR); /* media */

1 0