October 2017 - Wine-commits

Fabian Maurer : wineboot: In ProcessRunKeys use correct parentheses in condition.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 8fc3f3437c260db23ddff453f9a9d5f79564b24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc3f3437c260db23ddff453f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 24 20:05:52 2017 +0200 wineboot: In ProcessRunKeys use correct parentheses in condition. Spotted by David Binderman. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index ee5b8d4..2a65b9e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -682,7 +682,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, return TRUE; if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, - NULL, &hkRun, &dispos ) != ERROR_SUCCESS)) + NULL, &hkRun, &dispos )) != ERROR_SUCCESS) { RegCloseKey( hkWin ); return TRUE;

1 0

Piotr Caban : user32: Don' t do the painting if combobox is not visible in CBPaintText.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 8159af76b4d01c2bd9bc83fb0887ed98bfc6c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8159af76b4d01c2bd9bc83fb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 24 17:59:38 2017 +0200 user32: Don't do the painting if combobox is not visible in CBPaintText. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/tests/msg.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 149a495..c43d726 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -733,7 +733,7 @@ static void CBPaintText( if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); } - else /* paint text field ourselves */ + else if( IsWindowVisible( lphc->self )) /* paint text field ourselves */ { HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self); UINT itemState = ODS_COMBOBOXEDIT; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1b4f6fa..10f4fbd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6613,6 +6613,18 @@ static const struct message SetCurSelComboSeq[] = { 0 } }; +static const struct message SetCurSelComboSeq2[] = +{ + { CB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_SETTOPINDEX, sent|wparam|lparam, 0, 0 }, + { LB_GETCURSEL, sent|wparam|lparam, 0, 0 }, + { LB_GETTEXTLEN, sent|wparam|lparam, 0, 0 }, + { LB_GETTEXTLEN, sent|wparam|lparam|optional, 0, 0 }, /* TODO: it's sent on all Windows versions */ + { LB_GETTEXT, sent|wparam, 0 }, + { 0 } +}; + static const struct message WmKeyDownComboSeq[] = { { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, @@ -6939,6 +6951,13 @@ static void test_combobox_messages(void) log_all_parent_messages--; ok_sequence(SetCurSelComboSeq, "CB_SETCURSEL on a ComboBox", FALSE); + ShowWindow(combo, SW_HIDE); + flush_sequence(); + log_all_parent_messages++; + SendMessageA(combo, CB_SETCURSEL, 0, 0); + log_all_parent_messages--; + ok_sequence(SetCurSelComboSeq2, "CB_SETCURSEL on a ComboBox", FALSE); + DestroyWindow(combo); DestroyWindow(parent); }

1 0

Vijay Kiran Kamuju : msvcp100: Add time_get::do_get and time_get:: get functions.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: f6f0be8f2d60d48bc2d12032fb78a66f6f120353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f0be8f2d60d48bc2d12032f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 24 18:41:23 2017 +0200 msvcp100: Add time_get::do_get and time_get::get functions. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 8 ++++---- dlls/msvcp110/msvcp110.spec | 10 +++++----- dlls/msvcp120/msvcp120.spec | 10 +++++----- dlls/msvcp120_app/msvcp120_app.spec | 10 +++++----- dlls/msvcp140/msvcp140.spec | 10 +++++----- dlls/msvcp90/locale.c | 36 +++++++++++++++++++++++++++++++++++- 6 files changed, 59 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6f0be8f2d60d48bc2d12…

1 0

Nikolay Sivov : gdiplus: Implement GdipSetImageAttributesNoOp.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: ab31b59f45affe558b37651d3a00c0d8923f2e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab31b59f45affe558b37651d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 24 13:56:38 2017 +0300 gdiplus: Implement GdipSetImageAttributesNoOp. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 7 +++ dlls/gdiplus/graphics.c | 5 ++ dlls/gdiplus/imageattributes.c | 11 ++-- dlls/gdiplus/tests/image.c | 131 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 148 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ca2c022..76e5b9b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -481,6 +481,12 @@ struct color_remap_table{ ColorMap *colormap; }; +enum imageattr_noop{ + IMAGEATTR_NOOP_UNDEFINED, + IMAGEATTR_NOOP_SET, + IMAGEATTR_NOOP_CLEAR, +}; + struct GpImageAttributes{ WrapMode wrap; ARGB outside_color; @@ -490,6 +496,7 @@ struct GpImageAttributes{ struct color_remap_table colorremaptables[ColorAdjustTypeCount]; BOOL gamma_enabled[ColorAdjustTypeCount]; REAL gamma[ColorAdjustTypeCount]; + enum imageattr_noop noop[ColorAdjustTypeCount]; }; struct GpFont{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0207385..06fb89e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -676,6 +676,11 @@ PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d UINT x, y; INT i; + if ((attributes->noop[type] == IMAGEATTR_NOOP_UNDEFINED && + attributes->noop[ColorAdjustTypeDefault] == IMAGEATTR_NOOP_SET) || + (attributes->noop[type] == IMAGEATTR_NOOP_SET)) + return fmt; + if (attributes->colorkeys[type].enabled || attributes->colorkeys[ColorAdjustTypeDefault].enabled) { diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 2050706..ab197a4 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -218,14 +218,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr, GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr, ColorAdjustType type, BOOL enableFlag) { - static int calls; - TRACE("(%p,%u,%i)\n", imageAttr, type, enableFlag); - if(!(calls++)) - FIXME("not implemented\n"); + if (type >= ColorAdjustTypeCount) + return InvalidParameter; - return NotImplemented; + imageAttr->noop[type] = enableFlag ? IMAGEATTR_NOOP_SET : IMAGEATTR_NOOP_CLEAR; + + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes *imageAttr, @@ -332,6 +332,7 @@ GpStatus WINGDIPAPI GdipResetImageAttributes(GpImageAttributes *imageAttr, GdipSetImageAttributesColorKeys(imageAttr, type, FALSE, 0, 0); GdipSetImageAttributesRemapTable(imageAttr, type, FALSE, 0, NULL); GdipSetImageAttributesGamma(imageAttr, type, FALSE, 0.0); + imageAttr->noop[type] = IMAGEATTR_NOOP_UNDEFINED; return Ok; } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 82afc74..0b444ef 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2374,10 +2374,44 @@ static void test_colormatrix(void) expect(Ok, stat); ok(color_match(0xeeff40cc, color, 3), "expected 0xeeff40cc, got 0x%08x\n", color); + /* Toggle NoOp */ + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, FALSE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfefe40cc, color, 3), "expected 0xfefe40cc, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); expect(Ok, stat); - stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, FALSE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, UnitPixel, imageattr, NULL, NULL); expect(Ok, stat); @@ -2385,6 +2419,101 @@ static void test_colormatrix(void) expect(Ok, stat); ok(color_match(0xff40ccee, color, 1), "Expected ff40ccee, got %.8x\n", color); + /* Disable adjustment, toggle NoOp */ + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + FALSE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, FALSE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + /* Reset with NoOp on, enable adjustment. */ + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08x\n", color); + + /* Now inhibit specific category. */ + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeDefault); + expect(Ok, stat); + + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeBitmap, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfffe41cc, color, 3), "expected 0xfffe41cc, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeBitmap, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeBitmap, FALSE); + expect(Ok, stat); + + stat = GdipSetImageAttributesNoOp(imageattr, ColorAdjustTypeDefault, TRUE); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xfff24ace, color, 3), "expected 0xfff24ace, got 0x%08x\n", color); + + stat = GdipResetImageAttributes(imageattr, ColorAdjustTypeBitmap); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage *)bitmap1, 0, 0, 1, 1, 0, 0, 1, 1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xff40ccee, color, 3), "expected 0xff40ccee, got 0x%08x\n", color); + GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1); GdipDisposeImage((GpImage*)bitmap2);

1 0

Andrey Gusev : gdiplus: Fix misplaced parentheses.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: ef5a3ffe51f7029e1d09a07e95707f19839c26c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5a3ffe51f7029e1d09a07e9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Oct 24 13:33:27 2017 +0300 gdiplus: Fix misplaced parentheses. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 91e18a5..e40487a 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2001,14 +2001,14 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d if (pendata->PenDataFlags & PenDataMiterLimit) { - if ((status = GdipSetPenMiterLimit(pen, *(REAL *)((BYTE *)pendata + offset)) != Ok)) + if ((status = GdipSetPenMiterLimit(pen, *(REAL *)((BYTE *)pendata + offset))) != Ok) goto penfailed; offset += sizeof(REAL); } if (pendata->PenDataFlags & PenDataLineStyle) { - if ((status = GdipSetPenDashStyle(pen, *(DWORD *)((BYTE *)pendata + offset)) != Ok)) + if ((status = GdipSetPenDashStyle(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) goto penfailed; offset += sizeof(DWORD); }

1 0

Alex Henrie : vbscript/tests: Try calling GetObject again if it fails the first time.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 8d8ebc964152ef0158fabea5c896ee5a0d93b400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8ebc964152ef0158fabea5c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 24 15:15:35 2017 +0100 vbscript/tests: Try calling GetObject again if it fails the first time. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 002f12f..1c72ed2 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -50,6 +50,8 @@ extern const CLSID CLSID_VBScript; +#define VB_E_ACCESS_DENIED 0x800a0046 + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -988,6 +990,8 @@ static void test_GetObject(void) SET_EXPECT(SetSite); SET_EXPECT(reportSuccess); hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); + if(broken(hres == VB_E_ACCESS_DENIED)) /* 64-bit win8 fails on the first try */ + hres = parse_script_ae(parser, "Call GetObject(\"clsid:" TESTOBJINST_CLSID "\").reportSuccess()"); if(hres == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) { /* Workaround for broken win2k */ win_skip("got unexpected error %08x\n", hres); CLEAR_CALLED(QI_IObjectWithSite);

1 0

Fabian Maurer : dx8vb: Add DirectX8 coclass and IDirectX8 interface.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 6afba6c657a68cf3bff6358eb70bee3daa53d59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afba6c657a68cf3bff6358eb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 23 19:40:46 2017 +0200 dx8vb: Add DirectX8 coclass and IDirectX8 interface. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/dx8vb.idl | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/dx8vb/dx8vb.idl b/dlls/dx8vb/dx8vb.idl index ecb0d48..8f4b93f 100644 --- a/dlls/dx8vb/dx8vb.idl +++ b/dlls/dx8vb/dx8vb.idl @@ -37,6 +37,26 @@ interface D3DXSkinMesh; interface D3DXSprite; interface D3DXRenderToSurface; interface Direct3DBaseTexture8; +interface DirectSound8; +interface DirectSoundCapture8; +interface DirectSoundEnum8; +interface DirectSoundEnum8; +interface DirectInput8; +interface DirectMusicLoader8; +interface DirectMusicComposer8; +interface DirectMusicPerformance8; +interface DirectXEvent8; +interface DirectPlayVoiceClient8; +interface DirectPlayVoiceServer8; +interface DirectPlayVoiceTest8; +interface DirectXFile; +interface DirectPlay8Peer; +interface DirectPlay8Server; +interface DirectPlay8Client; +interface DirectPlay8Address; +interface Direct3D8; +interface DirectPlay8LobbyClient; +interface DirectPlay8LobbiedApplication; typedef enum { D3DXIFF_BMP = 0, @@ -702,6 +722,87 @@ interface ID3DX8 : IUnknown { }; [ + object, + uuid(e7ff1301-96a5-11d3-ac85-00c04fc2c602), + helpstring("DirectX8 root object functions"), + local +] +interface IDirectX8 : IUnknown { + HRESULT DirectSoundCreate( + [in] BSTR guid, + [out, retval] DirectSound8 **ret + ); + HRESULT DirectSoundCaptureCreate( + [in] BSTR guid, + [out, retval] DirectSoundCapture8 **ret + ); + HRESULT GetDSEnum( + [out, retval] DirectSoundEnum8 **ret + ); + HRESULT GetDSCaptureEnum( + [out, retval] DirectSoundEnum8 **ret + ); + HRESULT DirectInputCreate( + [out, retval] DirectInput8 **ret + ); + HRESULT DirectMusicLoaderCreate( + [out, retval] DirectMusicLoader8 **ret + ); + HRESULT DirectMusicComposerCreate( + [out, retval] DirectMusicComposer8 **ret + ); + HRESULT DirectMusicPerformanceCreate( + [out, retval] DirectMusicPerformance8 **ret + ); + HRESULT CreateEvent( + [in] DirectXEvent8 *event, + [out, retval] LONG *h + ); + HRESULT SetEvent( + [in] LONG eventid + ); + HRESULT DestroyEvent( + [in] LONG eventid + ); + HRESULT CreateNewGuid( + [out, retval] BSTR *retGuid + ); + HRESULT DirectPlayVoiceClientCreate( + [out, retval] DirectPlayVoiceClient8 **ret + ); + HRESULT DirectPlayVoiceServerCreate( + [out, retval] DirectPlayVoiceServer8 **ret + ); + HRESULT DirectPlayVoiceTestCreate( + [out, retval] DirectPlayVoiceTest8 **ret + ); + HRESULT DirectXFileCreate( + [out, retval] DirectXFile **ret + ); + HRESULT DirectPlayPeerCreate( + [out, retval] DirectPlay8Peer **ret + ); + HRESULT DirectPlayServerCreate( + [out, retval] DirectPlay8Server **ret + ); + HRESULT DirectPlayClientCreate( + [out, retval] DirectPlay8Client **ret + ); + HRESULT DirectPlayAddressCreate( + [out, retval] DirectPlay8Address **ret + ); + HRESULT Direct3DCreate( + [out, retval] Direct3D8 **ret + ); + HRESULT DirectPlayLobbyClientCreate( + [out, retval] DirectPlay8LobbyClient **ret + ); + HRESULT DirectPlayLobbiedApplicationCreate( + [out, retval] DirectPlay8LobbiedApplication **ret + ); +}; + +[ uuid(58356c5d-0bfd-48ed-93c5-f4520b6233de), helpstring("D3DX8"), threading(both), @@ -709,3 +810,12 @@ interface ID3DX8 : IUnknown { vi_progid("DIRECT.D3DX8.0") ] coclass D3DX8 { interface ID3DX8; }; + +[ + uuid(e7ff1300-96a5-11d3-ac85-00c04fc2c602), + helpstring("DirectX8"), + threading(both), + progid("DIRECT.DirectX8.0"), + vi_progid("DIRECT.DirectX8.0") +] +coclass DirectX8 { interface IDirectX8; };

1 0

Fabian Maurer : dx8vb: Add D3DX8 coclass and ID3DX8 interface.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: ca4e82a5a92eb9e55b502e8338b5b600b31624ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4e82a5a92eb9e55b502e833… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 23 19:40:45 2017 +0200 dx8vb: Add D3DX8 coclass and ID3DX8 interface. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/dx8vb/Makefile.in | 2 + dlls/dx8vb/dx8vb.idl | 711 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 715 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca4e82a5a92eb9e55b502…

1 0

Fabian Maurer : dx8vb: Add COM classfactory.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 9bf4cd8325c43c600a297b3b15d0b246bd79f5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf4cd8325c43c600a297b3b1… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 23 19:40:44 2017 +0200 dx8vb: Add COM classfactory. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dx8vb/Makefile.in | 1 + dlls/dx8vb/dx8vb.spec | 8 +-- dlls/dx8vb/main.c | 153 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+), 4 deletions(-) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in index ce3237c..d9f93f9 100644 --- a/dlls/dx8vb/Makefile.in +++ b/dlls/dx8vb/Makefile.in @@ -1,4 +1,5 @@ MODULE = dx8vb.dll +IMPORTS = uuid ole32 C_SRCS = \ main.c diff --git a/dlls/dx8vb/dx8vb.spec b/dlls/dx8vb/dx8vb.spec index 973d4b3..bb7c083 100644 --- a/dlls/dx8vb/dx8vb.spec +++ b/dlls/dx8vb/dx8vb.spec @@ -133,7 +133,7 @@ @ stub D3DXMeshIndexBuffer8SetData @ stub D3DXMeshIndexBuffer8GetData @ stub DXCopyMemory -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c index 0b60e34..aa6b943 100644 --- a/dlls/dx8vb/main.c +++ b/dlls/dx8vb/main.c @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "config.h" + #include <stdarg.h> #include <string.h> @@ -24,10 +28,17 @@ #include "winuser.h" #include "winreg.h" +#include "ole2.h" +#include "rpcproxy.h" + +#include "unknwn.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dx8vb); +static HINSTANCE instance_dx8vb; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); @@ -38,8 +49,150 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(instance); + instance_dx8vb = instance; break; } return TRUE; } + +typedef struct { + IClassFactory IClassFactory_iface; + + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **ppobj); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + +struct object_creation_info +{ + const CLSID *clsid; + HRESULT (*pfnCreateInstance)(IUnknown *unk_outer, void **ppobj); +}; + +static const struct object_creation_info object_creation[] = +{ + { &GUID_NULL, 0 }, +}; + +static HRESULT WINAPI classfactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = &This->IClassFactory_iface; + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI classfactory_AddRef(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI classfactory_Release(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI classfactory_CreateInstance(IClassFactory *iface, IUnknown *outer_unk, REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + HRESULT hres; + IUnknown *unk; + + TRACE("(%p)->(%p,%s,%p)\n", This, outer_unk, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + hres = This->pfnCreateInstance(outer_unk, (void **) &unk); + if (SUCCEEDED(hres)) + { + hres = IUnknown_QueryInterface(unk, riid, ppobj); + IUnknown_Release(unk); + } + return hres; +} + +static HRESULT WINAPI classfactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d), stub!\n", This, dolock); + return S_OK; +} + +static const IClassFactoryVtbl classfactory_Vtbl = +{ + classfactory_QueryInterface, + classfactory_AddRef, + classfactory_Release, + classfactory_CreateInstance, + classfactory_LockServer +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + unsigned int i; + IClassFactoryImpl *factory; + + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (!IsEqualGUID(&IID_IClassFactory, riid) + && !IsEqualGUID( &IID_IUnknown, riid)) + return E_NOINTERFACE; + + for (i = 0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + { + if (IsEqualGUID(object_creation[i].clsid, rclsid)) + break; + } + + if (i == sizeof(object_creation)/sizeof(object_creation[0])) + { + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); + if (factory == NULL) + return E_OUTOFMEMORY; + + factory->IClassFactory_iface.lpVtbl = &classfactory_Vtbl; + factory->ref = 1; + + factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; + + *ppv = &factory->IClassFactory_iface; + return S_OK; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources(instance_dx8vb); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources(instance_dx8vb); +}

1 0

Piotr Caban : msi: Improve installation with no argument of already installed product.
by Alexandre Julliard 24 Oct '17

24 Oct '17

Module: wine Branch: master Commit: 808f3158bbcf229d6eb935a7afe7291e9152ce1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=808f3158bbcf229d6eb935a7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 20 22:18:41 2017 +0200 msi: Improve installation with no argument of already installed product. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 61 +++++++++++++++++++++++------------------------- dlls/msi/msipriv.h | 1 - dlls/msi/tests/package.c | 4 ++-- 3 files changed, 31 insertions(+), 35 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 217d1dc..2f065da 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1740,7 +1740,7 @@ static BOOL process_overrides( MSIPACKAGE *package, int level ) ret |= process_state_property( package, level, szReinstall, INSTALLSTATE_UNKNOWN ); ret |= process_state_property( package, level, szAdvertise, INSTALLSTATE_ADVERTISED ); - if (ret && !package->full_reinstall) + if (ret) msi_set_property( package->db, szPreselected, szOne, -1 ); return ret; @@ -1795,7 +1795,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) level = msi_get_property_int(package->db, szInstallLevel, 1); - if (!msi_get_property_int( package->db, szPreselected, 0 )) + if (msi_get_property_int( package->db, szPreselected, 0 )) { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { @@ -1803,24 +1803,18 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) { - if (feature->Attributes & msidbFeatureAttributesFavorSource) - { - feature->Action = INSTALLSTATE_SOURCE; - feature->ActionRequest = INSTALLSTATE_SOURCE; - } - else if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) + if (feature->Installed == INSTALLSTATE_ABSENT) { - feature->Action = INSTALLSTATE_ADVERTISED; - feature->ActionRequest = INSTALLSTATE_ADVERTISED; + feature->Action = INSTALLSTATE_UNKNOWN; + feature->ActionRequest = INSTALLSTATE_UNKNOWN; } else { - feature->Action = INSTALLSTATE_LOCAL; - feature->ActionRequest = INSTALLSTATE_LOCAL; + feature->Action = feature->Installed; + feature->ActionRequest = feature->Installed; } } } - /* disable child features of unselected parent or follow parent */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { if (feature->Feature_Parent) continue; @@ -1828,7 +1822,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) follow_parent( feature ); } } - else /* preselected */ + else if (!msi_get_property_int( package->db, szInstalled, 0 )) { LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { @@ -1836,18 +1830,24 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) if (feature->ActionRequest == INSTALLSTATE_UNKNOWN) { - if (feature->Installed == INSTALLSTATE_ABSENT) + if (feature->Attributes & msidbFeatureAttributesFavorSource) { - feature->Action = INSTALLSTATE_UNKNOWN; - feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_SOURCE; + feature->ActionRequest = INSTALLSTATE_SOURCE; + } + else if (feature->Attributes & msidbFeatureAttributesFavorAdvertise) + { + feature->Action = INSTALLSTATE_ADVERTISED; + feature->ActionRequest = INSTALLSTATE_ADVERTISED; } else { - feature->Action = feature->Installed; - feature->ActionRequest = feature->Installed; + feature->Action = INSTALLSTATE_LOCAL; + feature->ActionRequest = INSTALLSTATE_LOCAL; } } } + /* disable child features of unselected parent or follow parent */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { if (feature->Feature_Parent) continue; @@ -1903,6 +1903,14 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) else component->hasLocalFeature = 1; break; + case INSTALLSTATE_UNKNOWN: + if (feature->Installed == INSTALLSTATE_ADVERTISED) + component->hasAdvertisedFeature = 1; + if (feature->Installed == INSTALLSTATE_SOURCE) + component->hasSourceFeature = 1; + if (feature->Installed == INSTALLSTATE_LOCAL) + component->hasLocalFeature = 1; + break; default: break; } @@ -7965,7 +7973,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, { static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; - WCHAR *reinstall, *remove, *patch, *productcode, *action; + WCHAR *reinstall = NULL, *productcode, *action; UINT rc; DWORD len = 0; @@ -8012,15 +8020,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_apply_transforms( package ); msi_apply_patches( package ); - patch = msi_dup_property( package->db, szPatch ); - remove = msi_dup_property( package->db, szRemove ); - reinstall = msi_dup_property( package->db, szReinstall ); - if (msi_get_property_int( package->db, szInstalled, 0 ) && !remove && !reinstall && !patch) - { - TRACE("setting REINSTALL property to ALL\n"); - msi_set_property( package->db, szReinstall, szAll, -1 ); - package->full_reinstall = 1; - } if (msi_get_property( package->db, szAction, NULL, &len )) msi_set_property( package->db, szAction, szINSTALL, -1 ); action = msi_dup_property( package->db, szAction ); @@ -8067,14 +8066,12 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* finish up running custom actions */ ACTION_FinishCustomActions(package); - if (package->need_rollback && !reinstall) + if (package->need_rollback && !(reinstall = msi_dup_property( package->db, szReinstall ))) { WARN("installation failed, running rollback script\n"); execute_script( package, SCRIPT_ROLLBACK ); } msi_free( reinstall ); - msi_free( remove ); - msi_free( patch ); msi_free( action ); if (rc == ERROR_SUCCESS && package->need_reboot_at_end) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3f7387b..25c346b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -445,7 +445,6 @@ typedef struct tagMSIPACKAGE unsigned char need_reboot_at_end : 1; unsigned char need_reboot_now : 1; unsigned char need_rollback : 1; - unsigned char full_reinstall : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 0dafd7c..ab3bb15 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3576,7 +3576,7 @@ static void test_states(void) test_component_states( __LINE__, hpkg, "phi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "chi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "psi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); - test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, TRUE ); + test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); MsiCloseHandle(hpkg); @@ -3652,7 +3652,7 @@ static void test_states(void) test_component_states( __LINE__, hpkg, "phi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "chi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "psi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); - test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, TRUE ); + test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); MsiCloseHandle(hpkg);

1 0