November 2013 - Wine-commits

Erich E. Hoover : server: Create directories with the specified security attributes.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: d2e216f462c2ccc57cac6c8e683aae2abd719916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e216f462c2ccc57cac6c8e6… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Nov 8 12:04:56 2013 -0700 server: Create directories with the specified security attributes. --- dlls/advapi32/tests/security.c | 5 ++--- server/fd.c | 2 +- server/file.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4de623d..fe31b5c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3081,9 +3081,8 @@ static void test_CreateDirectoryA(void) bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ok(bret, "GetAclInformation failed\n"); - todo_wine ok(acl_size.AceCount == 2, - "GetAclInformation returned unexpected entry count (%d != 2).\n", - acl_size.AceCount); + ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); if (acl_size.AceCount > 0) { bret = pGetAce(pDacl, 0, (VOID **)&ace); diff --git a/server/fd.c b/server/fd.c index 32b2a29..fa8874c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1768,7 +1768,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, /* create the directory if needed */ if ((options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) { - if (mkdir( name, 0777 ) == -1) + if (mkdir( name, *mode ) == -1) { if (errno != EEXIST || (flags & O_EXCL)) { diff --git a/server/file.c b/server/file.c index 94d3060..cceb8ad 100644 --- a/server/file.c +++ b/server/file.c @@ -218,6 +218,8 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si owner = token_get_user( current->process->token ); mode = sd_to_mode( sd, owner ); } + else if (options & FILE_DIRECTORY_FILE) + mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0555 : 0777; else mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666;

1 0

Frédéric Delanoy : Assorted spelling fixes.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 57d7f74d34f2ce0968af2eb14c7e866d6d7c39a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d7f74d34f2ce0968af2eb14… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:28 2013 +0100 Assorted spelling fixes. --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/header.c | 2 +- dlls/comctl32/propsheet.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- dlls/d3dx9_36/sprite.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/sql.y | 2 +- dlls/msi/table.c | 6 +++--- dlls/ntdll/printf.c | 4 ++-- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/classmoniker.c | 2 +- dlls/ole32/compositemoniker.c | 4 ++-- dlls/ole32/filemoniker.c | 2 +- dlls/ole32/itemmoniker.c | 2 +- dlls/ole32/moniker.c | 4 ++-- dlls/ole32/stg_prop.c | 4 ++-- dlls/oleaut32/typelib.c | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/urlmon/bindprot.c | 2 +- dlls/user32/nonclient.c | 6 +++--- dlls/wined3d/directx.c | 2 +- dlls/winhttp/request.c | 2 +- dlls/wininet/utility.c | 2 +- dlls/wintrust/register.c | 6 +++--- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/tgt_active.c | 4 ++-- tools/winedump/msmangle.c | 2 +- 28 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57d7f74d34f2ce0968af2…

1 0

Ken Thomases : winemac: Make macdrv_set_cocoa_window_frame() synchronous again.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 19862b4138f0a2b4584a46375bb69d8d65171f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19862b4138f0a2b4584a46375… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 14:01:29 2013 -0600 winemac: Make macdrv_set_cocoa_window_frame() synchronous again. It has a non-object pointer from the caller, so it can't allow the caller to continue until it's finished with it. Also, it discards events from the event queue and we don't want the caller to process them first. Fixes brokenness introduced by 784a9139. --- dlls/winemac.drv/cocoa_window.m | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 8b44fec..a29f20e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2085,7 +2085,7 @@ void macdrv_set_cocoa_window_frame(macdrv_window w, const CGRect* new_frame) { WineWindow* window = (WineWindow*)w; - OnMainThreadAsync(^{ + OnMainThread(^{ [window setFrameFromWine:NSRectFromCGRect(*new_frame)]; }); }

1 0

Vincent Povirk : mscoree: Fix runtime shutdown code.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 3a2e88534e8dbd3917e35b540b3df73982d2ed24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2e88534e8dbd3917e35b540… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 20 15:20:50 2013 -0600 mscoree: Fix runtime shutdown code. --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 9626662..b0a8b9d 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -254,7 +254,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) return; } - method = mono_class_get_method_from_name(klass, "Exit", 0); + method = mono_class_get_method_from_name(klass, "Exit", 1); if (!method) { ERR("Couldn't get method from class\n");

1 0

Ken Thomases : winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window 's bounds.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 682ed91017e6aa043feaf0c70a34118445e65d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=682ed91017e6aa043feaf0c70… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 20 15:35:37 2013 -0600 winemac: Defer attaching OpenGL context to a view which is zero-sized or outside its window's bounds. That fails with the dread "invalid drawable" message. --- dlls/winemac.drv/cocoa_opengl.m | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index b678cae..45799db 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -123,14 +123,15 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) context.needsUpdate = FALSE; if (view) { - __block BOOL windowHasDevice; + __block BOOL viewIsValidDrawable; macdrv_add_view_opengl_context(v, c); OnMainThread(^{ - windowHasDevice = [[view window] windowNumber] > 0; + viewIsValidDrawable = [[view window] windowNumber] > 0 && + !NSIsEmptyRect([view visibleRect]); }); - if (windowHasDevice) + if (viewIsValidDrawable) { [context setView:view]; [context setLatentView:nil];

1 0

Piotr Caban : include: Add IConfigAviMux definition.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 391bea5460a583af7ea4ad0ab9677541ab671c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=391bea5460a583af7ea4ad0ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:42:16 2013 +0100 include: Add IConfigAviMux definition. --- include/axextend.idl | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index 3610d81..a10be14 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -736,6 +736,27 @@ interface ICaptureGraphBuilder2 : IUnknown [ local, object, + uuid(5acd6aa0-f482-11ce-8b67-00aa00a3f1a6), + pointer_default(unique) +] +interface IConfigAviMux : IUnknown +{ + HRESULT SetMasterStream( + [in] LONG iStream); + + HRESULT GetMasterStream( + [out] LONG *pStream); + + HRESULT SetOutputCompatibilityIndex( + [in] BOOL fOldIndex); + + HRESULT GetOutputCompatibilityIndex( + [out] BOOL *pfOldIndex); +} + +[ + local, + object, uuid(9fd52741-176d-4b36-8f51-ca8f933223be), pointer_default(unique) ] @@ -746,7 +767,7 @@ interface IAMClockSlave : IUnknown HRESULT GetErrorTolerance( [out] DWORD *pdwTolerance); -}; +} typedef struct _AMCOPPSignature { BYTE Signature[256];

1 0

Piotr Caban : include: Add IConfigInterleaving definition.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 7365eafd367fb8636229e93ac0a45ba9f9c47e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7365eafd367fb8636229e93ac… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:42:33 2013 +0100 include: Add IConfigInterleaving definition. --- include/axextend.idl | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index a10be14..4523e4f 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -757,6 +757,36 @@ interface IConfigAviMux : IUnknown [ local, object, + uuid(bee3d220-157b-11d0-bd23-00a0c911ce86), + pointer_default(unique) +] +interface IConfigInterleaving : IUnknown +{ + typedef enum InterleavingMode { + INTERLEAVE_NONE, + INTERLEAVE_CAPTURE, + INTERLEAVE_FULL, + INTERLEAVE_NONE_BUFFERED + } InterleavingMode; + + HRESULT put_Mode( + [in] InterleavingMode mode); + + HRESULT get_Mode( + [out] InterleavingMode *pMode); + + HRESULT put_Interleaving( + [in] const REFERENCE_TIME *prtInterleave, + [in] const REFERENCE_TIME *prtPreroll); + + HRESULT get_Interleaving( + [out] REFERENCE_TIME *prtInterleave, + [out] REFERENCE_TIME *prtPreroll); +} + +[ + local, + object, uuid(9fd52741-176d-4b36-8f51-ca8f933223be), pointer_default(unique) ]

1 0

Piotr Caban : include: Add IPersistMediaPropertyBag definition.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 9ea983dcecec2ad8da01c72bbe869f131779f9ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea983dcecec2ad8da01c72bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:42:48 2013 +0100 include: Add IPersistMediaPropertyBag definition. --- include/axextend.idl | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/include/axextend.idl b/include/axextend.idl index 4523e4f..8c7d8dc 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1141,6 +1141,45 @@ interface IKsPropertySet : IUnknown cpp_quote("#endif /* _IKsPropertySet_ */") [ + local, + object, + uuid(6025a880-c0d5-11d0-bd4e-00a0c911ce86), + pointer_default(unique) +] +interface IMediaPropertyBag : IPropertyBag +{ + typedef IMediaPropertyBag *LPMEDIAPROPERTYBAG; + + HRESULT EnumProperty( + [in] ULONG iProperty, + [in, out] VARIANT *pvarPropertyName, + [in, out] VARIANT *pvarPropertyValue); +} + + +[ + local, + object, + uuid(5738e040-b67f-11d0-bd4d-00a0c911ce86), + pointer_default(unique) +] +interface IPersistMediaPropertyBag : IPersist +{ + HRESULT InitNew(void); + + HRESULT Load( + [in] IMediaPropertyBag *pPropBag, + [in] IErrorLog *pErrorLog); + + HRESULT Save( + [in] IMediaPropertyBag *pPropBag, + [in] BOOL fClearDirty, + [in] BOOL fSaveAllProperties); + + typedef IPersistMediaPropertyBag *LPPERSISTMEDIAPROPERTYBAG; +} + +[ object, uuid(36b73883-c2c8-11cf-8b46-00805f6cef60), pointer_default(unique)

1 0

Piotr Caban : qcap: Add AVI Mux filter stub.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: ed858386e5ff671c9f69925f9d4978caccbbe48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed858386e5ff671c9f69925f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 22:48:04 2013 +0100 qcap: Add AVI Mux filter stub. --- dlls/qcap/Makefile.in | 1 + dlls/qcap/avimux.c | 626 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qcap/qcap_main.c | 6 +- dlls/qcap/qcap_main.h | 6 +- 4 files changed, 633 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed858386e5ff671c9f699…

1 0

Frédéric Delanoy : oleaut32: Use BOOL type where appropriate.
by Alexandre Julliard 21 Nov '13

21 Nov '13

Module: wine Branch: master Commit: 128e4575e5126e6e79f537693b1dae10a684f7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128e4575e5126e6e79f537693… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 20 23:39:29 2013 +0100 oleaut32: Use BOOL type where appropriate. --- dlls/oleaut32/olepicture.c | 22 +++++++++++----------- dlls/oleaut32/tmarshal.c | 11 ++++------- dlls/oleaut32/typelib.c | 2 +- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2772a2f..5e81766 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1527,9 +1527,9 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) return hr; } -static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) +static BOOL serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLength) { - int iSuccess = 0; + BOOL success = FALSE; HDC hDC; BITMAPINFO * pInfoBitmap; int iNumPaletteEntries; @@ -1585,17 +1585,17 @@ static int serializeBMP(HBITMAP hBitmap, void ** ppBuffer, unsigned int * pLengt sizeof(BITMAPINFOHEADER) + iNumPaletteEntries * sizeof(RGBQUAD), pPixelData, pInfoBitmap->bmiHeader.biSizeImage); - iSuccess = 1; + success = TRUE; HeapFree(GetProcessHeap(), 0, pPixelData); HeapFree(GetProcessHeap(), 0, pInfoBitmap); - return iSuccess; + return success; } -static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) +static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) { ICONINFO infoIcon; - int iSuccess = 0; + BOOL success = FALSE; *ppBuffer = NULL; *pLength = 0; if (GetIconInfo(hIcon, &infoIcon)) { @@ -1717,7 +1717,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) /* Write out everything produced so far to the stream */ *ppBuffer = pIconData; *pLength = iDataSize; - iSuccess = 1; + success = TRUE; } else { /* printf("ERROR: unable to get bitmap information via GetDIBits() (error %u)\n", @@ -1740,7 +1740,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) printf("ERROR: Unable to get icon information (error %u)\n", GetLastError()); } - return iSuccess; + return success; } static HRESULT WINAPI OLEPictureImpl_Save( @@ -1751,7 +1751,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( unsigned int iDataSize; DWORD header[2]; ULONG dummy; - int iSerializeResult = 0; + BOOL serializeResult = FALSE; OLEPictureImpl *This = impl_from_IPersistStream(iface); TRACE("%p %p %d\n", This, pStm, fClearDirty); @@ -1785,7 +1785,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: - iSerializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); + serializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize); break; case BITMAP_FORMAT_JPEG: FIXME("(%p,%p,%d), PICTYPE_BITMAP (format JPEG) not implemented!\n",This,pStm,fClearDirty); @@ -1801,7 +1801,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( break; } - if (!iSerializeResult) + if (!serializeResult) { hResult = E_FAIL; break; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 3856f32..0dec7e7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -647,14 +647,11 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { } /* Whether we pass this type by reference or by value */ -static int +static BOOL _passbyref(const TYPEDESC *td, ITypeInfo *tinfo) { - if (td->vt == VT_USERDEFINED || - td->vt == VT_VARIANT || - td->vt == VT_PTR) - return 1; - - return 0; + return (td->vt == VT_USERDEFINED || + td->vt == VT_VARIANT || + td->vt == VT_PTR); } static HRESULT diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0dd3f64..1ebc38b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3137,7 +3137,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Read in NE header */ nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); - if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0; + if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE; resTabSize = nehd.ne_restab - nehd.ne_rsrctab; if ( !resTabSize )

1 0