October 2009 - Wine-Commits

Austin English : dwmapi: Add a stub for DwmGetGraphicsStreamClient.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: ce4d4909a108aeb9bc98e29350757bade89d755c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4d4909a108aeb9bc98e2935… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 30 13:11:20 2009 -0500 dwmapi: Add a stub for DwmGetGraphicsStreamClient. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 7b7ad8e..27e0704 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -29,7 +29,7 @@ @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) @ stub DwmGetCompositionTimingInfo -@ stub DwmGetGraphicsStreamClient +@ stdcall DwmGetGraphicsStreamClient(long ptr) @ stub DwmGetGraphicsStreamTransformHint @ stdcall DwmGetTransportAttributes(ptr ptr ptr) @ stub DwmGetWindowAttribute diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 2bbb501..40ecec7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -110,10 +110,19 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr return E_NOTIMPL; } +/********************************************************************** + * DwmGetGraphicsStreamClient (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamClient(UINT uIndex, UUID *pClientUuid) +{ + FIXME("(%d, %p) stub\n", uIndex, pClientUuid); + + return E_NOTIMPL; +} /********************************************************************** - * * DwmGetTransportAttributes (DWMAPI.@) - * */ + * DwmGetTransportAttributes (DWMAPI.@) + */ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected, DWORD *pDwGeneration) { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration);

1 0

Roderick Colenbrander : winex11: Add support for 16-bit/32-bit DIB sections .
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 6b8753185f30197047773af6a26eafd34d45367c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8753185f30197047773af6a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 26 14:52:46 2009 +0200 winex11: Add support for 16-bit/32-bit DIB sections. --- dlls/winex11.drv/dib.c | 39 ++++++++++++++++++++++++++++----------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4b15569..1fc8812 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4744,19 +4744,23 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, &physBitmap->nColorMap ); } - /* create pixmap and X image */ - wine_tsx11_lock(); - if(dib.dsBm.bmBitsPixel == 1) - { - physBitmap->pixmap_depth = 1; - physBitmap->trueColor = FALSE; - } - else + if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, &dib )) { - physBitmap->pixmap_depth = screen_depth; - physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; - physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + if (dib.dsBm.bmBitsPixel == 1) + { + physBitmap->pixmap_depth = 1; + physBitmap->trueColor = FALSE; + } + else + { + physBitmap->pixmap_depth = screen_depth; + physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; + physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + } } + + /* create pixmap and X image */ + wine_tsx11_lock(); #ifdef HAVE_LIBXXSHM physBitmap->shminfo.shmid = -1; @@ -4803,6 +4807,19 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, wine_tsx11_unlock(); if (!physBitmap->pixmap || !physBitmap->image) return 0; + if (physBitmap->trueColor) + { + ColorShifts *shifts = &physBitmap->pixmap_color_shifts; + + /* When XRender is around and used, we also support dibsections in other formats like 16-bit. In these + * cases we need to override the mask of XImages. The reason is that during XImage creation the masks are + * derived from a 24-bit visual (no 16-bit ones are around when X runs at 24-bit). SetImageBits and other + * functions rely on the color masks for proper color conversion, so we need to override the masks here. */ + physBitmap->image->red_mask = shifts->physicalRed.max << shifts->physicalRed.shift; + physBitmap->image->green_mask = shifts->physicalGreen.max << shifts->physicalGreen.shift; + physBitmap->image->blue_mask = shifts->physicalBlue.max << shifts->physicalBlue.shift; + } + /* install fault handler */ InitializeCriticalSection( &physBitmap->lock ); physBitmap->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": X_PHYSBITMAP.lock"); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8f0764d..922855d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -286,6 +286,7 @@ extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *phys extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx); +extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib); BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 9280ce3..076b6d4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2,6 +2,7 @@ * Functions to use the XRender extension * * Copyright 2001, 2002 Huw D M Davies for CodeWeavers + * Copyright 2009 Roderick Colenbrander * * Some parts also: * Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. @@ -835,6 +836,33 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) return; } +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + WineXRenderFormat *fmt; + ColorShifts shifts; + + /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion + * in software. Further we also return the screen depth for paletted formats or TrueColor formats with a low + * number of bits because XRender can't handle paletted formats and 8-bit TrueColor does not exist for XRender. */ + if(!X11DRV_XRender_Installed || dib->dsBm.bmBitsPixel <= 8) + return FALSE; + + X11DRV_PALETTE_ComputeColorShifts(&shifts, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + + /* Common formats should be in our picture format table. */ + fmt = get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts); + if(fmt) + { + physBitmap->pixmap_depth = fmt->pict_format->depth; + physBitmap->trueColor = TRUE; + physBitmap->pixmap_color_shifts = shifts; + return TRUE; + } + TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", + dib->dsBm.bmBitsPixel, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + return FALSE; +} + /*********************************************************************** * X11DRV_XRender_UpdateDrawable * @@ -2172,6 +2200,11 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, wine_tsx11_unlock(); } +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + return FALSE; +} + BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc,

1 0

Hans Leidekker : msi: Schedule a rename operation when the file to overwrite is in use.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 9c8b83ce015d91c44917c4aa4856d7a117ed170b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8b83ce015d91c44917c4aa4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 1 11:53:20 2009 +0200 msi: Schedule a rename operation when the file to overwrite is in use. --- dlls/msi/action.c | 3 + dlls/msi/files.c | 39 ++++++++++- dlls/msi/media.c | 47 ++++++++++++-- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 163 ++++++++++++++++++++++++++++++++++++---------- 5 files changed, 209 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c8b83ce015d91c44917c…

1 0

Stefan Dösinger : wined3d: Fix an error string.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: c749debec61345f5abbbcd67076a41d7b722db6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c749debec61345f5abbbcd670… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 29 17:43:44 2009 +0200 wined3d: Fix an error string. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8eac47c..5d494ec 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -693,7 +693,7 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch GL_EXTCALL(glGenProgramsARB(1, &prog)); if(!prog) { - ERR("Failed to create an ARB offset limit test program\n"); + ERR("Failed to create the NVvp clip test program\n"); LEAVE_GL(); return FALSE; }

1 0

Alexandre Julliard : version: Moved GetFileResourceSize16/ GetFileResource16 to ver16.c.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: dbbc40affa69a66d2f0993492e5e910210835ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbc40affa69a66d2f0993492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 13:56:13 2009 +0200 version: Moved GetFileResourceSize16/GetFileResource16 to ver16.c. --- dlls/version/resource.c | 58 --------------------------------------------- dlls/version/ver16.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 2523aaa..0f8e086 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -408,61 +408,3 @@ DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *o } return magic; } - - -/************************************************************************* - * GetFileResourceSize [VER.2] - */ -DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, - LPCSTR lpszResId, LPDWORD lpdwFileOffset ) -{ - HFILE lzfd; - OFSTRUCT ofs; - DWORD reslen = 0; - - TRACE("(%s,type=%p,id=%p,off=%p)\n", - debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId ); - - lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); - if (lzfd >= 0) - { - if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0; - LZClose( lzfd ); - } - return reslen; -} - - -/************************************************************************* - * GetFileResource [VER.3] - */ -DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, - LPCSTR lpszResId, DWORD dwFileOffset, - DWORD dwResLen, LPVOID lpvData ) -{ - HFILE lzfd; - OFSTRUCT ofs; - DWORD reslen = dwResLen; - - TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n", - debugstr_a(lpszFileName), lpszResType, lpszResId, - dwFileOffset, dwResLen, lpvData ); - - lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); - if ( lzfd < 0 ) return 0; - - if ( !dwFileOffset ) - { - if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset )) - { - LZClose( lzfd ); - return 0; - } - } - - LZSeek( lzfd, dwFileOffset, SEEK_SET ); - reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) ); - LZClose( lzfd ); - - return reslen; -} diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c index 3ffb920..f399cd2 100644 --- a/dlls/version/ver16.c +++ b/dlls/version/ver16.c @@ -23,11 +23,71 @@ #include "windef.h" #include "wine/winbase16.h" #include "winver.h" +#include "lzexpand.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ver); +extern DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset ); + +/************************************************************************* + * GetFileResourceSize [VER.2] + */ +DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, + LPCSTR lpszResId, LPDWORD lpdwFileOffset ) +{ + HFILE lzfd; + OFSTRUCT ofs; + DWORD reslen = 0; + + TRACE("(%s,type=%p,id=%p,off=%p)\n", + debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId ); + + lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); + if (lzfd >= 0) + { + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0; + LZClose( lzfd ); + } + return reslen; +} + + +/************************************************************************* + * GetFileResource [VER.3] + */ +DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, + LPCSTR lpszResId, DWORD dwFileOffset, + DWORD dwResLen, LPVOID lpvData ) +{ + HFILE lzfd; + OFSTRUCT ofs; + DWORD reslen = dwResLen; + + TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n", + debugstr_a(lpszFileName), lpszResType, lpszResId, + dwFileOffset, dwResLen, lpvData ); + + lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); + if ( lzfd < 0 ) return 0; + + if ( !dwFileOffset ) + { + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset )) + { + LZClose( lzfd ); + return 0; + } + } + + LZSeek( lzfd, dwFileOffset, 0 /* SEEK_SET */ ); + reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) ); + LZClose( lzfd ); + + return reslen; +} + /************************************************************************* * GetFileVersionInfoSize [VER.6] */

1 0

Alexandre Julliard : version: Abstract resource finding into a common function.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: e04b9984b60c4eecf31ae7b29717ce0a6871d575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04b9984b60c4eecf31ae7b29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 1 13:53:42 2009 +0200 version: Abstract resource finding into a common function. --- dlls/version/resource.c | 58 +++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 32 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index efd9115..2523aaa 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -390,38 +390,46 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, } +/*********************************************************************** + * find_resource [internal] + */ +DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset ) +{ + DWORD magic = read_xx_header( lzfd ); + + switch (magic) + { + case IMAGE_OS2_SIGNATURE: + if (!find_ne_resource( lzfd, type, id, reslen, offset )) magic = 0; + break; + case IMAGE_NT_SIGNATURE: + if (!find_pe_resource( lzfd, type, id, reslen, offset )) magic = 0; + break; + } + return magic; +} + + /************************************************************************* * GetFileResourceSize [VER.2] */ DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, LPCSTR lpszResId, LPDWORD lpdwFileOffset ) { - BOOL retv = FALSE; HFILE lzfd; OFSTRUCT ofs; - DWORD reslen; + DWORD reslen = 0; TRACE("(%s,type=%p,id=%p,off=%p)\n", debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId ); lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); - if ( lzfd < 0 ) return 0; - - switch ( read_xx_header( lzfd ) ) + if (lzfd >= 0) { - case IMAGE_OS2_SIGNATURE: - retv = find_ne_resource( lzfd, lpszResType, lpszResId, - &reslen, lpdwFileOffset ); - break; - - case IMAGE_NT_SIGNATURE: - retv = find_pe_resource( lzfd, lpszResType, lpszResId, - &reslen, lpdwFileOffset ); - break; + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0; + LZClose( lzfd ); } - - LZClose( lzfd ); - return retv? reslen : 0; + return reslen; } @@ -432,7 +440,6 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, LPCSTR lpszResId, DWORD dwFileOffset, DWORD dwResLen, LPVOID lpvData ) { - BOOL retv = FALSE; HFILE lzfd; OFSTRUCT ofs; DWORD reslen = dwResLen; @@ -446,20 +453,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, if ( !dwFileOffset ) { - switch ( read_xx_header( lzfd ) ) - { - case IMAGE_OS2_SIGNATURE: - retv = find_ne_resource( lzfd, lpszResType, lpszResId, - &reslen, &dwFileOffset ); - break; - - case IMAGE_NT_SIGNATURE: - retv = find_pe_resource( lzfd, lpszResType, lpszResId, - &reslen, &dwFileOffset ); - break; - } - - if ( !retv ) + if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset )) { LZClose( lzfd ); return 0;

1 0

Nikolay Sivov : comctl32/datetime: Some DTM_SETSYSTEMTIME tests.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 99ded940e142d0f688500eb782697655fe4f244b URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ded940e142d0f688500eb78… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 03:00:26 2009 +0400 comctl32/datetime: Some DTM_SETSYSTEMTIME tests. --- dlls/comctl32/tests/datetime.c | 88 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 986fc8e..26d7ea1 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -524,7 +524,7 @@ static void test_dtm_set_range_swap_min_max(void) static void test_dtm_set_and_get_system_time(void) { LRESULT r; - SYSTEMTIME st, getSt; + SYSTEMTIME st, getSt, ref; HWND hWnd, hWndDateTime_test_gdt_none; hWndDateTime_test_gdt_none = create_datetime_control(0, 0); @@ -579,6 +579,92 @@ static void test_dtm_set_and_get_system_time(void) expect_unsuccess(0, r); ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_system_time_seq, "test_dtm_set_and_get_system_time", FALSE); + + /* set to some valid value */ + GetSystemTime(&ref); + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&ref); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + + /* year invalid */ + st = ref; + st.wYear = 0; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + todo_wine expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* month invalid */ + st = ref; + st.wMonth = 13; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* day invalid */ + st = ref; + st.wDay = 32; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* day of week isn't validated */ + st = ref; + st.wDayOfWeek = 10; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + todo_wine expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* hour invalid */ + st = ref; + st.wHour = 25; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* minute invalid */ + st = ref; + st.wMinute = 60; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* sec invalid */ + st = ref; + st.wSecond = 60; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* msec invalid */ + st = ref; + st.wMilliseconds = 1000; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + + /* day of week should be calculated automatically, + actual day of week for this date is 4 */ + fill_systime_struct(&st, 2009, 10, 1, 1, 0, 0, 10, 200); + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + /* 01.10.2009 is Thursday */ + todo_wine expect(4, (LRESULT)getSt.wDayOfWeek); + st.wDayOfWeek = 4; + todo_wine expect_systime(&st, &getSt); + DestroyWindow(hWnd); }

1 0

Jacek Caban : urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 3b92a3f3a3f1b87e786565c00d0c5722925ba6e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b92a3f3a3f1b87e786565c00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:00:53 2009 +0200 urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY. --- dlls/urlmon/sec_mgr.c | 1 + dlls/urlmon/tests/sec_mgr.c | 7 +++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index b3d468d..7a1255a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -238,6 +238,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s switch(action) { case URLACTION_SCRIPT_OVERRIDE_SAFETY: + case URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY: *(DWORD*)policy = URLPOLICY_DISALLOW; return S_OK; } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 8820811..62471cf 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -297,6 +297,12 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy, sizeof(WCHAR), NULL, 0, 0, 0); ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy, + sizeof(DWORD), NULL, 0, 0, 0); + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + ok(policy == URLPOLICY_DISALLOW, "policy = %x\n", policy); } static void test_activex(IInternetSecurityManager *secmgr) @@ -338,6 +344,7 @@ static void test_polices(void) test_url_action(secmgr, zonemgr, 0xdeadbeef); test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY); + test_special_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY); test_activex(secmgr);

1 0

Nikolay Sivov : comctl32/datetime: Always store a recalculated day of week instead of a value passed in ( DTM_SETSYSTEMTIME).
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: 9557376138f3b2508d4b523314182d7dafd4fa85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9557376138f3b2508d4b52331… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 03:11:00 2009 +0400 comctl32/datetime: Always store a recalculated day of week instead of a value passed in (DTM_SETSYSTEMTIME). --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/datetime.c | 11 ++++++++--- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/tests/datetime.c | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index fd07110..e0d1970 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -231,6 +231,7 @@ extern void UPDOWN_Unregister(void); int MONTHCAL_MonthLength(int month, int year); +int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year); extern void THEMING_Initialize(void); extern void THEMING_Uninitialize(void); diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 224519a..8f7f5dd 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -88,6 +88,7 @@ typedef struct /* in monthcal.c */ extern int MONTHCAL_MonthLength(int month, int year); +extern int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year); /* this list of defines is closely related to `allowedformatchars' defined * in datetime.c; the high nibble indicates the `base type' of the format @@ -164,17 +165,21 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy if (flag == GDT_VALID) { if (systime->wYear < 1601 || systime->wYear > 30827 || systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDayOfWeek > 6 || systime->wDay < 1 || systime->wDay > 31 || systime->wHour > 23 || systime->wMinute > 59 || systime->wSecond > 59 || systime->wMilliseconds > 999 ) - return 0; + return FALSE; infoPtr->dateValid = TRUE; infoPtr->date = *systime; + /* always store a valid day of week */ + infoPtr->date.wDayOfWeek = + MONTHCAL_CalculateDayOfWeek(infoPtr->date.wDay, infoPtr->date.wMonth, + infoPtr->date.wYear); + SendMessageW (infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date)); SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_CHECKED, 0); } else if ((infoPtr->dwStyle & DTS_SHOWNONE) && (flag == GDT_NONE)) { @@ -182,7 +187,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_UNCHECKED, 0); } else - return 0; + return FALSE; InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return TRUE; diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index fcfc7eb..71e477e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -199,7 +199,7 @@ static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) /* returns the day in the week(0 == sunday, 6 == saturday) */ /* day(1 == 1st, 2 == 2nd... etc), year is the year value */ -static int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) +int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) { year-=(month < 3); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 26d7ea1..c449e45 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -616,7 +616,7 @@ static void test_dtm_set_and_get_system_time(void) st = ref; st.wDayOfWeek = 10; r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); - todo_wine expect(1, r); + expect(1, r); r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); expect(GDT_VALID, r); expect_systime(&ref, &getSt); @@ -661,9 +661,9 @@ static void test_dtm_set_and_get_system_time(void) r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); expect(GDT_VALID, r); /* 01.10.2009 is Thursday */ - todo_wine expect(4, (LRESULT)getSt.wDayOfWeek); + expect(4, (LRESULT)getSt.wDayOfWeek); st.wDayOfWeek = 4; - todo_wine expect_systime(&st, &getSt); + expect_systime(&st, &getSt); DestroyWindow(hWnd); }

1 0

Nikolay Sivov : comctl32/datetime: Separate tests from each other.
by Alexandre Julliard Oct. 1, 2009

Oct. 1, 2009

Module: wine Branch: master Commit: aae85b4d68bb28d02b2581527653464552c5052b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae85b4d68bb28d02b2581527… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 02:35:16 2009 +0400 comctl32/datetime: Separate tests from each other. --- dlls/comctl32/tests/datetime.c | 327 ++++++++++++++++++++-------------------- 1 files changed, 167 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aae85b4d68bb28d02b258…

1 0