November 2006 - Wine-commits

James Hawkins : advapi32: Remove redundant NULL checks before CRYPT_Free.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 024237efaaaa689d077b299016e0dedea541b722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024237efaaaa689d077b29901… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 29 20:50:58 2006 -0800 advapi32: Remove redundant NULL checks before CRYPT_Free. --- dlls/advapi32/crypt.c | 31 +++++++++++-------------------- 1 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 8dd3486..07c767a 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -474,22 +474,15 @@ error: pProv->dwMagic = 0; if (pProv->hModule) FreeLibrary(pProv->hModule); - if (pProv->pVTable) - CRYPT_Free(pProv->pVTable); - if (pProv->pFuncs) - CRYPT_Free(pProv->pFuncs); + CRYPT_Free(pProv->pVTable); + CRYPT_Free(pProv->pFuncs); CRYPT_Free(pProv); } - if (pszContainerA) - CRYPT_Free(pszContainerA); - if (provnameA) - CRYPT_Free(provnameA); - if (provname) - CRYPT_Free(provname); - if (temp) - CRYPT_Free(temp); - if (imagepath) - CRYPT_Free(imagepath); + CRYPT_Free(pszContainerA); + CRYPT_Free(provnameA); + CRYPT_Free(provname); + CRYPT_Free(temp); + CRYPT_Free(imagepath); return FALSE; } @@ -517,10 +510,8 @@ BOOL WINAPI CryptAcquireContextA (HCRYPT ret = CryptAcquireContextW(phProv, pContainer, pProvider, dwProvType, dwFlags); - if (pContainer) - CRYPT_Free(pContainer); - if (pProvider) - CRYPT_Free(pProvider); + CRYPT_Free(pContainer); + CRYPT_Free(pProvider); return ret; } @@ -1663,7 +1654,7 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH h CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1); result = CryptSignHashW(hHash, dwKeySpec, wsDescription, dwFlags, pbSignature, pdwSigLen); - if (wsDescription) CRYPT_Free(wsDescription); + CRYPT_Free(wsDescription); return result; } @@ -1962,7 +1953,7 @@ BOOL WINAPI CryptVerifySignatureA (HCRYP CRYPT_ANSIToUnicode(sDescription, &wsDescription, -1); result = CryptVerifySignatureW(hHash, pbSignature, dwSigLen, hPubKey, wsDescription, dwFlags); - if (wsDescription) CRYPT_Free(wsDescription); + CRYPT_Free(wsDescription); return result; }

1 0

James Hawkins : msi: Use mi->source if the source is not a full path.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: a64945baeab3f6ccf41494dba078b16c92fde3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64945baeab3f6ccf41494dba… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 29 20:30:01 2006 -0800 msi: Use mi->source if the source is not a full path. --- dlls/msi/files.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index cf7baf4..a4819fc 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -483,6 +483,9 @@ static UINT download_remote_cabinet(MSIP *(ptr + 1) = '\0'; ptr = strrchrW(mi->source, '\\'); + if (!ptr) + ptr = mi->source; + src = msi_realloc(src, (lstrlenW(src) + lstrlenW(ptr)) * sizeof(WCHAR)); if (!src) return ERROR_OUTOFMEMORY;

1 0

Pierre d'Herbemont : winex11.drv: Fix SetWindowPos parameters in the spec file.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: d208ad82dd57413af7ef86705fe5f016ca2e208f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d208ad82dd57413af7ef86705… Author: Pierre d'Herbemont <pdherbemont(a)free.fr> Date: Thu Nov 30 02:23:12 2006 +0100 winex11.drv: Fix SetWindowPos parameters in the spec file. --- dlls/winex11.drv/winex11.drv.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 4b136b2..1387979 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -105,7 +105,7 @@ @ cdecl SetFocus(long) X11DRV_SetFocus @ cdecl SetParent(long long) X11DRV_SetParent @ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon -@ cdecl SetWindowPos(ptr ptr ptr ptr long ptr) X11DRV_SetWindowPos +@ cdecl SetWindowPos(long long ptr ptr long ptr) X11DRV_SetWindowPos @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn @ cdecl SetWindowStyle(ptr long) X11DRV_SetWindowStyle @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText

1 0

Konstantin Kondratyuk : fonts: Add Ukrainian symbols in System font.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 1d8664ead4b7b20dd1e8e545e0e55eee9e7824d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8664ead4b7b20dd1e8e545e… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Nov 29 20:12:15 2006 +0300 fonts: Add Ukrainian symbols in System font. --- fonts/system.sfd | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/fonts/system.sfd b/fonts/system.sfd index a6f58f9..2597bb4 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -43,9 +43,9 @@ NameList: Adobe Glyph List DisplaySize: 16 AntiAlias: 0 FitToEm: 1 -WinInfo: 1360 20 13 +WinInfo: 960 20 13 OnlyBitmaps: 1 -BeginChars: 65536 465 +BeginChars: 65536 471 StartChar: space Encoding: 32 32 0 Width: 4 @@ -2555,11 +2555,47 @@ EndChar StartChar: afii57689 Encoding: 1513 1513 464 Width: 11 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii10055 +Encoding: 1030 1030 465 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10056 +Encoding: 1031 1031 466 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10103 +Encoding: 1110 1110 467 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10104 +Encoding: 1111 1111 468 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10101 +Encoding: 1108 1108 469 +Width: 16 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10053 +Encoding: 1028 1028 470 +Width: 16 Flags: HW TeX: 0 0 0 0 EndChar EndChars -BitmapFont: 16 465 13 3 1 +BitmapFont: 16 471 13 3 1 BDFChar: 0 32 4 14 14 0 0 z BDFChar: 1 33 4 1 2 0 9 @@ -3490,5 +3526,17 @@ BDFChar: 463 1510 10 1 9 0 9 _Z7RS(a)fSCe)upBI"on`*!J(3# BDFChar: 464 1513 11 1 10 0 9 ^qe10beVH<beVH<beVH<beX7o +BDFChar: 465 1030 4 1 2 0 12 +^q]rc^qdb$^qdb$^]4?7 +BDFChar: 466 1031 4 0 3 0 12 +OH9HM?smAM?smAM?iU0, +BDFChar: 467 1110 4 1 2 0 9 +^q]rc^qdb$^q]pM +BDFChar: 468 1111 4 0 3 0 9 +OH9HM?smAM?sis7 +BDFChar: 469 1108 7 0 5 0 6 +Gg*tm^s%$' +BDFChar: 470 1028 9 1 8 0 9 +4D)LHpqX\_Aip%n EndBitmapFont EndSplineFont

1 0

Konstantin Kondratyuk : fonts: Add ukrainian symbols in Courier.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 7dcc6688b8f7640ece49925d575a1c45f155eab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dcc6688b8f7640ece49925d5… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Nov 29 20:06:00 2006 +0300 fonts: Add ukrainian symbols in Courier. --- fonts/courier.sfd | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/fonts/courier.sfd b/fonts/courier.sfd index 89f80f6..e419eea 100644 --- a/fonts/courier.sfd +++ b/fonts/courier.sfd @@ -43,10 +43,10 @@ NameList: Adobe Glyph List DisplaySize: 13 AntiAlias: 0 FitToEm: 1 -WinInfo: 902 22 21 +WinInfo: 814 22 21 OnlyBitmaps: 1 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 352 +BeginChars: 65536 358 StartChar: space Encoding: 32 32 0 Width: 8 @@ -1822,16 +1822,53 @@ EndChar StartChar: gcircumflex Encoding: 285 285 350 Width: 8 +Flags: W TeX: 0 0 0 0 EndChar StartChar: Gbreve Encoding: 286 286 351 Width: 8 +Flags: W +TeX: 0 0 0 0 +EndChar +StartChar: afii10055 +Encoding: 1030 1030 352 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10056 +Encoding: 1031 1031 353 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10053 +Encoding: 1028 1028 354 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10101 +Encoding: 1108 1108 355 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10103 +Encoding: 1110 1110 356 +Width: 8 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10104 +Encoding: 1111 1111 357 +Width: 8 Flags: HW TeX: 0 0 0 0 EndChar EndChars -BitmapFont: 13 352 11 2 1 +BitmapFont: 13 358 11 2 1 BDFChar: 0 32 8 0 0 0 0 z BDFChar: 1 33 8 4 4 0 8 @@ -2536,5 +2573,17 @@ BDFChar: 350 285 8 0 0 0 0 z BDFChar: 351 286 8 1 7 0 10 6o[:qJ:N01JjMR" +BDFChar: 352 1030 8 2 6 0 8 +p`L\%+<VdLp](9o +BDFChar: 353 1031 8 2 6 0 10 +:]U85+<VdL+<^FZ +BDFChar: 354 1028 8 0 6 0 8 +4(a)4RSpkXGe49,?] +BDFChar: 355 1108 8 0 6 0 5 +I"Lj<Jp[Ou +BDFChar: 356 1110 8 2 6 0 8 ++92E"+<VdLp](9o +BDFChar: 357 1111 8 2 6 0 8 +O8o:=+<VdLp](9o EndBitmapFont EndSplineFont

1 0

Konstantin Kondratyuk : fonts: Add Ukrainian symbols in MS Sans Serif.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 645df99bc4b6387932c0c5026cc3fb6ec5aaf5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=645df99bc4b6387932c0c5026… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Nov 29 20:09:58 2006 +0300 fonts: Add Ukrainian symbols in MS Sans Serif. --- fonts/ms_sans_serif.sfd | 85 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 79 insertions(+), 6 deletions(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 14f6ed3..8e374c0 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -42,12 +42,13 @@ EndTtf LangName: 1033 "" "" "" "FontForge 1.0 : MS Sans Serif : 14-6-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" Encoding: UnicodeBmp UnicodeInterp: none -DisplaySize: 13 +NameList: Adobe Glyph List +DisplaySize: 20 AntiAlias: 0 FitToEm: 1 -WinInfo: 0 29 22 +WinInfo: 754 29 22 OnlyBitmaps: 1 -BeginChars: 65536 354 +BeginChars: 65536 360 StartChar: space Encoding: 32 32 0 Width: 2 @@ -1944,8 +1945,44 @@ Encoding: 537 537 353 Width: 13 TeX: 0 0 0 0 EndChar +StartChar: afii10103 +Encoding: 1110 1110 354 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10104 +Encoding: 1111 1111 355 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10101 +Encoding: 1108 1108 356 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10053 +Encoding: 1028 1028 357 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10055 +Encoding: 1030 1030 358 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10056 +Encoding: 1031 1031 359 +Width: 13 +Flags: HW +TeX: 0 0 0 0 +EndChar EndChars -BitmapFont: 13 354 11 2 1 +BitmapFont: 13 360 11 2 1 BDFChar: 0 32 3 0 0 0 0 z BDFChar: 1 33 3 1 1 0 8 @@ -2652,8 +2689,20 @@ BDFChar: 351 1025 7 1 5 0 10 :]U9(a)J:R->J:RCp BDFChar: 352 1105 6 1 5 0 7 :]PHjpje0> +BDFChar: 354 1110 2 1 1 0 8 +J,fS"J:N0#J,fQL +BDFChar: 355 1111 2 0 2 0 8 +TE"sW5X7S"5QCca +BDFChar: 356 1108 6 0 4 0 5 +E/<G&Li<=o +BDFChar: 357 1028 7 0 5 0 8 +G_CTtn:6%BGQ7^D +BDFChar: 358 1030 3 1 1 0 8 +J:N0#J:N0#J,fQL +BDFChar: 359 1031 3 0 2 0 10 +TE%5B5X7S"5X7R7 EndBitmapFont -BitmapFont: 16 354 13 3 1 FontForge +BitmapFont: 16 360 13 3 1 FontForge BDFChar: 0 32 3 0 0 0 0 z BDFChar: 1 33 3 1 1 0 9 @@ -3360,8 +3409,20 @@ BDFChar: 351 1025 9 1 7 0 12 6i[5dJ:N1FJ:N0#rVuou BDFChar: 352 1105 8 1 6 0 9 8,rX7KS98RKQmIs +BDFChar: 354 1110 3 1 1 0 9 +J,fS"J:N0#J:IV" +BDFChar: 355 1111 3 0 2 0 9 +TE"sW5X7S"5X5;L +BDFChar: 356 1108 8 1 6 0 6 +G_CV:J:r.I +BDFChar: 357 1028 10 1 8 0 9 +4(a)4ULpjdmG69G5J +BDFChar: 358 1030 3 1 1 0 9 +J:N0#J:N0#J:IV" +BDFChar: 359 1031 3 0 2 0 11 +TE%5B5X7S"5X7S" EndBitmapFont -BitmapFont: 20 354 16 4 1 FontForge +BitmapFont: 20 360 16 4 1 FontForge BDFChar: 0 32 4 0 0 0 0 z BDFChar: 1 33 4 2 2 0 11 @@ -3968,5 +4029,17 @@ BDFChar: 352 1105 9 0 8 0 12 z+ohTC)uq/_5lcB75QF%L5l`)/)uos= BDFChar: 353 537 20 0 0 0 0 z +BDFChar: 354 1110 3 1 1 0 11 +J,fS"J:N0#J:N0# +BDFChar: 355 1111 3 0 2 0 11 +TE"sW5X7S"5X7S" +BDFChar: 356 1108 9 1 7 0 8 +3(/@Kn:6*Y2uipY +BDFChar: 357 1028 12 1 10 0 11 +*rmF65X9i"J,oKIJ,k*"J,hi"+FkO6 +BDFChar: 358 1030 5 2 2 0 11 +J:N0#J:N0#J:N0# +BDFChar: 359 1031 5 1 3 0 13 +TE%5B5X7S"5X7S"5X5;L EndBitmapFont EndSplineFont

1 0

Konstantin Kondratyuk : fonts: Add Ukrainian symbols in Small fonts.
by Alexandre Julliard 30 Nov '06

30 Nov '06

Module: wine Branch: master Commit: 6a9b3624e6e589ce8eccebf5b0910ed10a3fb096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9b3624e6e589ce8eccebf5b… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Nov 29 20:11:14 2006 +0300 fonts: Add Ukrainian symbols in Small fonts. --- fonts/small_fonts.sfd | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index c255c70..733ea5d 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -53,10 +53,10 @@ NameList: Adobe Glyph List DisplaySize: 11 AntiAlias: 1 FitToEm: 1 -WinInfo: 696 24 22 +WinInfo: 704 32 21 OnlyBitmaps: 1 TeXData: 1 0 0 189792 94896 63264 0 1048576 63264 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65536 406 +BeginChars: 65536 412 StartChar: A Encoding: 65 65 0 Width: 7 @@ -2487,8 +2487,44 @@ Width: 5 Flags: HW TeX: 97 0 0 0 EndChar +StartChar: afii10101 +Encoding: 1108 1108 406 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10053 +Encoding: 1028 1028 407 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10103 +Encoding: 1110 1110 408 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10104 +Encoding: 1111 1111 409 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10055 +Encoding: 1030 1030 410 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar +StartChar: afii10056 +Encoding: 1031 1031 411 +Width: 11 +Flags: HW +TeX: 0 0 0 0 +EndChar EndChars -BitmapFont: 11 406 9 2 1 +BitmapFont: 11 412 9 2 1 BDFChar: 0 65 7 1 6 0 6 0JH$gG_C_M BDFChar: 1 33 2 1 1 0 6 @@ -3301,5 +3337,17 @@ BDFChar: 404 1025 5 1 4 0 8 O9"d#JFJ)>n,NFg BDFChar: 405 1105 5 1 4 0 6 O8r[Mn:4mH +BDFChar: 406 1108 5 0 3 0 4 +E.HksDu]k< +BDFChar: 407 1028 7 0 5 0 6 +G_CV:J:r.I +BDFChar: 408 1110 3 1 1 0 6 +J,k+MJ:N.M +BDFChar: 409 1111 3 0 2 0 6 +TE%5B5X7R7 +BDFChar: 410 1030 2 1 1 0 6 +J:N0#J:N.M +BDFChar: 411 1031 3 0 2 0 8 +TE"sW5X7S"5QCca EndBitmapFont EndSplineFont

1 0

appdb/help maintainer.help
by WineHQ 29 Nov '06

29 Nov '06

ChangeSet ID: 30171 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/29 16:07:06 Added files: help : maintainer.help Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add help documentation on what 'maintainers' are and why they are important to the appdb. Patch: http://cvs.winehq.org/patch.py?id=30171 Old revision New revision Changes Path Added 1.1 +0 -0 appdb/help/maintainer.help Index: appdb/help/maintainer.help diff -u -p /dev/null appdb/help/maintainer.help:1.1 --- /dev/null 29 Nov 2006 22: 7: 6 -0000 +++ appdb/help/maintainer.help 29 Nov 2006 22: 7: 6 -0000 @@ -0,0 +1,21 @@ + + +<h3>Maintainers</h3> + +<p> +Information on what a maintainer is and why they are important to the appdb. +</p> + +<p> +Maintainers are privileged users who have the ability to administrate applications and versions. Maintainers typically use the +applications and versions they maintain on a daily or weekely basis and test them with each new version of Wine that is +released. They also respond to forum posts for their applications/versions and review and process testing results and +screenshots that users submit. Please see the <a href="./?sTopic=maintainer_guidelines" style="cursor: help">maintainer's guidelines</a> +for more information on the kinds of things a maintainer has stewardship over. +<p> +Maintainers are crucial to the usefulness of the AppDB as they ensure that information is kept up-to-date. With the large +number of applications and versions present in the AppDB today it would be a difficult task for the small number of AppDB +admins to try to perform this task. +<p> +See the AppDB <a href="./?sTopic=appdb_faq" style="cursor: help">FAQ</a> for the difference between a maintainer and a super +maintainer.

1 0

James Hawkins : msi: Add handling for the InstallODBC action.
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: d3bec325007ea60ae041ed17d750162e0cdb2f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3bec325007ea60ae041ed17d… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Nov 27 18:20:33 2006 -0800 msi: Add handling for the InstallODBC action. --- dlls/msi/Makefile.in | 1 + dlls/msi/action.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 1 deletions(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 2b27d29..a26892d 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = msi.dll IMPORTLIB = libmsi.$(IMPLIBEXT) IMPORTS = urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 kernel32 +DELAYIMPORTS = odbccp32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9303bcb..436b06c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -35,6 +35,7 @@ http://msdn.microsoft.com/library/defaul #include "winerror.h" #include "winreg.h" #include "winsvc.h" +#include "odbcinst.h" #include "wine/debug.h" #include "msidefs.h" #include "msipriv.h" @@ -4163,6 +4164,104 @@ static UINT ACTION_InstallServices( MSIP return rc; } +static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename ) +{ + MSIFILE *file; + + LIST_FOR_EACH_ENTRY(file, &package->files, MSIFILE, entry) + { + if (!lstrcmpW(file->File, filename)) + return file; + } + + return NULL; +} + +static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) +{ + MSIPACKAGE *package = (MSIPACKAGE*)param; + LPWSTR driver, driver_path, ptr; + WCHAR outpath[MAX_PATH]; + MSIFILE *driver_file, *setup_file; + LPCWSTR desc; + DWORD len, usage; + UINT r = ERROR_SUCCESS; + + static const WCHAR driver_fmt[] = { + 'D','r','i','v','e','r','=','%','s',0}; + static const WCHAR setup_fmt[] = { + 'S','e','t','u','p','=','%','s',0}; + static const WCHAR usage_fmt[] = { + 'F','i','l','e','U','s','a','g','e','=','1',0}; + + desc = MSI_RecordGetString(rec, 3); + + driver_file = msi_find_file(package, MSI_RecordGetString(rec, 4)); + setup_file = msi_find_file(package, MSI_RecordGetString(rec, 5)); + + if (!driver_file || !setup_file) + { + ERR("ODBC Driver entry not found!\n"); + return ERROR_FUNCTION_FAILED; + } + + len = lstrlenW(desc) + lstrlenW(driver_fmt) + lstrlenW(driver_file->FileName) + + lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName) + + lstrlenW(usage_fmt) + 1; + driver = msi_alloc(len * sizeof(WCHAR)); + if (!driver) + return ERROR_OUTOFMEMORY; + + ptr = driver; + lstrcpyW(ptr, desc); + ptr += lstrlenW(ptr) + 1; + + sprintfW(ptr, driver_fmt, driver_file->FileName); + ptr += lstrlenW(ptr) + 1; + + sprintfW(ptr, setup_fmt, setup_file->FileName); + ptr += lstrlenW(ptr) + 1; + + lstrcpyW(ptr, usage_fmt); + ptr += lstrlenW(ptr) + 1; + *ptr = '\0'; + + driver_path = strdupW(driver_file->TargetPath); + ptr = strrchrW(driver_path, '\\'); + if (ptr) *ptr = '\0'; + + if (!SQLInstallDriverExW(driver, driver_path, outpath, MAX_PATH, + NULL, ODBC_INSTALL_COMPLETE, &usage)) + { + ERR("Failed to install SQL driver!\n"); + r = ERROR_FUNCTION_FAILED; + } + + msi_free(driver); + msi_free(driver_path); + + return r; +} + +static UINT ACTION_InstallODBC( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','D','r','i','v','e','r',0 }; + + rc = MSI_DatabaseOpenViewW(package->db, query, &view); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords(view, NULL, ITERATE_InstallODBCDriver, package); + msiobj_release(&view->hdr); + + return rc; +} + static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) { @@ -4346,7 +4445,7 @@ static const struct _actions StandardAct { szMoveFiles, ACTION_MoveFiles }, { szMsiPublishAssemblies, ACTION_MsiPublishAssemblies }, { szMsiUnpublishAssemblies, ACTION_MsiUnpublishAssemblies }, - { szInstallODBC, NULL}, + { szInstallODBC, ACTION_InstallODBC }, { szInstallServices, ACTION_InstallServices }, { szPatchFiles, ACTION_PatchFiles }, { szProcessComponents, ACTION_ProcessComponents },

1 0

James Hawkins : msi: Don't fail if we can't remove an existing install file .
by Alexandre Julliard 29 Nov '06

29 Nov '06

Module: wine Branch: master Commit: 7125d3073d297f1b9a53d60958012ec59e3ca475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7125d3073d297f1b9a53d6095… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Nov 27 18:18:51 2006 -0800 msi: Don't fail if we can't remove an existing install file. --- dlls/msi/files.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 00f2a01..cf7baf4 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -355,8 +355,12 @@ static INT_PTR cabinet_notify(FDINOTIFIC NULL, CREATE_ALWAYS, attrs, NULL ); if ( handle == INVALID_HANDLE_VALUE ) { - ERR("failed to create %s (error %d)\n", - debugstr_w( f->TargetPath ), GetLastError() ); + if ( GetFileAttributesW( f->TargetPath ) != INVALID_FILE_ATTRIBUTES ) + f->state = msifs_installed; + else + ERR("failed to create %s (error %d)\n", + debugstr_w( f->TargetPath ), GetLastError() ); + return 0; }

1 0