November 2009 - Wine-Commits

Francois Gouget : gdi32: Make wglCreateContextAttribsARB() static.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 4874d84ac165343cea6651d148bf5642cbeb764a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4874d84ac165343cea6651d14… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 24 11:02:14 2009 +0100 gdi32: Make wglCreateContextAttribsARB() static. --- dlls/gdi32/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 0be4037..9193fc5 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -107,7 +107,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc) /*********************************************************************** * wglCreateContextAttribsARB */ -HGLRC WINAPI wglCreateContextAttribsARB(HDC hdc, HGLRC hShareContext, const int *attributeList) +static HGLRC WINAPI wglCreateContextAttribsARB(HDC hdc, HGLRC hShareContext, const int *attributeList) { HGLRC ret = 0; DC * dc = get_dc_ptr( hdc );

1 0

Paul Vriens : snmpapi/tests: Fix a crash on some 64bit systems.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 2cde60421177dc82f3efb1d9ac3bf251b6a54abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cde60421177dc82f3efb1d9a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 24 13:33:28 2009 +0100 snmpapi/tests: Fix a crash on some 64bit systems. --- dlls/snmpapi/tests/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 64c7501..908d5e2 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -424,7 +424,7 @@ static void test_SnmpUtilOidAppend(void) static AsnObjectIdentifier oid1; static AsnObjectIdentifier oid2 = { 3, ids2 }; - ids1 = HeapAlloc(GetProcessHeap(), 0, 3 * sizeof(UINT)); + ids1 = SnmpUtilMemAlloc(3 * sizeof(UINT)); ids1[0] = 1; ids1[1] = 2; ids1[2] = 3; @@ -451,7 +451,7 @@ static void test_SnmpUtilOidAppend(void) ok(!memcmp(&oid1.ids[3], ids2, 3 * sizeof(UINT)), "SnmpUtilOidAppend failed\n"); - HeapFree(GetProcessHeap(), 0, ids1); + SnmpUtilOidFree(&oid1); } static void test_SnmpUtilVarBindCpyFree(void)

1 0

Alexandre Julliard : quartz: Implemented a number of the MediaPosition methods.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: a3fbb3929949f96c35b692f3f184487aaf9082a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3fbb3929949f96c35b692f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 13:13:56 2009 +0100 quartz: Implemented a number of the MediaPosition methods. --- dlls/quartz/filtergraph.c | 87 +++++++++++++++++++++++++++++--------------- 1 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d978f72..5377281 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2557,28 +2557,33 @@ static const IMediaSeekingVtbl IMediaSeeking_VTable = MediaSeeking_GetPreroll }; +static inline IFilterGraphImpl *impl_from_IMediaPosition( IMediaPosition *iface ) +{ + return (IFilterGraphImpl *)((char*)iface - FIELD_OFFSET(IFilterGraphImpl, IMediaPosition_vtbl)); +} + /*** IUnknown methods ***/ -static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static HRESULT WINAPI MediaPosition_QueryInterface(IMediaPosition* iface, REFIID riid, void** ppvObj) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); - return Filtergraph_QueryInterface(This, riid, ppvObj); } -static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static ULONG WINAPI MediaPosition_AddRef(IMediaPosition *iface) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); TRACE("(%p/%p)->()\n", This, iface); - return Filtergraph_AddRef(This); } -static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); TRACE("(%p/%p)->()\n", This, iface); - return Filtergraph_Release(This); } @@ -2604,31 +2609,51 @@ static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdM } /*** IMediaPosition methods ***/ -static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength){ - FIXME("(%p)->(%p) stub!\n", iface, plength); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength) +{ + LONGLONG duration; + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + HRESULT hr = IMediaSeeking_GetDuration( (IMediaSeeking *)&This->IMediaSeeking_vtbl, &duration ); + if (SUCCEEDED(hr)) *plength = duration; + return hr; } -static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime){ - ICOM_THIS_MULTI(IFilterGraphImpl, IMediaPosition_vtbl, iface); +static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG reftime = llTime; - return IMediaSeeking_SetPositions((IMediaSeeking *)&This->IMediaSeeking_vtbl, &reftime, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + return IMediaSeeking_SetPositions((IMediaSeeking *)&This->IMediaSeeking_vtbl, + &reftime, AM_SEEKING_AbsolutePositioning, + NULL, AM_SEEKING_NoPositioning); } -static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, REFTIME *pllTime){ - FIXME("(%p)->(%p) stub!\n", iface, pllTime); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, REFTIME *pllTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + LONGLONG pos; + HRESULT hr = IMediaSeeking_GetCurrentPosition( (IMediaSeeking *)&This->IMediaSeeking_vtbl, &pos ); + if (SUCCEEDED(hr)) *pllTime = pos; + return hr; } -static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime){ - FIXME("(%p)->(%p) stub!\n", iface, pllTime); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + LONGLONG pos; + HRESULT hr = IMediaSeeking_GetStopPosition( (IMediaSeeking *)&This->IMediaSeeking_vtbl, &pos ); + if (SUCCEEDED(hr)) *pllTime = pos; + return hr; } -static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime){ - FIXME("(%p)->(%f) stub!\n", iface, llTime); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + LONGLONG reftime = llTime; + + return IMediaSeeking_SetPositions((IMediaSeeking *)&This->IMediaSeeking_vtbl, + NULL, AM_SEEKING_NoPositioning, + &reftime, AM_SEEKING_AbsolutePositioning); } static HRESULT WINAPI MediaPosition_get_PrerollTime(IMediaPosition * iface, REFTIME *pllTime){ @@ -2641,14 +2666,16 @@ static HRESULT WINAPI MediaPosition_put_PrerollTime(IMediaPosition * iface, REFT return E_NOTIMPL; } -static HRESULT WINAPI MediaPosition_put_Rate(IMediaPosition * iface, double dRate){ - FIXME("(%p)->(%f) stub!\n", iface, dRate); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_put_Rate(IMediaPosition * iface, double dRate) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + return IMediaSeeking_SetRate((IMediaSeeking *)&This->IMediaSeeking_vtbl, dRate); } -static HRESULT WINAPI MediaPosition_get_Rate(IMediaPosition * iface, double *pdRate){ - FIXME("(%p)->(%p) stub!\n", iface, pdRate); - return E_NOTIMPL; +static HRESULT WINAPI MediaPosition_get_Rate(IMediaPosition * iface, double *pdRate) +{ + IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); + return IMediaSeeking_GetRate((IMediaSeeking *)&This->IMediaSeeking_vtbl, pdRate); } static HRESULT WINAPI MediaPosition_CanSeekForward(IMediaPosition * iface, LONG *pCanSeekForward){

1 0

Andrew Nguyen : msvcrt: Forward _ftol2_sse to ntdll._ftol.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: be21b3dfa7ad3388f4dbb1f035c42e6e5d4bd181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be21b3dfa7ad3388f4dbb1f03… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Nov 24 04:52:29 2009 -0600 msvcrt: Forward _ftol2_sse to ntdll._ftol. --- dlls/msvcrt/msvcrt.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 92d1731..c6c749d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -271,6 +271,7 @@ @ cdecl _ftime32(ptr) MSVCRT__ftime32 @ cdecl _ftime64(ptr) MSVCRT__ftime64 @ cdecl -ret64 _ftol() ntdll._ftol +@ cdecl -ret64 _ftol2_sse() ntdll._ftol #FIXME: SSE variant should be implemented @ cdecl _fullpath(ptr str long) @ cdecl _futime(long ptr) @ cdecl _futime32(long ptr)

1 0

Francois Gouget : gdi32/tests: Make test_CreateFontIndirect() static.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: d442a48e2a5f2a89ee69ca1c3b78a39552451995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d442a48e2a5f2a89ee69ca1c3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 24 11:02:10 2009 +0100 gdi32/tests: Make test_CreateFontIndirect() static. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 08ceb85..c3e193a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2977,7 +2977,7 @@ static void test_GetTextMetrics2(const char *fontname, int font_height) ok(ratio >= 90 && ratio <= 110, "expected width/height ratio 90-110, got %d\n", ratio); } -void test_CreateFontIndirect(void) +static void test_CreateFontIndirect(void) { LOGFONTA lf, getobj_lf; int ret, i;

1 0

Francois Gouget : msxml3: Make some functions static in node.c.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: e98719f79ebc60ff041aa29f0951346d219b350b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98719f79ebc60ff041aa29f0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 24 11:02:06 2009 +0100 msxml3: Make some functions static in node.c. --- dlls/msxml3/node.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index eadd4e9..ed6c8c6 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -946,14 +946,14 @@ static HRESULT WINAPI xmlnode_get_definition( static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); -inline BYTE hex_to_byte(xmlChar c) +static inline BYTE hex_to_byte(xmlChar c) { if(c <= '9') return c-'0'; if(c <= 'F') return c-'A'+10; return c-'a'+10; } -inline BYTE base64_to_byte(xmlChar c) +static inline BYTE base64_to_byte(xmlChar c) { if(c == '+') return 62; if(c == '/') return 63; @@ -962,7 +962,7 @@ inline BYTE base64_to_byte(xmlChar c) return c-'a'+26; } -inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) +static inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) { if(!type || !lstrcmpiW(type, szString) || !lstrcmpiW(type, szNumber) || !lstrcmpiW(type, szUUID))

1 0

Albert Lee : server: Support event ports on Solaris.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 01b972d63905a42688e8b8ce8f9ed5cf65e2d731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b972d63905a42688e8b8ce8… Author: Albert Lee <trisk(a)forkgnu.org> Date: Fri Nov 20 18:35:26 2009 -0500 server: Support event ports on Solaris. --- configure | 2 + configure.ac | 2 + include/config.h.in | 6 +++ server/fd.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 15652b4..5893216 100755 --- a/configure +++ b/configure @@ -5727,6 +5727,7 @@ for ac_header in \ openssl/ssl.h \ png.h \ poll.h \ + port.h \ process.h \ pthread.h \ pwd.h \ @@ -12109,6 +12110,7 @@ for ac_func in \ pipe2 \ poll \ popen \ + port_create \ prctl \ pread \ pwrite \ diff --git a/configure.ac b/configure.ac index a5f1b8a..9a382f3 100644 --- a/configure.ac +++ b/configure.ac @@ -364,6 +364,7 @@ AC_CHECK_HEADERS(\ openssl/ssl.h \ png.h \ poll.h \ + port.h \ process.h \ pthread.h \ pwd.h \ @@ -1709,6 +1710,7 @@ AC_CHECK_FUNCS(\ pipe2 \ poll \ popen \ + port_create \ prctl \ pread \ pwrite \ diff --git a/include/config.h.in b/include/config.h.in index 16b2e90..7a77d1f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -591,6 +591,12 @@ /* Define to 1 if you have the `popen' function. */ #undef HAVE_POPEN +/* Define to 1 if you have the `port_create' function. */ +#undef HAVE_PORT_CREATE + +/* Define to 1 if you have the <port.h> header file. */ +#undef HAVE_PORT_H + /* Define if we can use ppdev.h for parallel port access */ #undef HAVE_PPDEV diff --git a/server/fd.c b/server/fd.c index 9d2ac9d..9d8a06f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -162,6 +162,10 @@ static inline int epoll_wait( int epfd, struct epoll_event *events, int maxevent #endif /* linux && __i386__ && HAVE_STDINT_H */ +#if defined(HAVE_PORT_H) && defined(HAVE_PORT_CREATE) +# include <port.h> +# define USE_EVENT_PORTS +#endif /* HAVE_PORT_H && HAVE_PORT_CREATE */ /* Because of the stupid Posix locking semantics, we need to keep * track of all file descriptors referencing a given file, and not @@ -676,6 +680,107 @@ static inline void main_loop_epoll(void) } } +#elif defined(USE_EVENT_PORTS) + +static int port_fd = -1; + +static inline void init_epoll(void) +{ + port_fd = port_create(); +} + +static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) +{ + int ret; + + if (port_fd == -1) return; + + if (events == -1) /* stop waiting on this fd completely */ + { + if (pollfd[user].fd == -1) return; /* already removed */ + port_dissociate( port_fd, PORT_SOURCE_FD, fd->unix_fd ); + } + else if (pollfd[user].fd == -1) + { + if (pollfd[user].events) return; /* stopped waiting on it, don't restart */ + ret = port_associate( port_fd, PORT_SOURCE_FD, fd->unix_fd, events, (void *)user ); + } + else + { + if (pollfd[user].events == events) return; /* nothing to do */ + ret = port_associate( port_fd, PORT_SOURCE_FD, fd->unix_fd, events, (void *)user ); + } + + if (ret == -1) + { + if (errno == ENOMEM) /* not enough memory, give up on port_associate */ + { + close( port_fd ); + port_fd = -1; + } + else perror( "port_associate" ); /* should not happen */ + } +} + +static inline void remove_epoll_user( struct fd *fd, int user ) +{ + if (port_fd == -1) return; + + if (pollfd[user].fd != -1) + { + port_dissociate( port_fd, PORT_SOURCE_FD, fd->unix_fd ); + } +} + +static inline void main_loop_epoll(void) +{ + int i, nget, ret, timeout; + port_event_t events[128]; + + if (port_fd == -1) return; + + while (active_users) + { + timeout = get_next_timeout(); + nget = 1; + + if (!active_users) break; /* last user removed by a timeout */ + if (port_fd == -1) break; /* an error occurred with event completion */ + + if (timeout != -1) + { + struct timespec ts; + + ts.tv_sec = timeout / 1000; + ts.tv_nsec = (timeout % 1000) * 1000000; + ret = port_getn( port_fd, events, sizeof(events)/sizeof(events[0]), &nget, &ts ); + } + else ret = port_getn( port_fd, events, sizeof(events)/sizeof(events[0]), &nget, NULL ); + + if (ret == -1) break; /* an error occurred with event completion */ + + set_current_time(); + + /* put the events into the pollfd array first, like poll does */ + for (i = 0; i < nget; i++) + { + long user = (long)events[i].portev_user; + pollfd[user].revents = events[i].portev_events; + } + + /* read events from the pollfd array, as set_fd_events may modify them */ + for (i = 0; i < nget; i++) + { + long user = (long)events[i].portev_user; + if (pollfd[user].revents) fd_poll_event( poll_users[user], pollfd[user].revents ); + /* if we are still interested, reassociate the fd */ + if (pollfd[user].fd != -1) { + port_associate( port_fd, PORT_SOURCE_FD, pollfd[user].fd, pollfd[user].events, (void *)user ); + } + } + } +} + #else /* HAVE_KQUEUE */ static inline void init_epoll(void) { }

1 0

Alexandre Julliard : kernel32/tests: Specify the correct machine for the fake dll file.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: ac572be030ba410271499e1addbff014db8da22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac572be030ba410271499e1ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 12:45:22 2009 +0100 kernel32/tests: Specify the correct machine for the fake dll file. --- dlls/kernel32/tests/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3d0e258..3cc9022 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1644,7 +1644,15 @@ static BOOL create_fake_dll( LPCSTR filename ) nt = (IMAGE_NT_HEADERS *)(buffer + lfanew); nt->Signature = IMAGE_NT_SIGNATURE; +#if defined __i386__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; +#elif defined __x86_64__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; +#elif defined __powerpc__ + nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; +#else +# error You must specify the machine type +#endif nt->FileHeader.NumberOfSections = 1; nt->FileHeader.SizeOfOptionalHeader = IMAGE_SIZEOF_NT_OPTIONAL_HEADER; nt->FileHeader.Characteristics = IMAGE_FILE_DLL | IMAGE_FILE_EXECUTABLE_IMAGE;

1 0

Gregor Schneider : msvcrt: Calculate floating point decimals in internally used long double precision .
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 2043035e1749e40e23853d751ac1410d39fc8d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2043035e1749e40e23853d751… Author: Gregor Schneider <grschneider(a)gmail.com> Date: Mon Nov 23 21:09:02 2009 +0100 msvcrt: Calculate floating point decimals in internally used long double precision. --- dlls/msvcrt/scanf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3eb705b..953c133 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -266,7 +266,7 @@ _FUNCTION_ { } /* handle decimals */ if (width!=0 && nch == '.') { - float dec = 1; + long double dec = 1; nch = _GETC_(file); if (width>0) width--; while (width!=0 && (nch!=_EOF_) && _ISDIGIT_(nch)) {

1 0

Alexandre Julliard : wing: Reimplement support for WinGGetDIBPointer16.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 92cd5a5c6bae3cd018187f6b1df01eeb74e6e152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cd5a5c6bae3cd018187f6b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 10:58:55 2009 +0100 wing: Reimplement support for WinGGetDIBPointer16. --- dlls/wing.dll16/wing.c | 83 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 63 insertions(+), 20 deletions(-) diff --git a/dlls/wing.dll16/wing.c b/dlls/wing.dll16/wing.c index 750c8da..fb4aa56 100644 --- a/dlls/wing.dll16/wing.c +++ b/dlls/wing.dll16/wing.c @@ -27,10 +27,64 @@ #include "wingdi.h" #include "wownt32.h" #include "wine/wingdi16.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wing); +struct dib_segptr_bits +{ + struct list entry; + HBITMAP bmp; + WORD sel; + WORD count; +}; + +static struct list dib_segptr_list = LIST_INIT( dib_segptr_list ); + +/* remove saved bits for bitmaps that no longer exist */ +static void cleanup_segptr_bits(void) +{ + unsigned int i; + struct dib_segptr_bits *bits, *next; + + LIST_FOR_EACH_ENTRY_SAFE( bits, next, &dib_segptr_list, struct dib_segptr_bits, entry ) + { + if (GetObjectType( bits->bmp ) == OBJ_BITMAP) continue; + for (i = 0; i < bits->count; i++) FreeSelector16( bits->sel + (i << __AHSHIFT) ); + list_remove( &bits->entry ); + HeapFree( GetProcessHeap(), 0, bits ); + } +} + +static SEGPTR alloc_segptr_bits( HBITMAP bmp, void *bits32 ) +{ + DIBSECTION dib; + unsigned int i, size; + struct dib_segptr_bits *bits; + + cleanup_segptr_bits(); + + if (!(bits = HeapAlloc( GetProcessHeap(), 0, sizeof(*bits) ))) return 0; + + GetObjectW( bmp, sizeof(dib), &dib ); + size = dib.dsBm.bmHeight * dib.dsBm.bmWidthBytes; + + /* calculate number of sel's needed for size with 64K steps */ + bits->bmp = bmp; + bits->count = (size + 0xffff) / 0x10000; + bits->sel = AllocSelectorArray16( bits->count ); + + for (i = 0; i < bits->count; i++) + { + SetSelectorBase(bits->sel + (i << __AHSHIFT), (DWORD)bits32 + i * 0x10000); + SetSelectorLimit16(bits->sel + (i << __AHSHIFT), size - 1); /* yep, limit is correct */ + size -= 0x10000; + } + list_add_head( &dib_segptr_list, &bits->entry ); + return MAKESEGPTR( bits->sel, 0 ); +} + /************************************************************************* * WING {WING} * @@ -127,25 +181,8 @@ HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi, SEGPTR *bits) hbitmap = CreateDIBSection( HDC_32(hdc), bmpi, BI_RGB, &bits32, 0, 0 ); if (hbitmap) { - DIBSECTION dib; - DWORD size; - WORD count, sel; - int i; - - GetObjectW( hbitmap, sizeof(dib), &dib ); - size = dib.dsBm.bmHeight * dib.dsBm.bmWidthBytes; - - /* calculate number of sel's needed for size with 64K steps */ - count = (size + 0xffff) / 0x10000; - sel = AllocSelectorArray16(count); - - for (i = 0; i < count; i++) - { - SetSelectorBase(sel + (i << __AHSHIFT), (DWORD)bits32 + i * 0x10000); - SetSelectorLimit16(sel + (i << __AHSHIFT), size - 1); /* yep, limit is correct */ - size -= 0x10000; - } - if (bits) *bits = MAKESEGPTR( sel, 0 ); + SEGPTR segptr = alloc_segptr_bits( hbitmap, bits32 ); + if (bits) *bits = segptr; } return HBITMAP_16(hbitmap); } @@ -155,7 +192,13 @@ HBITMAP16 WINAPI WinGCreateBitmap16(HDC16 hdc, BITMAPINFO *bmpi, SEGPTR *bits) */ SEGPTR WINAPI WinGGetDIBPointer16(HBITMAP16 hWinGBitmap, BITMAPINFO* bmpi) { - FIXME("%x, %p: not supported\n", hWinGBitmap, bmpi ); + struct dib_segptr_bits *bits; + + if (bmpi) FIXME( "%04x %p: setting BITMAPINFO not supported\n", hWinGBitmap, bmpi ); + + LIST_FOR_EACH_ENTRY( bits, &dib_segptr_list, struct dib_segptr_bits, entry ) + if (HBITMAP_16(bits->bmp) == hWinGBitmap) return MAKESEGPTR( bits->sel, 0 ); + return 0; }

1 0