February 2015 - Wine-commits

Austin English : ktmw32: Add a stub for RollbackTransaction.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 5e8b613397fb4b3df4b02d13b6175b03c6a1f2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e8b613397fb4b3df4b02d13b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:36:30 2015 -0600 ktmw32: Add a stub for RollbackTransaction. --- dlls/ktmw32/ktmw32.spec | 2 +- dlls/ktmw32/ktmw32_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ktmw32/ktmw32.spec b/dlls/ktmw32/ktmw32.spec index 0d549bf..895e990 100644 --- a/dlls/ktmw32/ktmw32.spec +++ b/dlls/ktmw32/ktmw32.spec @@ -35,7 +35,7 @@ @ stub RenameTransactionManager @ stub RollbackComplete @ stub RollbackEnlistment -@ stub RollbackTransaction +@ stdcall RollbackTransaction(ptr) @ stub RollbackTransactionAsync @ stub RollforwardTransactionManager @ stub SetEnlistmentRecoveryInformation diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 328ddb5..35d1e85 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -49,3 +49,13 @@ HANDLE WINAPI CreateTransaction(LPSECURITY_ATTRIBUTES pattr, LPGUID pguid, DWORD return (HANDLE) 1; } + +/*********************************************************************** + * Rollback Transaction (ktmw32.@) + */ +BOOL WINAPI RollbackTransaction(HANDLE transaction) +{ + FIXME("stub: %p\n", transaction); + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; +}

1 0

Austin English : apphelp: Add a stub for SdbGetFirstChild.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: c9973679119310a9b81b31c5b92c506208098ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9973679119310a9b81b31c5b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:15:06 2015 -0600 apphelp: Add a stub for SdbGetFirstChild. --- dlls/apphelp/apphelp.c | 10 ++++++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index dd120a9..67c2139 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -34,6 +34,10 @@ typedef enum _PATH_TYPE { /* FIXME: don't know where to place that typedef */ typedef HANDLE PDB; typedef HANDLE HSDB; +typedef DWORD TAGID; + +/* FIXME: don't know where to place that define */ +#define TAGID_NULL 0x0 BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -96,3 +100,9 @@ PDB WINAPI SdbOpenDatabase(LPCWSTR path, PATH_TYPE type) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; } + +TAGID WINAPI SdbGetFirstChild(PDB pdb, TAGID parent) +{ + FIXME("stub: %p %d\n", pdb, parent); + return TAGID_NULL; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index d94c5fa..e826aba 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -62,7 +62,7 @@ @ stub SdbGetFileImageType @ stub SdbGetFileImageTypeEx @ stub SdbGetFileInfo -@ stub SdbGetFirstChild +@ stdcall SdbGetFirstChild(ptr long) @ stub SdbGetIndex @ stub SdbGetItemFromItemRef @ stub SdbGetLayerName

1 0

Austin English : apphelp: Add a stub for SdbCloseDatabase.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 3f9a4ac10c3d2f7c3ced9d37d14c41fa07a5641d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9a4ac10c3d2f7c3ced9d37d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:25:55 2015 -0600 apphelp: Add a stub for SdbCloseDatabase. --- dlls/apphelp/apphelp.c | 5 +++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 67c2139..64dcd87 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -106,3 +106,8 @@ TAGID WINAPI SdbGetFirstChild(PDB pdb, TAGID parent) FIXME("stub: %p %d\n", pdb, parent); return TAGID_NULL; } + +void WINAPI SdbCloseDatabase(PDB pdb) +{ + FIXME("stub: %p\n", pdb); +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index e826aba..a658e5c 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -22,7 +22,7 @@ @ stub SdbApphelpNotifyExSdbApphelpNotifyEx @ stub SdbBuildCompatEnvVariables @ stub SdbCloseApphelpInformation -@ stub SdbCloseDatabase +@ stdcall SdbCloseDatabase(ptr) @ stub SdbCloseDatabaseWrite @ stub SdbCloseLocalDatabase @ stub SdbCommitIndexes

1 0

Austin English : ntoskrnl.exe: Add ExfInterlockedRemoveHeadList stub.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: b39efd9ed73927e4e5538b0cb61bec17d341358a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39efd9ed73927e4e5538b0cb… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 12:55:25 2015 -0600 ntoskrnl.exe: Add ExfInterlockedRemoveHeadList stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 51ac2ca..cdc5305 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2031,3 +2031,17 @@ PLIST_ENTRY WINAPI ExInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK loc FIXME("(%p %p) stub\n", head, lock); return NULL; } + +/*********************************************************************** + * ExfInterlockedRemoveHeadList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( ExfInterlockedRemoveHeadList ) +PLIST_ENTRY WINAPI __regs_ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) +#else +PLIST_ENTRY WINAPI ExfInterlockedRemoveHeadList(PLIST_ENTRY head, PKSPIN_LOCK lock) +#endif +{ + FIXME("(%p %p) stub\n", head, lock); + return ExInterlockedRemoveHeadList( head, lock ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 79505ef..11d1c62 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -22,7 +22,7 @@ @ stub ExfInterlockedInsertTailList @ stub ExfInterlockedPopEntryList @ stub ExfInterlockedPushEntryList -@ stub ExfInterlockedRemoveHeadList +@ stdcall -norelay ExfInterlockedRemoveHeadList(ptr ptr) @ stub ExfReleasePushLock @ stub Exfi386InterlockedDecrementLong @ stub Exfi386InterlockedExchangeUlong

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetPixelSize().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: b270384dfb213b058cce72395d93909afe058c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b270384dfb213b058cce72395… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:56:58 2015 +0100 d2d1: Implement d2d_bitmap_GetPixelSize(). --- dlls/d2d1/bitmap.c | 9 ++++++--- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43c4881..b3ba570 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -88,10 +88,11 @@ static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2 static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *iface, D2D1_SIZE_U *pixel_size) { - FIXME("iface %p, pixel_size %p stub!\n", iface, pixel_size); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, pixel_size %p.\n", iface, pixel_size); - pixel_size->width = 0; - pixel_size->height = 0; + *pixel_size = bitmap->pixel_size; return pixel_size; } @@ -158,4 +159,6 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; + + bitmap->pixel_size = size; } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e3cb98a..039612b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -152,6 +152,8 @@ struct d2d_bitmap { ID2D1Bitmap ID2D1Bitmap_iface; LONG refcount; + + D2D1_SIZE_U pixel_size; }; void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetDpi().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 4b0f47cdbc7827b1a263156dba0cb88b57d84824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0f47cdbc7827b1a263156db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:56:59 2015 +0100 d2d1: Implement d2d_bitmap_GetDpi(). --- dlls/d2d1/bitmap.c | 16 +++++++++++++--- dlls/d2d1/d2d1_private.h | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b3ba570..fd7a7a7 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -107,10 +107,12 @@ static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitm static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y) { - FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); - *dpi_x = 96.0f; - *dpi_y = 96.0f; + *dpi_x = bitmap->dpi_x; + *dpi_y = bitmap->dpi_y; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, @@ -161,4 +163,12 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr bitmap->refcount = 1; bitmap->pixel_size = size; + bitmap->dpi_x = desc->dpiX; + bitmap->dpi_y = desc->dpiY; + + if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) + { + bitmap->dpi_x = 96.0f; + bitmap->dpi_y = 96.0f; + } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 039612b..0402c8d 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -154,6 +154,8 @@ struct d2d_bitmap LONG refcount; D2D1_SIZE_U pixel_size; + float dpi_x; + float dpi_y; }; void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_GetSize().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 7df055f17fdc3f5b7bdaafc5436cb21b6170d16f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df055f17fdc3f5b7bdaafc54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:57:00 2015 +0100 d2d1: Implement d2d_bitmap_GetSize(). --- dlls/d2d1/bitmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index fd7a7a7..e827e46 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -79,10 +79,12 @@ static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Fac static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0.0f; - size->height = 0.0f; + size->width = bitmap->pixel_size.width / (bitmap->dpi_x / 96.0f); + size->height = bitmap->pixel_size.height / (bitmap->dpi_y / 96.0f); return size; }

1 0

Ken Thomases : winemac: Raise full-screen windows in front of the status items in the Mac menu bar.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 71b9e022658af4068edd45788508d2a31169006b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b9e022658af4068edd45788… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 4 11:42:03 2015 -0600 winemac: Raise full-screen windows in front of the status items in the Mac menu bar. Status items are the things on the right end of the Mac menu bar, like the clock and volume widget. It turns out that they are displayed at a higher window level than everything else in the menu bar. For the case where the displays are not captured for a full-screen window, the window ends up at the same window level as the status items, and they would sometimes end up on top. They would draw over the full-screen window and could be clicked. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4688687..a937d5d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -791,7 +791,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if (captured) level = CGShieldingWindowLevel() + 1; /* Need +1 or we don't get mouse moves */ else - level = NSMainMenuWindowLevel + 1; + level = NSStatusWindowLevel + 1; if (self.floating) level++;

1 0

Mark Harmstone : include: Add standard effect GUIDs to dsound.h.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 258bb91fb070735c76cc4dc4739509ad55d5aabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=258bb91fb070735c76cc4dc47… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Wed Feb 4 21:54:45 2015 +0000 include: Add standard effect GUIDs to dsound.h. --- include/dsound.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index cd284aa..9dd9671 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -110,6 +110,22 @@ DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xDEF00003,0x9C6D,0x47ED,0xAA,0xF1,0x4D DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE); +DEFINE_GUID(GUID_DSFX_STANDARD_GARGLE, 0xDAFD8210,0x5711,0x4B91,0x9F,0xE3,0xF7,0x5B,0x7A,0xE2,0x79,0xBF); +DEFINE_GUID(GUID_DSFX_STANDARD_CHORUS, 0xEFE6629C,0x81F7,0x4281,0xBD,0x91,0xC9,0xD6,0x04,0xA9,0x5A,0xF6); +DEFINE_GUID(GUID_DSFX_STANDARD_FLANGER, 0xEFCA3D92,0xDFD8,0x4672,0xA6,0x03,0x74,0x20,0x89,0x4B,0xAD,0x98); +DEFINE_GUID(GUID_DSFX_STANDARD_ECHO, 0xEF3E932C,0xD40B,0x4F51,0x8C,0xCF,0x3F,0x98,0xF1,0xB2,0x9D,0x5D); +DEFINE_GUID(GUID_DSFX_STANDARD_DISTORTION, 0xEF114C90,0xCD1D,0x484E,0x96,0xE5,0x09,0xCF,0xAF,0x91,0x2A,0x21); +DEFINE_GUID(GUID_DSFX_STANDARD_COMPRESSOR, 0xEF011F79,0x4000,0x406D,0x87,0xAF,0xBF,0xFB,0x3F,0xC3,0x9D,0x57); +DEFINE_GUID(GUID_DSFX_STANDARD_PARAMEQ, 0x120CED89,0x3BF4,0x4173,0xA1,0x32,0x3C,0xB4,0x06,0xCF,0x32,0x31); +DEFINE_GUID(GUID_DSFX_STANDARD_I3DL2REVERB, 0xEF985E71,0xD5C7,0x42D4,0xBA,0x4D,0x2D,0x07,0x3E,0x2E,0x96,0xF4); +DEFINE_GUID(GUID_DSFX_WAVES_REVERB, 0x87FC0268,0x9A55,0x4360,0x95,0xAA,0x00,0x4A,0x1D,0x9D,0xE2,0x6C); +DEFINE_GUID(GUID_DSCFX_CLASS_AEC, 0xBF963D80,0xC559,0x11D0,0x8A,0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1); +DEFINE_GUID(GUID_DSCFX_MS_AEC, 0xCDEBB919,0x379A,0x488A,0x87,0x65,0xF5,0x3C,0xFD,0x36,0xDE,0x40); +DEFINE_GUID(GUID_DSCFX_SYSTEM_AEC, 0x1C22C56D,0x9879,0x4F5B,0xA3,0x89,0x27,0x99,0x6D,0xDC,0x28,0x10); +DEFINE_GUID(GUID_DSCFX_CLASS_NS, 0xE07F903F,0x62FD,0x4E60,0x8C,0xDD,0xDE,0xA7,0x23,0x66,0x65,0xB5); +DEFINE_GUID(GUID_DSCFX_MS_NS, 0x11C5C73B,0x66E9,0x4BA1,0xA0,0xBA,0xE8,0x14,0xC6,0xEE,0xD9,0x2D); +DEFINE_GUID(GUID_DSCFX_SYSTEM_NS, 0x5AB0882E,0x7274,0x4516,0x87,0x7D,0x4E,0xEE,0x99,0xBA,0x4F,0xD0); + #define _FACDS 0x878 #define MAKE_DSHRESULT(code) MAKE_HRESULT(1,_FACDS,code)

1 0

Stefan Dösinger : d3d11: Print UINT sdk_version with %u.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: e25a115b722ce4184cd1363070825aba285895c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25a115b722ce4184cd136307… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 5 10:03:06 2015 +0100 d3d11: Print UINT sdk_version with %u. --- dlls/d3d11/d3d11_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 87bdf4ef..6af801d 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -49,7 +49,7 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) { - FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %d, " + FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %u, " "device %p, feature_level %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, device, feature_level, context); return E_OUTOFMEMORY;

1 0