February 2008 - Wine-commits

Alexandre Julliard : kernel32: Implement the fiber local storage functions.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: b2ad268a8b7d7ac65029bbdd71d14f2c0f1b260d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ad268a8b7d7ac65029bbdd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 29 19:56:04 2008 +0100 kernel32: Implement the fiber local storage functions. --- dlls/kernel32/fiber.c | 88 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 73 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index e95ef86..fda5f92 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -48,6 +48,7 @@ struct fiber_data sigjmp_buf jmpbuf; /* 14 setjmp buffer (on Windows: CONTEXT) */ DWORD flags; /* fiber flags */ LPFIBER_START_ROUTINE start; /* start routine */ + void **fls_slots; /* fiber storage slots */ }; @@ -107,6 +108,7 @@ LPVOID WINAPI CreateFiberEx( SIZE_T stack_commit, SIZE_T stack_reserve, DWORD fl fiber->except = (void *)-1; fiber->start = start; fiber->flags = flags; + fiber->fls_slots = NULL; return fiber; } @@ -125,6 +127,7 @@ void WINAPI DeleteFiber( LPVOID fiber_ptr ) ExitThread(1); } VirtualFree( fiber->stack_allocation, 0, MEM_RELEASE ); + HeapFree( GetProcessHeap(), 0, fiber->fls_slots ); HeapFree( GetProcessHeap(), 0, fiber ); } @@ -157,6 +160,7 @@ LPVOID WINAPI ConvertThreadToFiberEx( LPVOID param, DWORD flags ) fiber->stack_allocation = NtCurrentTeb()->DeallocationStack; fiber->start = NULL; fiber->flags = flags; + fiber->fls_slots = NtCurrentTeb()->FlsSlots; NtCurrentTeb()->Tib.u.FiberData = fiber; return fiber; } @@ -188,6 +192,7 @@ void WINAPI SwitchToFiber( LPVOID fiber ) current_fiber->except = NtCurrentTeb()->Tib.ExceptionList; current_fiber->stack_limit = NtCurrentTeb()->Tib.StackLimit; + current_fiber->fls_slots = NtCurrentTeb()->FlsSlots; /* stack_allocation and stack_base never change */ /* FIXME: should save floating point context if requested in fiber->flags */ @@ -198,6 +203,7 @@ void WINAPI SwitchToFiber( LPVOID fiber ) NtCurrentTeb()->Tib.StackBase = new_fiber->stack_base; NtCurrentTeb()->Tib.StackLimit = new_fiber->stack_limit; NtCurrentTeb()->DeallocationStack = new_fiber->stack_allocation; + NtCurrentTeb()->FlsSlots = new_fiber->fls_slots; if (new_fiber->start) /* first time */ wine_switch_to_stack( start_fiber, new_fiber, new_fiber->stack_base ); else @@ -210,10 +216,40 @@ void WINAPI SwitchToFiber( LPVOID fiber ) */ DWORD WINAPI FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) { - FIXME( "%p: stub!\n", callback ); + DWORD index; + PEB * const peb = NtCurrentTeb()->Peb; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FLS_OUT_OF_INDEXES; + RtlAcquirePebLock(); + if (!peb->FlsCallback && + !(peb->FlsCallback = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + index = FLS_OUT_OF_INDEXES; + } + else + { + index = RtlFindClearBitsAndSet( peb->FlsBitmap, 1, 0 ); + if (index != ~0U) + { + if (!NtCurrentTeb()->FlsSlots && + !(NtCurrentTeb()->FlsSlots = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(peb->FlsBitmapBits) * sizeof(void*) ))) + { + RtlClearBits( peb->FlsBitmap, index, 1 ); + index = FLS_OUT_OF_INDEXES; + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + } + else + { + NtCurrentTeb()->FlsSlots[index] = 0; /* clear the value */ + peb->FlsCallback[index] = callback; + } + } + else SetLastError( ERROR_NO_MORE_ITEMS ); + } + RtlReleasePebLock(); + return index; } /*********************************************************************** @@ -221,10 +257,20 @@ DWORD WINAPI FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) */ BOOL WINAPI FlsFree( DWORD index ) { - FIXME( "%x: stub!\n", index ); + BOOL ret; - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + RtlAcquirePebLock(); + ret = RtlAreBitsSet( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); + if (ret) RtlClearBits( NtCurrentTeb()->Peb->FlsBitmap, index, 1 ); + if (ret) + { + /* FIXME: call Fls callback */ + /* FIXME: add equivalent of ThreadZeroTlsCell here */ + if (NtCurrentTeb()->FlsSlots) NtCurrentTeb()->FlsSlots[index] = 0; + } + else SetLastError( ERROR_INVALID_PARAMETER ); + RtlReleasePebLock(); + return TRUE; } /*********************************************************************** @@ -232,10 +278,13 @@ BOOL WINAPI FlsFree( DWORD index ) */ PVOID WINAPI FlsGetValue( DWORD index ) { - FIXME( "%x: stub!\n", index ); - - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return NULL; + if (index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) || !NtCurrentTeb()->FlsSlots) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + SetLastError( ERROR_SUCCESS ); + return NtCurrentTeb()->FlsSlots[index]; } /*********************************************************************** @@ -243,9 +292,18 @@ PVOID WINAPI FlsGetValue( DWORD index ) */ BOOL WINAPI FlsSetValue( DWORD index, PVOID data ) { - - FIXME( "%x, %p: stub!\n", index, data ); - - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + if (index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!NtCurrentTeb()->FlsSlots && + !(NtCurrentTeb()->FlsSlots = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) * sizeof(void*) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + NtCurrentTeb()->FlsSlots[index] = data; + return TRUE; }

1 0

Alistair Leslie-Hughes : msxml3: Implemented IXMLDOMText substringData.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: a7c9fbc65cc2ecf38ee4becfcd074fe2ae1fc9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c9fbc65cc2ecf38ee4becfc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 29 22:39:30 2008 +1100 msxml3: Implemented IXMLDOMText substringData. --- dlls/msxml3/tests/domdoc.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/text.c | 41 +++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 23fb1f3..bf4046b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -592,6 +592,52 @@ static void test_domdoc( void ) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); SysFreeString(str); + /* test substringData */ + r = IXMLDOMText_substringData(nodetext, 0, 4, NULL); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, -1, 4, &str); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid offset */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, 30, 0, &str); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, 0, -1, &str); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Invalid size */ + str = (BSTR)&szElement; + r = IXMLDOMText_substringData(nodetext, 2, 0, &str); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( str == NULL, "incorrect string\n"); + + /* test substringData - Start of string */ + r = IXMLDOMText_substringData(nodetext, 0, 4, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("This") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - Middle of string */ + r = IXMLDOMText_substringData(nodetext, 13, 4, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("test") ), "incorrect substringData string\n"); + SysFreeString(str); + + /* test substringData - End of string */ + r = IXMLDOMText_substringData(nodetext, 20, 4, &str); + ok(r == S_OK, "ret %08x\n", r ); + ok( !lstrcmpW( str, _bstr_("\\") ), "incorrect substringData string\n"); + SysFreeString(str); + IXMLDOMText_Release( nodetext ); } SysFreeString( str ); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index af91449..4821e63 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -539,8 +539,45 @@ static HRESULT WINAPI domtext_substringData( IXMLDOMText *iface, long offset, long count, BSTR *p) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pContent; + long nLength = 0; + HRESULT hr = S_FALSE; + + TRACE("%p\n", iface); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + if(offset < 0 || count < 0) + return E_INVALIDARG; + + if(count == 0) + return hr; + + pContent = xmlNodeGetContent(pDOMNode->node); + if(pContent) + { + nLength = xmlStrlen(pContent); + + if( offset < nLength) + { + BSTR sContent = bstr_from_xmlChar(pContent); + if(offset + count > nLength) + *p = SysAllocString(&sContent[offset]); + else + *p = SysAllocStringLen(&sContent[offset], count); + + SysFreeString(sContent); + hr = S_OK; + } + + xmlFree(pContent); + } + + return hr; } static HRESULT WINAPI domtext_appendData(

1 0

Alexandre Julliard : winex11: Avoid accessing the internals of the window structure in the Map/ UnmapNotify handlers.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 5785ee08d06db70d3e187cf31add2739b3a36b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5785ee08d06db70d3e187cf31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 29 13:43:13 2008 +0100 winex11: Avoid accessing the internals of the window structure in the Map/UnmapNotify handlers. --- dlls/winex11.drv/winpos.c | 56 ++++++++++++--------------------------------- 1 files changed, 15 insertions(+), 41 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 4f3c3ad..f1f4111 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -440,7 +440,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - WND *win; int state; if (!(data = X11DRV_get_win_data( hwnd ))) return; @@ -454,20 +453,13 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) } state = get_window_wm_state( event->xmap.display, data ); - if (state != NormalState) - { - TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); - return; - } - data->iconic = FALSE; - - if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) == (WS_VISIBLE|WS_MINIMIZE)) + if (state == NormalState) { int x, y; unsigned int width, height, border, depth; Window root, top; + WINDOWPLACEMENT wp; RECT rect; - LONG style = WS_VISIBLE; /* FIXME: hack */ wine_tsx11_lock(); @@ -482,17 +474,18 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); X11DRV_X_to_window_rect( data, &rect ); - if (!(win = WIN_GetPtr( hwnd ))) return; - if (win->flags & WIN_RESTORE_MAX) style |= WS_MAXIMIZE; - WIN_SetStyle( hwnd, style, WS_MINIMIZE ); - WIN_ReleasePtr( win ); + wp.length = sizeof(wp); + wp.flags = 0; + wp.showCmd = SW_RESTORE; + wp.rcNormalPosition = rect; - SendMessageW( hwnd, WM_SHOWWINDOW, SW_RESTORE, 0 ); + TRACE( "restoring win %p/%lx\n", hwnd, data->whole_window ); + data->iconic = FALSE; data->lock_changes++; - SetWindowPos( hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED | SWP_STATECHANGED ); + SetWindowPlacement( hwnd, &wp ); data->lock_changes--; } + else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); } @@ -502,40 +495,21 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - WND *win; int state; if (!(data = X11DRV_get_win_data( hwnd ))) return; if (!data->managed || !data->mapped) return; state = get_window_wm_state( event->xunmap.display, data ); - if (state != IconicState) + if (state == IconicState) { - TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); - return; - } - data->iconic = TRUE; - - if (!(win = WIN_GetPtr( hwnd ))) return; - - if ((win->dwStyle & WS_VISIBLE) && X11DRV_is_window_rect_mapped( &win->rectWindow )) - { - if (win->dwStyle & WS_MAXIMIZE) - win->flags |= WIN_RESTORE_MAX; - else if (!(win->dwStyle & WS_MINIMIZE)) - win->flags &= ~WIN_RESTORE_MAX; - - WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); - WIN_ReleasePtr( win ); - - EndMenu(); - SendMessageW( hwnd, WM_SHOWWINDOW, SW_MINIMIZE, 0 ); + TRACE( "minimizing win %p/%lx\n", hwnd, data->whole_window ); + data->iconic = TRUE; data->lock_changes++; - SetWindowPos( hwnd, 0, 0, 0, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), - SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_STATECHANGED ); + ShowWindow( hwnd, SW_MINIMIZE ); data->lock_changes--; } - else WIN_ReleasePtr( win ); + else TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); } struct desktop_resize_data

1 0

Alexandre Julliard : winex11: Avoid depending on win.h.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 7af2a9a902e5ce3fb818c8a306c49b8ffc9262ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af2a9a902e5ce3fb818c8a30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 29 13:44:55 2008 +0100 winex11: Avoid depending on win.h. --- dlls/winex11.drv/desktop.c | 1 - dlls/winex11.drv/keyboard.c | 1 - dlls/winex11.drv/mouse.c | 1 - dlls/winex11.drv/window.c | 3 --- dlls/winex11.drv/winpos.c | 1 - dlls/winex11.drv/x11drv.h | 7 +++++++ 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 96d050a..1699318 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -22,7 +22,6 @@ #include <X11/cursorfont.h> #include <X11/Xlib.h> -#include "win.h" #include "x11drv.h" /* avoid conflict with field names in included win32 headers */ diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b5f7261..33640db 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -45,7 +45,6 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "win.h" #include "x11drv.h" #include "wine/server.h" #include "wine/unicode.h" diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 189ca7b..736c5d9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -41,7 +41,6 @@ MAKE_FUNCPTR(XcursorImageLoadCursor); #include "winbase.h" #include "wine/winuser16.h" -#include "win.h" #include "x11drv.h" #include "wine/server.h" #include "wine/library.h" diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2f6e8a1..d454b9b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -46,7 +46,6 @@ #include "xcomposite.h" #include "wine/debug.h" #include "wine/server.h" -#include "win.h" #include "mwm.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -70,8 +69,6 @@ static const char managed_prop[] = "__wine_x11_managed"; extern int usexcomposite; -extern void WIN_invalidate_dce( HWND hwnd, const RECT *rect ); /* FIXME: to be removed */ - /*********************************************************************** * is_window_managed * diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index f1f4111..4e96482 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -33,7 +33,6 @@ #include "wine/wingdi16.h" #include "x11drv.h" -#include "win.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6ab9f38..526408c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -746,4 +746,11 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name, extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem); +/* FIXME: private functions imported from user32 */ +extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ); +extern BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ); +extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack, + POINT *maxTrack ); +extern void WIN_invalidate_dce( HWND hwnd, const RECT *rect ); + #endif /* __WINE_X11DRV_H */

1 0

Jon Yang : gdiplus: Implemented and tested GdipGetImageDimension().
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 84d260ec60605c0eb1a938b33cc3e8c282740372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d260ec60605c0eb1a938b33… Author: Jon Yang <jyang08(a)ucla.edu> Date: Wed Feb 27 01:36:44 2008 -0800 gdiplus: Implemented and tested GdipGetImageDimension(). --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 31 +++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 55fabe4..a2d3183 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -283,7 +283,7 @@ @ stdcall GdipGetImageBounds(ptr ptr ptr) @ stub GdipGetImageDecoders @ stub GdipGetImageDecodersSize -@ stub GdipGetImageDimension +@ stdcall GdipGetImageDimension(ptr ptr ptr) @ stub GdipGetImageEncoders @ stub GdipGetImageEncodersSize @ stub GdipGetImageFlags diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b08c5e5..0fe7dfe 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -463,6 +463,37 @@ GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, return Ok; } +GpStatus WINGDIPAPI GdipGetImageDimension(GpImage *image, REAL *width, + REAL *height) +{ + if(!image || !height || !width) + return InvalidParameter; + + if(image->type == ImageTypeMetafile){ + HDC hdc = GetDC(0); + + *height = convert_unit(hdc, ((GpMetafile*)image)->unit) * + ((GpMetafile*)image)->bounds.Height; + + *width = convert_unit(hdc, ((GpMetafile*)image)->unit) * + ((GpMetafile*)image)->bounds.Width; + + ReleaseDC(0, hdc); + } + + else if(image->type == ImageTypeBitmap){ + *height = ((GpBitmap*)image)->height; + *width = ((GpBitmap*)image)->width; + } + else{ + *height = ipicture_pixel_height(image->picture); + *width = ipicture_pixel_width(image->picture); + } + + TRACE("returning (%f, %f)\n", *height, *width); + return Ok; +} + GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, GpGraphics **graphics) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0364962..d0959e5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -21,6 +21,7 @@ #include "windows.h" #include "gdiplus.h" #include "wine/test.h" +#include <math.h> #define expect(expected, got) ok(((UINT)got) == ((UINT)expected), "Expected %.8x, got %.8x\n", (UINT)expected, (UINT)got) @@ -73,6 +74,37 @@ static void test_Scan0(void) expect(0xdeadbeef, bm); } +static void test_GetImageDimension(void) +{ + GpBitmap *bm; + GpStatus stat; + const REAL WIDTH = 10.0, HEIGHT = 20.0; + REAL w,h; + + bm = (GpBitmap*)0xdeadbeef; + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB,NULL, &bm); + expect(Ok,stat); + ok((GpBitmap*)0xdeadbeef != bm, "Expected bitmap to not be 0xdeadbeef\n"); + ok(NULL != bm, "Expected bitmap to not be NULL\n"); + + stat = GdipGetImageDimension(NULL,&w,&h); + expect(InvalidParameter, stat); + + stat = GdipGetImageDimension((GpImage*)bm,NULL,&h); + expect(InvalidParameter, stat); + + stat = GdipGetImageDimension((GpImage*)bm,&w,NULL); + expect(InvalidParameter, stat); + + w = -1; + h = -1; + stat = GdipGetImageDimension((GpImage*)bm,&w,&h); + expect(Ok, stat); + ok(fabs(WIDTH - w) < 0.0001, "Width wrong"); + ok(fabs(HEIGHT - h) < 0.0001, "Height wrong"); + GdipDisposeImage((GpImage*)bm); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -86,6 +118,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_Scan0(); + test_GetImageDimension(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index caf3532..1f635ba 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -114,6 +114,7 @@ GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipGetCompositingMode(GpGraphics*,CompositingMode*); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); +GpStatus WINGDIPAPI GdipGetImageDimension(GpImage*,REAL*,REAL*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*);

1 0

Rob Shearman : inetcomm: Add default case to sub_stream_Seek to avoid using uninitialised memory.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: c9b588b88b6eca08b69d6709116d670042a3a6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b588b88b6eca08b69d67091… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:25:13 2008 +0000 inetcomm: Add default case to sub_stream_Seek to avoid using uninitialised memory. --- dlls/inetcomm/mimeole.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index e986e7f..3ee7281 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1225,6 +1225,8 @@ static HRESULT WINAPI sub_stream_Seek( case STREAM_SEEK_END: new_pos.QuadPart = This->length.QuadPart + dlibMove.QuadPart; break; + default: + return STG_E_INVALIDFUNCTION; } if(new_pos.QuadPart < 0) new_pos.QuadPart = 0;

1 0

Detlef Riekenberg : winspool: Implement Level 9 for GetPrinter.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 81dadcb1a1435894dbffb604a61012c3db08b08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=81dadcb1a1435894dbffb604a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Feb 28 21:46:17 2008 +0100 winspool: Implement Level 9 for GetPrinter. --- dlls/winspool.drv/info.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index af02b9e..7622582 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4032,6 +4032,43 @@ static BOOL WINSPOOL_GetPrinter_7(HKEY hkeyPrinter, PRINTER_INFO_7W *pi7, LPBYTE return space; } +/********************************************************************* + * WINSPOOL_GetPrinter_9 + * + * Fills out a PRINTER_INFO_9A|W struct storing the strings in buf. + * The strings are either stored as unicode or ascii. + */ +static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE buf, + DWORD cbBuf, LPDWORD pcbNeeded, BOOL unicode) +{ + DWORD size; + BOOL space = (cbBuf > 0); + + *pcbNeeded = 0; + + if(WINSPOOL_GetDevModeFromReg(hkeyPrinter, Default_DevModeW, buf, cbBuf, &size, unicode)) { + if(space && size <= cbBuf) { + pi9->pDevMode = (LPDEVMODEW)buf; + } else + space = FALSE; + *pcbNeeded += size; + } + else + { + WINSPOOL_GetDefaultDevMode(buf, cbBuf, &size, unicode); + if(space && size <= cbBuf) { + pi9->pDevMode = (LPDEVMODEW)buf; + } else + space = FALSE; + *pcbNeeded += size; + } + + if(!space && pi9) /* zero out pi9 if we can't completely fill buf */ + memset(pi9, 0, sizeof(*pi9)); + + return space; +} + /***************************************************************************** * WINSPOOL_GetPrinter * @@ -4166,6 +4203,26 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, } + case 9: + { + PRINTER_INFO_9W *pi9 = (PRINTER_INFO_9W *)pPrinter; + + size = sizeof(PRINTER_INFO_9W); + if(size <= cbBuf) { + ptr = pPrinter + size; + cbBuf -= size; + memset(pPrinter, 0, size); + } else { + pi9 = NULL; + cbBuf = 0; + } + + ret = WINSPOOL_GetPrinter_9(hkeyPrinter, pi9, ptr, cbBuf, &needed, unicode); + needed += size; + break; + } + + default: FIXME("Unimplemented level %d\n", Level); SetLastError(ERROR_INVALID_LEVEL);

1 0

Rob Shearman : Include config.h and wine/port.h in files that use snprintf.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 5dd2f1efa83aa2f131511898c047091e6fd4520f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd2f1efa83aa2f131511898c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:24:58 2008 +0000 Include config.h and wine/port.h in files that use snprintf. --- dlls/dbghelp/pe_module.c | 2 ++ dlls/dmband/dmutils.c | 9 ++++++--- dlls/dmcompos/dmcompos_main.c | 3 +++ dlls/dmime/dmutils.c | 9 ++++++--- dlls/dmloader/debug.c | 5 ++++- dlls/dmscript/dmscript_main.c | 3 +++ dlls/dmsynth/dmsynth_main.c | 3 +++ dlls/dmusic/dmusic_main.c | 3 +++ dlls/dswave/dswave_main.c | 3 +++ dlls/rpcrt4/cpsf.c | 3 +++ dlls/tapi32/assisted.c | 3 +++ 11 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index c072a24..ca40417 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -22,6 +22,8 @@ */ #include "config.h" +#include "wine/port.h" + #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 495ea3d..a126513 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -17,13 +17,16 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - + +#define COBJMACROS + +#include "config.h" +#include "wine/port.h" + #include <stdio.h> #include <stdarg.h> #include <string.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 5d21544..36244de 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include "dmcompos_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index a3117f7..edcd121 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -17,13 +17,16 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - + +#define COBJMACROS + +#include "config.h" +#include "wine/port.h" + #include <stdio.h> #include <stdarg.h> #include <string.h> -#define COBJMACROS - #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index fd21a57..dbd8129 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -16,7 +16,10 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - + +#include "config.h" +#include "wine/port.h" + #include "dmloader_private.h" /* check whether the given DWORD is even (return 0) or odd (return 1) */ diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 383bf90..6b6bbcd 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include "dmscript_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmscript); diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index f144119..372bee5 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdio.h> #include "dmsynth_private.h" diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 2b62998..c4a231c 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdio.h> #include "dmusic_private.h" diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a66f1be..2a951ab 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdio.h> #include "dswave_private.h" diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index dcf3721..23c4aeb 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 6b4ed02..27a0c4c 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include <stdio.h> #include "windef.h"

1 0

Rob Shearman : kernel32: Fix typo in UTUnRegister.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 8d2af8e3f3b8bae70f0e5bc35819e4f33bfcb41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d2af8e3f3b8bae70f0e5bc35… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:12:10 2008 +0000 kernel32: Fix typo in UTUnRegister. --- dlls/kernel32/utthunk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/utthunk.c b/dlls/kernel32/utthunk.c index 55ff733..a1889fa 100644 --- a/dlls/kernel32/utthunk.c +++ b/dlls/kernel32/utthunk.c @@ -304,7 +304,7 @@ VOID WINAPI UTUnRegister( HMODULE hModule ) RtlAcquirePebLock(); ut = UTFind( hModule ); - if ( !ut ) + if ( ut ) { hModule16 = ut->hModule16; UTFree( ut );

1 0

Rob Shearman : quartz: Don' t assume that strlenW of a constant string can be determined at compile time .
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 1c0122d14e8dd3e4d54678b9538aba1aadfaba3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c0122d14e8dd3e4d54678b95… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Feb 29 11:12:32 2008 +0000 quartz: Don't assume that strlenW of a constant string can be determined at compile time. Use sizeof instead to calculate the size of wszKeyName in FilterMapper2_CreateCategory. --- dlls/quartz/filtermapper.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 8b7cf7d..eeba0b1 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +#define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) + /* Unexposed IAMFilterData interface */ typedef struct IAMFilterData IAMFilterData; @@ -311,7 +313,7 @@ static HRESULT WINAPI FilterMapper2_CreateCategory( { LPWSTR wClsidAMCat = NULL; LPWSTR wClsidCategory = NULL; - WCHAR wszKeyName[strlenW(wszClsidSlash) + strlenW(wszSlashInstance) + (CHARS_IN_GUID-1) * 2 + 1]; + WCHAR wszKeyName[ARRAYSIZE(wszClsidSlash)-1 + ARRAYSIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; HKEY hKey = NULL; LONG lRet; HRESULT hr;

1 0