July 2011 - Wine-commits - list.winehq.org

Andrew Eikum : winmm: Close ACM stream when closing wave device.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 2a58273fcdfffc773ce02fb06ca3fcaad5eca1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a58273fcdfffc773ce02fb06… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 18 11:19:33 2011 -0500 winmm: Close ACM stream when closing wave device. --- dlls/winmm/waveform.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 48efb0f..5121bb7 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1104,6 +1104,11 @@ static HRESULT WINMM_CloseDevice(WINMM_Device *device) device->stopped = TRUE; } + if(device->acm_handle){ + acmStreamClose(device->acm_handle, 0); + device->acm_handle = NULL; + } + IMMDevice_Release(device->device); device->device = NULL;

1 0

Andrew Eikum : winmm: Perform Open and Close callbacks from client thread.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 2754c750922aba74bacabc0e7723ce563059e11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2754c750922aba74bacabc0e7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 18 11:19:35 2011 -0500 winmm: Perform Open and Close callbacks from client thread. --- dlls/winmm/tests/wave.c | 5 +++ dlls/winmm/waveform.c | 64 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 5bf7753..921216b 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -37,6 +37,8 @@ #include "winmm_test.h" +static DWORD g_tid; + static void test_multiple_waveopens(void) { HWAVEOUT handle1, handle2; @@ -559,6 +561,8 @@ static void CALLBACK callback_func(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance, DWORD dwParam1, DWORD dwParam2) { + if(uMsg == WOM_OPEN || uMsg == WOM_CLOSE) + ok(GetCurrentThreadId() == g_tid, "Got different thread ID\n"); SetEvent((HANDLE)dwInstance); } @@ -648,6 +652,7 @@ static void wave_out_test_deviceOut(int device, double duration, return; } wout=NULL; + g_tid = GetCurrentThreadId(); rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags); /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ /* It is acceptable to fail on formats that are not specified to work */ diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 5121bb7..a06d12f 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -998,8 +998,6 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) LeaveCriticalSection(&device->lock); - WINMM_NotifyClient(&cb_info, WOM_OPEN, 0, 0); - return MMSYSERR_NOERROR; error: @@ -1069,8 +1067,6 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) LeaveCriticalSection(&device->lock); - WINMM_NotifyClient(&cb_info, WIM_OPEN, 0, 0); - return MMSYSERR_NOERROR; error: @@ -1143,8 +1139,6 @@ static LRESULT WOD_Close(HWAVEOUT hwave) LeaveCriticalSection(&device->lock); - WINMM_NotifyClient(&cb_info, WOM_CLOSE, 0, 0); - return MMSYSERR_NOERROR; } @@ -1167,8 +1161,6 @@ static LRESULT WID_Close(HWAVEIN hwave) LeaveCriticalSection(&device->lock); - WINMM_NotifyClient(&cb_info, WIM_CLOSE, 0, 0); - return MMSYSERR_NOERROR; } @@ -2325,6 +2317,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, LRESULT res; HRESULT hr; WINMM_OpenInfo info; + WINMM_CBInfo cb_info; TRACE("(%p, %u, %p, %lx, %lx, %08x)\n", lphWaveOut, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); @@ -2354,6 +2347,13 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, if(lphWaveOut) *lphWaveOut = (HWAVEOUT)info.handle; + cb_info.flags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + cb_info.callback = dwCallback; + cb_info.user = dwInstance; + cb_info.hwave = info.handle; + + WINMM_NotifyClient(&cb_info, WOM_OPEN, 0, 0); + return res; } @@ -2362,12 +2362,30 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, */ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut) { + UINT res; + WINMM_Device *device; + WINMM_CBInfo cb_info; + TRACE("(%p)\n", hWaveOut); if(!WINMM_StartDevicesThread()) return MMSYSERR_ERROR; - return SendMessageW(g_devices_hwnd, WODM_CLOSE, (WPARAM)hWaveOut, 0); + device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); + + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_INVALHANDLE; + + memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + + LeaveCriticalSection(&device->lock); + + res = SendMessageW(g_devices_hwnd, WODM_CLOSE, (WPARAM)hWaveOut, 0); + + if(res == MMSYSERR_NOERROR) + WINMM_NotifyClient(&cb_info, WOM_CLOSE, 0, 0); + + return res; } /************************************************************************** @@ -2978,6 +2996,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, LRESULT res; HRESULT hr; WINMM_OpenInfo info; + WINMM_CBInfo cb_info; TRACE("(%p, %x, %p, %lx, %lx, %08x)\n", lphWaveIn, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); @@ -3007,6 +3026,13 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, if(lphWaveIn) *lphWaveIn = (HWAVEIN)info.handle; + cb_info.flags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + cb_info.callback = dwCallback; + cb_info.user = dwInstance; + cb_info.hwave = info.handle; + + WINMM_NotifyClient(&cb_info, WIM_OPEN, 0, 0); + return res; } @@ -3015,12 +3041,30 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, */ UINT WINAPI waveInClose(HWAVEIN hWaveIn) { + WINMM_Device *device; + WINMM_CBInfo cb_info; + UINT res; + TRACE("(%p)\n", hWaveIn); if(!WINMM_StartDevicesThread()) return MMSYSERR_ERROR; - return SendMessageW(g_devices_hwnd, WIDM_CLOSE, (WPARAM)hWaveIn, 0); + device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveIn); + + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_INVALHANDLE; + + memcpy(&cb_info, &device->cb_info, sizeof(cb_info)); + + LeaveCriticalSection(&device->lock); + + res = SendMessageW(g_devices_hwnd, WIDM_CLOSE, (WPARAM)hWaveIn, 0); + + if(res == MMSYSERR_NOERROR) + WINMM_NotifyClient(&cb_info, WIM_CLOSE, 0, 0); + + return res; } /**************************************************************************

1 0

Andrew Eikum : winmm: Fix check for DCB_NULL callback type.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: d385675f367d8299c08596f05ef706167f219b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d385675f367d8299c08596f05… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 18 11:19:37 2011 -0500 winmm: Fix check for DCB_NULL callback type. Noticed by Francois Gouget. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index a06d12f..1b18037 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -305,7 +305,7 @@ static DWORD WINMM_NotifyClient(WINMM_CBInfo *info, WORD msg, DWORD_PTR param1, { TRACE("(%p, %u, %lx, %lx)\n", info->hwave, msg, param1, param2); - if(info->flags & DCB_NULL) + if((info->flags & DCB_TYPEMASK) == DCB_NULL) return MMSYSERR_NOERROR; if(!DriverCallback(info->callback, info->flags, (HDRVR)info->hwave,

1 0

Alexandre Julliard : gdi32: Move a couple of rectangle helper functions to the header.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: ba168763b2f3e6d06714e4f60b8ad70bad6f6d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba168763b2f3e6d06714e4f60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 16:50:25 2011 +0200 gdi32: Move a couple of rectangle helper functions to the header. --- dlls/gdi32/bitblt.c | 17 ----------------- dlls/gdi32/dib.c | 8 -------- dlls/gdi32/gdi_private.h | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index da22507..8bd404c 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -47,23 +47,6 @@ static inline void swap_ints( int *i, int *j ) *j = tmp; } -static inline BOOL intersect_rect( RECT *dst, const RECT *src1, const RECT *src2 ) -{ - dst->left = max( src1->left, src2->left ); - dst->top = max( src1->top, src2->top ); - dst->right = min( src1->right, src2->right ); - dst->bottom = min( src1->bottom, src2->bottom ); - return (dst->left < dst->right && dst->top < dst->bottom); -} - -static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) -{ - rect->left += offset_x; - rect->top += offset_y; - rect->right += offset_x; - rect->bottom += offset_y; -} - static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, DC *dc_src, struct bitblt_coords *src ) { diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index fd9dfa7..1aa867b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -72,14 +72,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitmap); -static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) -{ - rect->left += offset_x; - rect->top += offset_y; - rect->right += offset_x; - rect->bottom += offset_y; -} - /* Some of the following helper functions are duplicated in dlls/x11drv/dib.c diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8c3e9ac..10bfc20 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -526,4 +526,21 @@ BOOL WINAPI FontIsLinked(HDC); BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size); +static inline BOOL intersect_rect( RECT *dst, const RECT *src1, const RECT *src2 ) +{ + dst->left = max( src1->left, src2->left ); + dst->top = max( src1->top, src2->top ); + dst->right = min( src1->right, src2->right ); + dst->bottom = min( src1->bottom, src2->bottom ); + return (dst->left < dst->right && dst->top < dst->bottom); +} + +static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) +{ + rect->left += offset_x; + rect->top += offset_y; + rect->right += offset_x; + rect->bottom += offset_y; +} + #endif /* __WINE_GDI_PRIVATE_H */

1 0

Alexandre Julliard : gdi32: Remove the GetDIBits entry point from the graphics driver.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: b01eb195114f69884d894d11c1c6a73063b0d12b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01eb195114f69884d894d11c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 17:07:51 2011 +0200 gdi32: Remove the GetDIBits entry point from the graphics driver. --- dlls/gdi32/bitmap.c | 7 ------- dlls/gdi32/dibdrv/dc.c | 1 - dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 2 -- include/wine/gdi_driver.h | 3 +-- 10 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 36a04a7..0c745d9 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -79,13 +79,6 @@ LONG nulldrv_SetBitmapBits( HBITMAP bitmap, const void *bits, LONG size ) return size; } -INT nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits, - BITMAPINFO *info, UINT coloruse ) -{ - /* FIXME: transfer bits from bmp->bitmap.bmBits */ - return 0; -} - INT nulldrv_SetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, const void *bits, const BITMAPINFO *info, UINT coloruse ) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 1122579..6c783e8 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -470,7 +470,6 @@ const DC_FUNCTIONS dib_driver = NULL, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDIBits */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 6cdf35d..0c26839 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -709,7 +709,6 @@ const DC_FUNCTIONS null_driver = nulldrv_GdiComment, /* pGdiComment */ nulldrv_GetBitmapBits, /* pGetBitmapBits */ nulldrv_GetCharWidth, /* pGetCharWidth */ - nulldrv_GetDIBits, /* pGetDIBits */ nulldrv_GetDeviceCaps, /* pGetDeviceCaps */ nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ nulldrv_GetICMProfile, /* pGetICMProfile */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index e7cbf2e..8d8e326 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -73,7 +73,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDIBits */ EMFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 10bfc20..7fa14d3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -480,7 +480,6 @@ extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDD extern BOOL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; -extern INT nulldrv_GetDIBits( PHYSDEV dev, HBITMAP bitmap, UINT start, UINT lines, LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL nulldrv_InvertRgn( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 4685470..65487fd 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -117,7 +117,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = NULL, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ - NULL, /* pGetDIBits */ MFDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 5a1af9c..a45cf86 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -839,7 +839,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pGdiComment */ NULL, /* pGetBitmapBits */ PSDRV_GetCharWidth, /* pGetCharWidth */ - NULL, /* pGetDIBits */ PSDRV_GetDeviceCaps, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetICMProfile */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 2541df0..4e374c7 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -482,7 +482,6 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pGdiComment */ X11DRV_GetBitmapBits, /* pGetBitmapBits */ X11DRV_GetCharWidth, /* pGetCharWidth */ - X11DRV_GetDIBits, /* pGetDIBits */ X11DRV_GetDeviceCaps, /* pGetDeviceCaps */ X11DRV_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ X11DRV_GetICMProfile, /* pGetICMProfile */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5c98d2e..1729546 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -201,8 +201,6 @@ extern BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT extern LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *bits, LONG count ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; -extern INT X11DRV_GetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) DECLSPEC_HIDDEN; extern DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 811cf80..2c05d82 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -92,7 +92,6 @@ struct gdi_dc_funcs BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*); LONG (*pGetBitmapBits)(HBITMAP,void*,LONG); BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); - INT (*pGetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPVOID,BITMAPINFO*,UINT); INT (*pGetDeviceCaps)(PHYSDEV,INT); BOOL (*pGetDeviceGammaRamp)(PHYSDEV,LPVOID); BOOL (*pGetICMProfile)(PHYSDEV,LPDWORD,LPWSTR); @@ -193,7 +192,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 3 +#define WINE_GDI_DRIVER_VERSION 4 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : winex11: Remove the GetDIBits implementation.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: dbd0b4542fb0112a5444f247b1f13bcac0342c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd0b4542fb0112a5444f247b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 18 17:11:06 2011 +0200 winex11: Remove the GetDIBits implementation. --- dlls/winex11.drv/dib.c | 170 +----------------------------------------------- 1 files changed, 1 insertions(+), 169 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index a1176d9..7274f0c 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -175,17 +175,6 @@ static int X11DRV_DIB_GetDIBWidthBytes( int width, int depth ) /*********************************************************************** - * X11DRV_DIB_GetDIBImageBytes - * - * Return the number of bytes used to hold the image in a DIB bitmap. - */ -static int X11DRV_DIB_GetDIBImageBytes( int width, int height, int depth ) -{ - return X11DRV_DIB_GetDIBWidthBytes( width, depth ) * abs( height ); -} - - -/*********************************************************************** * bitmap_info_size * * Return the size of the bitmap info structure including color table. @@ -4083,163 +4072,6 @@ INT X11DRV_SetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, } /*********************************************************************** - * GetDIBits (X11DRV.@) - */ -INT X11DRV_GetDIBits( PHYSDEV dev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); - DIBSECTION dib; - X11DRV_DIB_IMAGEBITS_DESCR descr; - PALETTEENTRY palette[256]; - size_t obj_size; - int height; - LONG width, tempHeight; - int bitmap_type; - BOOL core_header; - void* colorPtr; - static const PALETTEENTRY peBlack = {0,0,0,0}; - static const PALETTEENTRY peWhite = {255,255,255,0}; - - if (!physBitmap) return 0; - if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; - - bitmap_type = DIB_GetBitmapInfo( (BITMAPINFOHEADER*)info, &width, &tempHeight, &descr.infoBpp, &descr.compression); - if (bitmap_type == -1) - { - ERR("Invalid bitmap\n"); - return 0; - } - - if (physBitmap->pixmap_depth > 1) - { - GetPaletteEntries( GetCurrentObject( dev->hdc, OBJ_PAL ), 0, 256, palette ); - } - else - { - palette[0] = peBlack; - palette[1] = peWhite; - } - - descr.lines = tempHeight; - core_header = (bitmap_type == 0); - colorPtr = (LPBYTE) info + (WORD) info->bmiHeader.biSize; - - TRACE("%u scanlines of (%i,%i) -> (%i,%i) starting from %u\n", - lines, dib.dsBm.bmWidth, dib.dsBm.bmHeight, width, descr.lines, startscan); - - if( lines > dib.dsBm.bmHeight ) lines = dib.dsBm.bmHeight; - - height = descr.lines; - if (height < 0) height = -height; - if( lines > height ) lines = height; - /* Top-down images have a negative biHeight, the scanlines of these images - * were inverted in X11DRV_DIB_GetImageBits_xx - * To prevent this we simply change the sign of lines - * (the number of scan lines to copy). - * Negative lines are correctly handled by X11DRV_DIB_GetImageBits_xx. - */ - if( descr.lines < 0 && lines > 0) lines = -lines; - - if( startscan >= dib.dsBm.bmHeight ) return 0; - - descr.colorMap = NULL; - - switch (descr.infoBpp) - { - case 1: - case 4: - case 8: - descr.rMask= descr.gMask = descr.bMask = 0; - if(coloruse == DIB_RGB_COLORS) - descr.colorMap = colorPtr; - else { - int num_colors = 1 << descr.infoBpp, i; - RGBQUAD *rgb; - COLORREF colref; - WORD *index = colorPtr; - descr.colorMap = rgb = HeapAlloc(GetProcessHeap(), 0, num_colors * sizeof(RGBQUAD)); - for(i = 0; i < num_colors; i++, rgb++, index++) { - colref = X11DRV_PALETTE_ToLogical(physDev, X11DRV_PALETTE_ToPhysical(physDev, PALETTEINDEX(*index))); - rgb->rgbRed = GetRValue(colref); - rgb->rgbGreen = GetGValue(colref); - rgb->rgbBlue = GetBValue(colref); - rgb->rgbReserved = 0; - } - } - break; - case 15: - case 16: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0x7c00; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x03e0; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x001f; - break; - case 24: - case 32: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0xff0000; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x00ff00; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x0000ff; - break; - } - - descr.physDev = physDev; - descr.palentry = palette; - descr.bits = bits; - descr.image = physBitmap->image; - descr.infoWidth = width; - descr.lines = lines; - descr.depth = physBitmap->pixmap_depth; - descr.shifts = physBitmap->trueColor ? &physBitmap->pixmap_color_shifts : NULL; - descr.drawable = physBitmap->pixmap; - descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); - descr.width = dib.dsBm.bmWidth; - descr.height = dib.dsBm.bmHeight; - descr.xDest = 0; - descr.yDest = 0; - descr.xSrc = 0; - descr.sizeImage = core_header ? 0 : info->bmiHeader.biSizeImage; - descr.physBitmap = physBitmap; - - if (descr.lines > 0) - { - descr.ySrc = (descr.height-1) - (startscan + (lines-1)); - } - else - { - descr.ySrc = startscan; - } - descr.shm_mode = physBitmap->shm_mode; - descr.dibpitch = (((descr.infoWidth * descr.infoBpp + 31) &~31) / 8); - - X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); - X11DRV_DIB_GetImageBits( &descr ); - X11DRV_DIB_Unlock( physBitmap, TRUE ); - - if(!core_header && info->bmiHeader.biSizeImage == 0) /* Fill in biSizeImage */ - info->bmiHeader.biSizeImage = X11DRV_DIB_GetDIBImageBytes( descr.infoWidth, - descr.lines, - descr.infoBpp); - - if (descr.compression == BI_BITFIELDS) - { - *(DWORD *)info->bmiColors = descr.rMask; - *((DWORD *)info->bmiColors + 1) = descr.gMask; - *((DWORD *)info->bmiColors + 2) = descr.bMask; - } - else if (!core_header) - { - /* if RLE or JPEG compression were supported, - * this line would be invalid. */ - info->bmiHeader.biCompression = 0; - } - - if(descr.colorMap != colorPtr) - HeapFree(GetProcessHeap(), 0, descr.colorMap); - return lines; -} - -/*********************************************************************** * X11DRV_DIB_DoCopyDIBSection */ static void X11DRV_DIB_DoCopyDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB, @@ -4761,7 +4593,7 @@ HBITMAP X11DRV_CreateDIBSection( PHYSDEV dev, HBITMAP hbitmap, const BITMAPINFO Bool pixmaps; #endif - DIB_GetBitmapInfo( &bmi->bmiHeader, &w, &h, &bpp, &compr ); + if (DIB_GetBitmapInfo( &bmi->bmiHeader, &w, &h, &bpp, &compr ) == -1) return 0; if (!(physBitmap = X11DRV_init_phys_bitmap( hbitmap ))) return 0; if (h < 0) physBitmap->topdown = TRUE;

1 0

Jacek Caban : vbscript: Added stub VBScript object implementation.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 03b8ad29cc587f5898c6540ba04cf4d27f4cd78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b8ad29cc587f5898c6540ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 18 16:57:27 2011 +0200 vbscript: Added stub VBScript object implementation. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/vbscript.c | 229 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 43 ++++++++ dlls/vbscript/vbscript_main.c | 7 +- 4 files changed, 274 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 3e8a3eb..2a90e46 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,6 +1,7 @@ MODULE = vbscript.dll C_SRCS = \ + vbscript.c \ vbscript_main.c RC_SRCS = vbscript.rc diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c new file mode 100644 index 0000000..f82bc56 --- /dev/null +++ b/dlls/vbscript/vbscript.c @@ -0,0 +1,229 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" + +#include "vbscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +#ifdef _WIN64 + +#define CTXARG_T DWORDLONG +#define IActiveScriptParseVtbl IActiveScriptParse64Vtbl + +#else + +#define CTXARG_T DWORD +#define IActiveScriptParseVtbl IActiveScriptParse32Vtbl + +#endif + +static inline VBScript *impl_from_IActiveScript(IActiveScript *iface) +{ + return CONTAINING_RECORD(iface, VBScript, IActiveScript_iface); +} + +static HRESULT WINAPI VBScript_QueryInterface(IActiveScript *iface, REFIID riid, void **ppv) +{ + VBScript *This = impl_from_IActiveScript(iface); + + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IActiveScript_iface; + }else if(IsEqualGUID(riid, &IID_IActiveScript)) { + TRACE("(%p)->(IID_IActiveScript %p)\n", This, ppv); + *ppv = &This->IActiveScript_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI VBScript_AddRef(IActiveScript *iface) +{ + VBScript *This = impl_from_IActiveScript(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI VBScript_Release(IActiveScript *iface) +{ + VBScript *This = impl_from_IActiveScript(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", iface, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->(%p)\n", This, pass); + return S_OK; +} + +static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, + void **ppvObject) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE ss) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->(%d)\n", This, ss); + return S_OK; +} + +static HRESULT WINAPI VBScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->(%p)\n", This, pssState); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_Close(IActiveScript *iface) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstrName, DWORD dwFlags) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->(%s %x)\n", This, debugstr_w(pstrName), dwFlags); + return S_OK; +} + +static HRESULT WINAPI VBScript_AddTypeLib(IActiveScript *iface, REFGUID rguidTypeLib, + DWORD dwMajor, DWORD dwMinor, DWORD dwFlags) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR pstrItemName, IDispatch **ppdisp) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->(%p)\n", This, ppdisp); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_GetCurrentScriptThreadID(IActiveScript *iface, + SCRIPTTHREADID *pstridThread) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_GetScriptThreadID(IActiveScript *iface, + DWORD dwWin32ThreadId, SCRIPTTHREADID *pstidThread) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_GetScriptThreadState(IActiveScript *iface, + SCRIPTTHREADID stidThread, SCRIPTTHREADSTATE *pstsState) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_InterruptScriptThread(IActiveScript *iface, + SCRIPTTHREADID stidThread, const EXCEPINFO *pexcepinfo, DWORD dwFlags) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScript_Clone(IActiveScript *iface, IActiveScript **ppscript) +{ + VBScript *This = impl_from_IActiveScript(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static const IActiveScriptVtbl VBScriptVtbl = { + VBScript_QueryInterface, + VBScript_AddRef, + VBScript_Release, + VBScript_SetScriptSite, + VBScript_GetScriptSite, + VBScript_SetScriptState, + VBScript_GetScriptState, + VBScript_Close, + VBScript_AddNamedItem, + VBScript_AddTypeLib, + VBScript_GetScriptDispatch, + VBScript_GetCurrentScriptThreadID, + VBScript_GetScriptThreadID, + VBScript_GetScriptThreadState, + VBScript_InterruptScriptThread, + VBScript_Clone +}; + +HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + VBScript *ret; + HRESULT hres; + + TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IActiveScript_iface.lpVtbl = &VBScriptVtbl; + + ret->ref = 1; + + hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); + IActiveScript_Release(&ret->IActiveScript_iface); + return hres; +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h new file mode 100644 index 0000000..3b2da9a --- /dev/null +++ b/dlls/vbscript/vbscript.h @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 "activscp.h" +#include "vbscript_classes.h" + +struct VBScript { + IActiveScript IActiveScript_iface; + + LONG ref; +}; + +HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 50e4eb7..53f2841 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -28,6 +28,7 @@ #include "ole2.h" #include "rpcproxy.h" +#include "vbscript.h" #include "vbscript_classes.h" #include "wine/debug.h" @@ -36,12 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static HINSTANCE vbscript_hinstance; -static HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) -{ - FIXME("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); - return E_NOINTERFACE; -} - static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL;

1 0

Jacek Caban : vbscript: Added IActiveScriptParse stub implementation.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: cf30b6aea38df4e27e60908eb2332b0f3ddc4053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf30b6aea38df4e27e60908eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 18 16:57:41 2011 +0200 vbscript: Added IActiveScriptParse stub implementation. --- dlls/vbscript/vbscript.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 2 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f82bc56..f0da4ed 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -59,6 +59,9 @@ static HRESULT WINAPI VBScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IActiveScript)) { TRACE("(%p)->(IID_IActiveScript %p)\n", This, ppv); *ppv = &This->IActiveScript_iface; + }else if(IsEqualGUID(riid, &IID_IActiveScriptParse)) { + TRACE("(%p)->(IID_IActiveScriptParse %p)\n", This, ppv); + *ppv = &This->IActiveScriptParse_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -208,6 +211,71 @@ static const IActiveScriptVtbl VBScriptVtbl = { VBScript_Clone }; +static inline VBScript *impl_from_IActiveScriptParse(IActiveScriptParse *iface) +{ + return CONTAINING_RECORD(iface, VBScript, IActiveScriptParse_iface); +} + +static HRESULT WINAPI VBScriptParse_QueryInterface(IActiveScriptParse *iface, REFIID riid, void **ppv) +{ + VBScript *This = impl_from_IActiveScriptParse(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI VBScriptParse_AddRef(IActiveScriptParse *iface) +{ + VBScript *This = impl_from_IActiveScriptParse(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface) +{ + VBScript *This = impl_from_IActiveScriptParse(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) +{ + VBScript *This = impl_from_IActiveScriptParse(iface); + FIXME("(%p)\n", This); + return S_OK; +} + +static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, + LPCOLESTR pstrDefaultName, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, + LPCOLESTR pstrSubItemName, LPCOLESTR pstrEventName, LPCOLESTR pstrDelimiter, + CTXARG_T dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, + BSTR *pbstrName, EXCEPINFO *pexcepinfo) +{ + VBScript *This = impl_from_IActiveScriptParse(iface); + FIXME("(%p)->(%s %s %s %s %s %s %s %u %x %p %p)\n", This, debugstr_w(pstrDefaultName), + debugstr_w(pstrCode), debugstr_w(pstrItemName), debugstr_w(pstrSubItemName), + debugstr_w(pstrEventName), debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), + ulStartingLineNumber, dwFlags, pbstrName, pexcepinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI VBScriptParse_ParseScriptText(IActiveScriptParse *iface, + LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, + LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, + DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) +{ + VBScript *This = impl_from_IActiveScriptParse(iface); + FIXME("(%p)->(%s %s %p %s %s %u %x %p %p)\n", This, debugstr_w(pstrCode), + debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), + wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLine, dwFlags, pvarResult, pexcepinfo); + return E_NOTIMPL; +} + +static const IActiveScriptParseVtbl VBScriptParseVtbl = { + VBScriptParse_QueryInterface, + VBScriptParse_AddRef, + VBScriptParse_Release, + VBScriptParse_InitNew, + VBScriptParse_AddScriptlet, + VBScriptParse_ParseScriptText +}; + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { VBScript *ret; @@ -220,6 +288,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU return E_OUTOFMEMORY; ret->IActiveScript_iface.lpVtbl = &VBScriptVtbl; + ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; ret->ref = 1; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 3b2da9a..cd97e09 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -21,6 +21,7 @@ struct VBScript { IActiveScript IActiveScript_iface; + IActiveScriptParse IActiveScriptParse_iface; LONG ref; };

1 0

Jacek Caban : jscript: Properly handle aggregation attempt.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 5b16e6e0fdb35e57a034fd5e6df61765ad11fa71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b16e6e0fdb35e57a034fd5e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 18 18:05:13 2011 +0200 jscript: Properly handle aggregation attempt. --- dlls/jscript/jscript.c | 5 +++++ dlls/jscript/tests/jscript.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 641c192..fb7fd8c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -963,6 +963,11 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + if(pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + lock_module(); ret = heap_alloc_zero(sizeof(*ret)); diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 6d48799..67067b9 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -605,6 +605,18 @@ static void test_jscript_uninitializing(void) ok(!ref, "ref = %d\n", ref); } +static void test_aggregation(void) +{ + IUnknown *unk = (IUnknown*)0xdeadbeef; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_JScript, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == CLASS_E_NOAGGREGATION || broken(E_INVALIDARG) /* win2k */, + "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); + ok(!unk, "unk = %p\n", unk); +} + static BOOL check_jscript(void) { IActiveScriptProperty *script_prop; @@ -626,6 +638,7 @@ START_TEST(jscript) test_jscript(); test_jscript2(); test_jscript_uninitializing(); + test_aggregation(); }else { win_skip("Broken engine, probably too old\n"); }

1 0

Kazuyuki Sato : crypt32: Add additional path for Solaris 11 Express.
by Alexandre Julliard 18 Jul '11

18 Jul '11

Module: wine Branch: master Commit: 8cdf7358227f3c94ecc20c99e27e6ea2fc901b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cdf7358227f3c94ecc20c99e… Author: Kazuyuki Sato <kazus(a)sunfish.suginami.tokyo.jp> Date: Mon Jul 18 16:58:39 2011 +0900 crypt32: Add additional path for Solaris 11 Express. --- dlls/crypt32/rootstore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index c6f106e..44c3d81 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -486,6 +486,7 @@ static const char * const CRYPT_knownLocations[] = { "/etc/ssl/certs", "/etc/pki/tls/certs/ca-bundle.crt", "/usr/local/share/certs/", + "/etc/sfw/openssl/certs", }; static const BYTE authenticode[] = {

1 0