December 2009 - Wine-Commits

Vincent Povirk : gdiplus: Add trace for values of new graphics and image objects.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: f8ca372459b2700dac452f3a3b06a7d6a14a5962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ca372459b2700dac452f3a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:09:45 2009 -0600 gdiplus: Add trace for values of new graphics and image objects. --- dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/image.c | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b1092b7..5ab544d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1162,6 +1162,8 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra list_init(&(*graphics)->containers); (*graphics)->contid = 0; + TRACE("<-- %p\n", *graphics); + return Ok; } @@ -1271,6 +1273,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(delete) DeleteMetaFile(hwmf); + TRACE("<-- %p\n", *metafile); + return Ok; err: diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3dbe4da..9858f33 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1282,6 +1282,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, } } + TRACE("<-- %p\n", *bitmap); + return Ok; } @@ -1976,6 +1978,8 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid (*image)->palette_size = 0; (*image)->palette_entries = NULL; + TRACE("<-- %p\n", *image); + return Ok; }

1 0

Vincent Povirk : ole32: Reread the stream entry after setting the size in StreamWriteAt.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: b3511ebb70072d8615d09db638e47e9f3d86fcfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3511ebb70072d8615d09db63… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Dec 19 14:20:02 2009 -0600 ole32: Reread the stream entry after setting the size in StreamWriteAt. In simple mode, StreamWriteAt would assume that StreamSetSize uses the size it asks for, but in some cases the size would be pushed above the small block limit. StreamWriteAt would then attempt to write using a small block chain, even though a big block chain was created. --- dlls/ole32/storage32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ef71e6f..629709a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2475,7 +2475,8 @@ static HRESULT StorageImpl_StreamWriteAt(StorageBaseImpl *base, DirRef index, if (FAILED(hr)) return hr; - data.size = newSize; + hr = StorageImpl_ReadDirEntry(This, index, &data); + if (FAILED(hr)) return hr; } if (data.size.QuadPart < LIMIT_TO_USE_SMALL_BLOCK)

1 0

Vincent Povirk : gdiplus: Implement GdipSetImageAttributesColorMatrix.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 0c9991c583a0694502121eefb2c91289a6719dc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9991c583a0694502121eefb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 17:42:18 2009 -0600 gdiplus: Implement GdipSetImageAttributesColorMatrix. --- dlls/gdiplus/gdiplus_private.h | 8 ++++++++ dlls/gdiplus/imageattributes.c | 27 ++++++++++++++++++++++----- dlls/gdiplus/tests/image.c | 18 +++++++++--------- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0ceeb6e..9a357c8 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -249,9 +249,17 @@ struct color_key{ ARGB high; }; +struct color_matrix{ + BOOL enabled; + ColorMatrixFlags flags; + ColorMatrix colormatrix; + ColorMatrix graymatrix; +}; + struct GpImageAttributes{ WrapMode wrap; struct color_key colorkeys[ColorAdjustTypeCount]; + struct color_matrix colormatrices[ColorAdjustTypeCount]; }; struct GpFont{ diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index a52c297..6bfd23e 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -89,15 +89,32 @@ GpStatus WINGDIPAPI GdipSetImageAttributesColorMatrix(GpImageAttributes *imageat ColorAdjustType type, BOOL enableFlag, GDIPCONST ColorMatrix* colorMatrix, GDIPCONST ColorMatrix* grayMatrix, ColorMatrixFlags flags) { - static int calls; + TRACE("(%p,%u,%i,%p,%p,%u)\n", imageattr, type, enableFlag, colorMatrix, + grayMatrix, flags); - if(!imageattr || !colorMatrix || !grayMatrix) + if(!imageattr || type >= ColorAdjustTypeCount || flags > ColorMatrixFlagsAltGray) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (enableFlag) + { + if (!colorMatrix) + return InvalidParameter; - return NotImplemented; + if (flags == ColorMatrixFlagsAltGray) + { + if (!grayMatrix) + return InvalidParameter; + + imageattr->colormatrices[type].graymatrix = *grayMatrix; + } + + imageattr->colormatrices[type].colormatrix = *colorMatrix; + imageattr->colormatrices[type].flags = flags; + } + + imageattr->colormatrices[type].enabled = enableFlag; + + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 14a4b1b..e090de9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1125,7 +1125,7 @@ static void test_colormatrix(void) stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, NULL, NULL, ColorMatrixFlagsDefault); @@ -1133,11 +1133,11 @@ static void test_colormatrix(void) stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsSkipGrays); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsAltGray); @@ -1145,29 +1145,29 @@ static void test_colormatrix(void) stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsAltGray); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, &graymatrix, 3); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeCount, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeAny, TRUE, &colormatrix, &graymatrix, ColorMatrixFlagsDefault); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, FALSE, NULL, NULL, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); /* Drawing a bitmap transforms the colors */ colormatrix = double_red; stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created linecaps.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: d5fffdd0c41b7b2364be849e3cb6e5b312752b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fffdd0c41b7b2364be849e3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:00:39 2009 -0600 gdiplus: Add traces for values of newly-created linecaps. --- dlls/gdiplus/customlinecap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 5658e69..e8ad968 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -57,6 +57,8 @@ GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, * sizeof(PointF)); memcpy((*to)->pathdata.Types, from->pathdata.Types, from->pathdata.Count); + TRACE("<-- %p\n", *to); + return Ok; } @@ -105,6 +107,8 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath (*customCap)->join = LineJoinMiter; (*customCap)->scale = 1.0; + TRACE("<-- %p\n", *customCap); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created font objects.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 2d8fb9ade3a766290cb8e797af69a272e5976554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8fb9ade3a766290cb8e797a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 15:04:56 2009 -0600 gdiplus: Add traces for values of newly-created font objects. --- dlls/gdiplus/font.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 89498bc..fda5428 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -158,6 +158,8 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->height = tmw->ntmSizeEM; (*font)->line_spacing = tmw->tmAscent + tmw->tmDescent + tmw->tmExternalLeading; + TRACE("<-- %p\n", *font); + return Ok; } @@ -205,6 +207,8 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, SelectObject(hdc, oldfont); DeleteObject(hfont); + TRACE("<-- %p\n", *font); + return Ok; } @@ -583,6 +587,8 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, *FontFamily = ffamily; + TRACE("<-- %p\n", ffamily); + return Ok; } @@ -611,6 +617,8 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** (*clonedFontFamily)->tmw = FontFamily->tmw; lstrcpyW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName); + TRACE("<-- %p\n", *clonedFontFamily); + return Ok; } @@ -845,6 +853,9 @@ GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection** fontCollecti (*fontCollection)->FontFamilies = NULL; (*fontCollection)->count = 0; (*fontCollection)->allocated = 0; + + TRACE("<-- %p\n", *fontCollection); + return Ok; }

1 0

Vincent Povirk : gdiplus: Add traces for values of newly-created brushes.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: f1417780033a008ad8ce72dbac931ed4c723bc0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1417780033a008ad8ce72dba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 14:58:28 2009 -0600 gdiplus: Add traces for values of newly-created brushes. --- dlls/gdiplus/brush.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3bce1d3..49e9e0e 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -174,6 +174,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return NotImplemented; } + TRACE("<-- %p\n", *clone); return Ok; } @@ -290,6 +291,7 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, AR (*brush)->forecol = forecol; (*brush)->backcol = backcol; (*brush)->hatchstyle = hatchstyle; + TRACE("<-- %p\n", *brush); } else { @@ -370,6 +372,8 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, (*line)->pblendpos = NULL; (*line)->pblendcount = 0; + TRACE("<-- %p\n", *line); + return Ok; } @@ -544,6 +548,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF* points, (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + TRACE("<-- %p\n", *grad); + return Ok; } @@ -634,6 +640,8 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, (*grad)->focus.X = 0.0; (*grad)->focus.Y = 0.0; + TRACE("<-- %p\n", *grad); + return Ok; } @@ -660,6 +668,8 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) (*sf)->color = color; (*sf)->bmp = ARGB2BMP(color); + TRACE("<-- %p\n", *sf); + return Ok; } @@ -854,6 +864,8 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GdipFree(dibits); GdipFree(buff); + TRACE("<-- %p\n", *texture); + return Ok; }

1 0

Frédéric Delanoy : mapi32: Add French translation .
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 5dbbe5a7f1ac1c250d0f084f28a517fb60fce2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbbe5a7f1ac1c250d0f084f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 18 23:23:49 2009 +0100 mapi32: Add French translation. --- dlls/mapi32/Fr.rc | 33 +++++++++++++++++++++++++++++++++ dlls/mapi32/Makefile.in | 1 + 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Fr.rc b/dlls/mapi32/Fr.rc new file mode 100644 index 0000000..ab14e4a --- /dev/null +++ b/dlls/mapi32/Fr.rc @@ -0,0 +1,33 @@ +/* +* MAPI32 French resources +* +* Copyright 2009 Frédéric Delanoy +* +* 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. +* +* 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. +* +* 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 +* +*/ + +#include "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "L'envoi de courriel a échoué car aucun client mail MAPI n'est installé." + IDS_SEND_MAIL, "Envoyer un courriel" +} diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 8a9233b..eecd69c 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Fr.rc \ Lt.rc \ version.rc

1 0

Alexandre Julliard : user32: Fix the string style check for comboboxes.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 8e1bd0c8931efe617586aef5a412d8e4e107685b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1bd0c8931efe617586aef5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:29:14 2009 +0100 user32: Fix the string style check for comboboxes. --- dlls/user32/msg16.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 5304a9d..b1cc938 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2039,9 +2039,13 @@ static LRESULT combo_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, wParam = (INT)(INT16)wParam; /* fall through */ case CB_ADDSTRING16: - if (GetWindowLongW( hwnd, GWL_STYLE ) & CBS_HASSTRINGS) lParam = (LPARAM)MapSL(lParam); + { + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + if ((style & CBS_HASSTRINGS) || !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE))) + lParam = (LPARAM)MapSL(lParam); msg -= msg16_offset; break; + } case CB_SETITEMHEIGHT16: case CB_GETITEMHEIGHT16: case CB_SETCURSEL16:

1 0

Alexandre Julliard : shell32: Use the module instance instead of that of the owner window for the about dialog .
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 29c0ecfd1ccaf831f39f12a6d6630ac94f1eca75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c0ecfd1ccaf831f39f12a6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:20:04 2009 +0100 shell32: Use the module instance instead of that of the owner window for the about dialog. --- dlls/shell32/shell32_main.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 91795b9..2d0f0b7 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1043,18 +1043,12 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, { ABOUT_INFO info; LOGFONTW logFont; - HRSRC hRes; - LPVOID template; BOOL bRet; static const WCHAR wszSHELL_ABOUT_MSGBOX[] = {'S','H','E','L','L','_','A','B','O','U','T','_','M','S','G','B','O','X',0}; TRACE("\n"); - if(!(hRes = FindResourceW(shell32_hInstance, wszSHELL_ABOUT_MSGBOX, (LPWSTR)RT_DIALOG))) - return FALSE; - if(!(template = LoadResource(shell32_hInstance, hRes))) - return FALSE; if (!hIcon) hIcon = LoadImageW( 0, (LPWSTR)IDI_WINLOGO, IMAGE_ICON, 48, 48, LR_SHARED ); info.szApp = szApp; info.szOtherStuff = szOtherStuff; @@ -1063,8 +1057,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &logFont, 0 ); info.hFont = CreateFontIndirectW( &logFont ); - bRet = DialogBoxIndirectParamW((HINSTANCE)GetWindowLongPtrW( hWnd, GWLP_HINSTANCE ), - template, hWnd, AboutDlgProc, (LPARAM)&info ); + bRet = DialogBoxParamW( shell32_hInstance, wszSHELL_ABOUT_MSGBOX, hWnd, AboutDlgProc, (LPARAM)&info ); DeleteObject(info.hFont); return bRet; }

1 0

Alexandre Julliard : setupx: Pass 0 as instance to InstallHinfSectionA.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: ff0d84d4a3c87e7ca99d7d75c5a63eb12b7684da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0d84d4a3c87e7ca99d7d75c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:19:33 2009 +0100 setupx: Pass 0 as instance to InstallHinfSectionA. --- dlls/setupx.dll16/setupx_main.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index de3a397..3c37e1e 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -70,8 +70,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) - /*********************************************************************** * SURegOpenKey (SETUPX.47) */ @@ -126,7 +124,7 @@ DWORD WINAPI suErrorToIds16( WORD w1, WORD w2 ) */ RETERR16 WINAPI InstallHinfSection16( HWND16 hwnd, HINSTANCE16 hinst, LPCSTR lpszCmdLine, INT16 nCmdShow) { - InstallHinfSectionA( HWND_32(hwnd), HINSTANCE_32(hinst), lpszCmdLine, nCmdShow ); + InstallHinfSectionA( HWND_32(hwnd), 0, lpszCmdLine, nCmdShow ); return OK; }

1 0