March 2008 - Wine-commits - list.winehq.org

Huw Davies : ole32: Fix CopyTo to work correctly with LARGE_INTEGERs.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 0aedac346aaabfc1d78cd8c678f1cd3c48e74ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aedac346aaabfc1d78cd8c67… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 6 12:05:52 2008 +0000 ole32: Fix CopyTo to work correctly with LARGE_INTEGERs. --- dlls/ole32/hglobalstream.c | 41 +++++++++++------------------------------ 1 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 2175214..68a1527 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -467,24 +467,16 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo( TRACE("(%p, %p, %d, %p, %p)\n", iface, pstm, cb.u.LowPart, pcbRead, pcbWritten); - /* - * Sanity check - */ if ( pstm == 0 ) return STG_E_INVALIDPOINTER; - totalBytesRead.u.LowPart = totalBytesRead.u.HighPart = 0; - totalBytesWritten.u.LowPart = totalBytesWritten.u.HighPart = 0; + totalBytesRead.QuadPart = 0; + totalBytesWritten.QuadPart = 0; - /* - * use stack to store data temporarly - * there is surely more performant way of doing it, for now this basic - * implementation will do the job - */ - while ( cb.u.LowPart > 0 ) + while ( cb.QuadPart > 0 ) { - if ( cb.u.LowPart >= 128 ) - copySize = 128; + if ( cb.QuadPart >= sizeof(tmpBuffer) ) + copySize = sizeof(tmpBuffer); else copySize = cb.u.LowPart; @@ -492,7 +484,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo( if (FAILED(hr)) break; - totalBytesRead.u.LowPart += bytesRead; + totalBytesRead.QuadPart += bytesRead; if (bytesRead) { @@ -500,29 +492,18 @@ static HRESULT WINAPI HGLOBALStreamImpl_CopyTo( if (FAILED(hr)) break; - totalBytesWritten.u.LowPart += bytesWritten; + totalBytesWritten.QuadPart += bytesWritten; } if (bytesRead!=copySize) - cb.u.LowPart = 0; + cb.QuadPart = 0; else - cb.u.LowPart -= bytesRead; + cb.QuadPart -= bytesRead; } - /* - * Update number of bytes read and written - */ - if (pcbRead) - { - pcbRead->u.LowPart = totalBytesRead.u.LowPart; - pcbRead->u.HighPart = totalBytesRead.u.HighPart; - } + if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart; + if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart; - if (pcbWritten) - { - pcbWritten->u.LowPart = totalBytesWritten.u.LowPart; - pcbWritten->u.HighPart = totalBytesWritten.u.HighPart; - } return hr; }

1 0

Rob Shearman : mshtml: Move some public GUIDs to shlguid.h.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 3b0ea978fddc6d12740ffe712927d829702da2fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0ea978fddc6d12740ffe712… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:01:17 2008 +0000 mshtml: Move some public GUIDs to shlguid.h. --- dlls/mshtml/main.c | 4 +--- include/shlguid.h | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1c81c36..e69672f 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -36,6 +36,7 @@ #include "advpub.h" #include "shlwapi.h" #include "optary.h" +#include "shlguid.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -326,15 +327,12 @@ HRESULT WINAPI ShowHTMLDialog(HWND hwndParent, IMoniker *pMk, VARIANT *pvarArgIn return E_NOTIMPL; } -DEFINE_GUID(CLSID_CAnchorBrowsePropertyPage, 0x3050F3BB, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CBackgroundPropertyPage, 0x3050F232, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDAnchorPropertyPage, 0x3050F1FC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDGenericPropertyPage, 0x3050F17F, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -DEFINE_GUID(CLSID_CDocBrowsePropertyPage, 0x3050F3B4, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CDwnBindInfo, 0x3050F3C2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CHiFiUses, 0x5AAF51B3, 0xB1F0, 0x11D1, 0xB6,0xAB, 0x00,0xA0,0xC9,0x08,0x33,0xE9); DEFINE_GUID(CLSID_CHtmlComponentConstructor, 0x3050F4F8, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -DEFINE_GUID(CLSID_CImageBrowsePropertyPage, 0x3050F3B3, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CInlineStylePropertyPage, 0x3050F296, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CPeerHandler, 0x5AAF51B2, 0xB1F0, 0x11D1, 0xB6,0xAB, 0x00,0xA0,0xC9,0x08,0x33,0xE9); DEFINE_GUID(CLSID_CRecalcEngine, 0x3050F499, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/include/shlguid.h b/include/shlguid.h index 503f4fc..23cce28 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -148,5 +148,8 @@ DEFINE_GUID(FMTID_Displaced, 0x9b174b33, 0x40ff, 0x11d2, 0xa2, 0x7e, 0x0, 0xc0, #define PID_DISPLACED_FROM 2 #define PID_DISPLACED_DATE 3 +DEFINE_GUID(CLSID_CAnchorBrowsePropertyPage, 0x3050F3BB, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_CDocBrowsePropertyPage, 0x3050F3B4, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); +DEFINE_GUID(CLSID_CImageBrowsePropertyPage, 0x3050F3B3, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); #endif /* __WINE_SHLGUID_H */

1 0

Rob Shearman : user32: Add test for calling CreateDesktop on already created desktop name.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 38a541186a6dd8e6a5721526416cdca0ffd7546e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a541186a6dd8e6a57215264… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:01:48 2008 +0000 user32: Add test for calling CreateDesktop on already created desktop name. --- dlls/user32/tests/winstation.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index ac49d4a..16a1c93 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -220,6 +220,12 @@ static void test_handles(void) ok( !CloseWindowStation( (HWINSTA)d2 ), "CloseWindowStation succeeded on desktop\n" ); ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + d3 = CreateDesktop( "foobar", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + ok( d3 != 0, "create foobar desktop again failed\n" ); + ok( GetLastError() == 0xdeadbeef, "bad last error %d\n", GetLastError() ); + ok( CloseDesktop( d3 ), "CloseDesktop failed\n" ); + d3 = OpenDesktop( "foobar", 0, TRUE, DESKTOP_ALL_ACCESS ); ok( d3 != 0, "open foobar desktop failed\n" ); ok( d3 != d2, "open foobar desktop returned same handle\n" );

1 0

Rob Shearman : uuid: Add CLSID_InProcFreeMarshaler.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 630e273d17d63eaec8ab08c31056c731553fb2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630e273d17d63eaec8ab08c31… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:02:00 2008 +0000 uuid: Add CLSID_InProcFreeMarshaler. Remove its initialisation from ole32. --- dlls/ole32/compobj_private.h | 1 - dlls/uuid/uuid.c | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 34d4cdb..5a954b9 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -43,7 +43,6 @@ typedef struct apartment APARTMENT; DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 ); -DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 ); /* signal to stub manager that this is a rem unknown object */ #define MSHLFLAGSP_REMUNKNOWN 0x80000000 diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index b00a2a7..3fc97ee 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -102,3 +102,4 @@ DEFINE_GUID(CLSID_ComBinding, 0x00000328,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);

1 0

Francois Gouget : port: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 63040e4d90e5de7b6420ab1490680cc98f4490d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63040e4d90e5de7b6420ab149… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 6 12:35:33 2008 +0100 port: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined. --- libs/port/getopt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/getopt.c b/libs/port/getopt.c index 7bcf279..be82779 100644 --- a/libs/port/getopt.c +++ b/libs/port/getopt.c @@ -77,7 +77,7 @@ #ifdef VMS # include <unixlib.h> -# if HAVE_STRING_H - 0 +# ifdef HAVE_STRING_H # include <string.h> # endif #endif

1 0

Francois Gouget : configure: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 9e67edfc1661f961767e26e1d4a1b063ba032996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e67edfc1661f961767e26e1d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 6 12:34:48 2008 +0100 configure: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined. --- configure | 28 ++++++++++++++-------------- configure.ac | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/configure b/configure index efd7008..7be6eb1 100755 --- a/configure +++ b/configure @@ -7309,7 +7309,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_PARAM_H + #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif @@ -7378,13 +7378,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif @@ -7446,13 +7446,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif #ifdef HAVE_NETINET_TCP_H @@ -7520,7 +7520,7 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> #endif - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -7582,13 +7582,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif - #if HAVE_ARPA_NAMESER_H + #ifdef HAVE_ARPA_NAMESER_H # include <arpa/nameser.h> #endif @@ -7709,7 +7709,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> -#if HAVE_UCONTEXT_H +#ifdef HAVE_UCONTEXT_H #include <ucontext.h> #endif @@ -13644,8 +13644,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if HAVE_FT2BUILD_H - #include <ft2build.h> +#ifdef HAVE_FT2BUILD_H + # include <ft2build.h> #endif #include <$ac_header> diff --git a/configure.ac b/configure.ac index b23a586..3234493 100644 --- a/configure.ac +++ b/configure.ac @@ -329,31 +329,31 @@ dnl **** Checks for headers that depend on other ones **** AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, [#include <sys/types.h> - #if HAVE_SYS_PARAM_H + #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #endif]) AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h netipx/ipx.h],,, [#include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif]) AC_CHECK_HEADERS([netinet/tcp_var.h],,, [#include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_SYS_SOCKETVAR_H + #ifdef HAVE_SYS_SOCKETVAR_H # include <sys/socketvar.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif #ifdef HAVE_NETINET_TCP_H @@ -365,19 +365,19 @@ AC_CHECK_HEADERS([linux/ipx.h],,, #ifdef HAVE_ASM_TYPES_H # include <asm/types.h> #endif - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif]) AC_CHECK_HEADERS([resolv.h],,, [#include <sys/types.h> - #if HAVE_SYS_SOCKET_H + #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif - #if HAVE_NETINET_IN_H + #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif - #if HAVE_ARPA_NAMESER_H + #ifdef HAVE_ARPA_NAMESER_H # include <arpa/nameser.h> #endif]) @@ -385,7 +385,7 @@ AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>]) AC_CHECK_HEADERS([sys/thr.h],,, [#include <sys/types.h> -#if HAVE_UCONTEXT_H +#ifdef HAVE_UCONTEXT_H #include <ucontext.h> #endif]) @@ -969,8 +969,8 @@ then freetype/ftwinfnt.h \ freetype/ftmodapi.h \ freetype/internal/sfnt.h,,, - [#if HAVE_FT2BUILD_H - #include <ft2build.h> + [#ifdef HAVE_FT2BUILD_H + # include <ft2build.h> #endif]) AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h> #include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,

1 0

Francois Gouget : ws2_32: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: f5ea0fd2e47f30991a9aef9d75eca42d5b350c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ea0fd2e47f30991a9aef9d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 6 12:33:25 2008 +0100 ws2_32: s/#if/#ifdef/ so it still works if HAVE_XXX is not defined. --- dlls/ws2_32/socket.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 502f309..a06aabf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3390,7 +3390,7 @@ static int convert_eai_u2w(int unixret) { */ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addrinfo *hints, struct WS_addrinfo **res) { -#if HAVE_GETADDRINFO +#ifdef HAVE_GETADDRINFO struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; @@ -3507,7 +3507,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) { -#if HAVE_GETNAMEINFO +#ifdef HAVE_GETNAMEINFO int ret; union generic_unix_sockaddr sa_u; unsigned int size;

1 0

Ethan Chen : gdiplus: Implemented GdipCreateBitmapFromFileICM.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: e0552c1bc6a24a54310f8e58904c7a3d8792a26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0552c1bc6a24a54310f8e589… Author: Ethan Chen <echen(a)thunder-08-L> Date: Tue Mar 4 19:22:01 2008 -0800 gdiplus: Implemented GdipCreateBitmapFromFileICM. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 7 +++++++ include/gdiplusflat.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b4f314a..6e28a0e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -72,7 +72,7 @@ @ stub GdipCreateAdjustableArrowCap @ stub GdipCreateBitmapFromDirectDrawSurface @ stdcall GdipCreateBitmapFromFile(wstr ptr) -@ stub GdipCreateBitmapFromFileICM +@ stdcall GdipCreateBitmapFromFileICM(wstr ptr) @ stub GdipCreateBitmapFromGdiDib @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) @ stub GdipCreateBitmapFromHBITMAP diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 96db406..a5b6ef8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -250,6 +250,13 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, return stat; } +/* FIXME: no icm */ +GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR* filename, + GpBitmap **bitmap) +{ + return GdipCreateBitmapFromFile(filename, bitmap); +} + GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1f635ba..b787ab3 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -249,6 +249,7 @@ GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,INT*, GpStatus WINGDIPAPI GdipConvertToEmfPlusToFile(const GpGraphics*,GpMetafile*,INT*,const WCHAR*,EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipConvertToEmfPlusToStream(const GpGraphics*,GpMetafile*,INT*,IStream*,EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); +GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**);

1 0

Francois Gouget : ddk: Add a stub ntddk.h header.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: ae9411089ab5e1d6df7b5bfaf776d3957d1fcf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9411089ab5e1d6df7b5bfaf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 6 13:27:39 2008 +0100 ddk: Add a stub ntddk.h header. --- include/Makefile.in | 1 + include/ddk/ntddk.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 73d1cb0..287cfa9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -135,6 +135,7 @@ SRCDIR_INCLUDES = \ ddk/imm.h \ ddk/mountmgr.h \ ddk/ntddcdvd.h \ + ddk/ntddk.h \ ddk/ntddser.h \ ddk/ntddtape.h \ ddk/wdm.h \ diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h new file mode 100644 index 0000000..47b6b1e --- /dev/null +++ b/include/ddk/ntddk.h @@ -0,0 +1,49 @@ +/* + * Copyright 2008 Francois Gouget 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 + */ + +#ifndef _NTDDK_ +#define _NTDDK_ + +/* Note: We will probably have to duplicate everything ultimately :-( */ +#include <ddk/wdm.h> + +#include <excpt.h> +/* FIXME: #include <ntdef.h> */ +#include <ntstatus.h> +/* FIXME: #include <bugcodes.h> */ +/* FIXME: #include <ntiologc.h> */ + + +typedef enum _BUS_DATA_TYPE +{ + ConfigurationSpaceUndefined = -1, + Cmos, + EisaConfiguration, + Pos, + CbusConfiguration, + PCIConfiguration, + VMEConfiguration, + NuBusConfiguration, + PCMCIAConfiguration, + MPIConfiguration, + MPSAConfiguration, + PNPISAConfiguration, + MaximumBusDataType +} BUS_DATA_TYPE, *PBUS_DATA_TYPE; + +#endif

1 0

Nathan Beckmann : gdiplus: Fix errors in image dimensions.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 66067423d1d8ea6bdb9671845d090a05021cd71e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66067423d1d8ea6bdb9671845… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Thu Mar 6 00:28:04 2008 -0800 gdiplus: Fix errors in image dimensions. --- dlls/gdiplus/image.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5871209..96db406 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -45,8 +45,7 @@ static INT ipicture_pixel_height(IPicture *pic) hdcref = GetDC(0); - y = (UINT)(((REAL)y) * ((REAL)GetDeviceCaps(hdcref, LOGPIXELSY)) / - ((REAL)INCH_HIMETRIC)); + y = MulDiv(y, GetDeviceCaps(hdcref, LOGPIXELSY), INCH_HIMETRIC); ReleaseDC(0, hdcref); return y; @@ -61,8 +60,7 @@ static INT ipicture_pixel_width(IPicture *pic) hdcref = GetDC(0); - x = (UINT)(((REAL)x) * ((REAL)GetDeviceCaps(hdcref, LOGPIXELSX)) / - ((REAL)INCH_HIMETRIC)); + x = MulDiv(x, GetDeviceCaps(hdcref, LOGPIXELSX), INCH_HIMETRIC); ReleaseDC(0, hdcref);

1 0