August 2006 - Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Properly handle variable with const value ( ie without location) in dwarf code.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 820acf0901da4be07d5e347d9633de857f6534da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=820acf0901da4be07d5e347… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Aug 3 19:36:10 2006 +0200 dbghelp: Properly handle variable with const value (ie without location) in dwarf code. --- dlls/dbghelp/dwarf.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 01250a5..a618986 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1050,20 +1050,20 @@ static void dwarf2_parse_variable(dwarf2 dwarf2_debug_info_t* di) { struct symt* param_type; - union attribute loc; + union attribute name, loc, value; BOOL is_pmt = di->abbrev->tag == DW_TAG_formal_parameter; TRACE("%s, for %s\n", dwarf2_debug_ctx(subpgm->ctx), dwarf2_debug_di(di)); param_type = dwarf2_lookup_type(subpgm->ctx, di); - if (dwarf2_find_attribute(di, DW_AT_location, &loc)) + dwarf2_find_name(subpgm->ctx, di, &name, "parameter"); + if (dwarf2_find_attribute(di, DW_AT_location, &loc) && loc.block) { union attribute name; union attribute ext; long offset; int in_reg; - dwarf2_find_name(subpgm->ctx, di, &name, "parameter"); offset = dwarf2_compute_location(subpgm->ctx, loc.block, &in_reg); TRACE("found parameter %s/%ld (reg=%d) at %s\n", name.string, offset, in_reg, dwarf2_debug_ctx(subpgm->ctx)); @@ -1094,6 +1094,10 @@ static void dwarf2_parse_variable(dwarf2 break; } } + if (dwarf2_find_attribute(di, DW_AT_const_value, &value)) + { + FIXME("NIY (const value %08lx for %s\n", value.uvalue, name.string); + } if (is_pmt && subpgm->func && subpgm->func->type) symt_add_function_signature_parameter(subpgm->ctx->module, (struct symt_function_signature*)subpgm->func->type,

1 0

Alexandre Julliard : server: Abstract the epoll functions a bit more.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 2f4072740e7de3710941f0f09757718022053aca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f4072740e7de3710941f0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 19:56:55 2006 +0200 server: Abstract the epoll functions a bit more. --- server/fd.c | 114 ++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 61 insertions(+), 53 deletions(-) diff --git a/server/fd.c b/server/fd.c index 6df422e..02aa88d 100644 --- a/server/fd.c +++ b/server/fd.c @@ -354,10 +354,16 @@ static int active_users; static int allocated_users; /* count of allocated entries in the array */ static struct fd **freelist; /* list of free entries in the array */ +static int get_next_timeout(void); + #ifdef USE_EPOLL static int epoll_fd; -static struct epoll_event *epoll_events; + +static inline void init_epoll(void) +{ + epoll_fd = epoll_create( 128 ); +} /* set the events that epoll waits for on this fd; helper for set_fd_events */ static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) @@ -398,12 +404,61 @@ static inline void set_fd_epoll_events( } } -#else /* USE_EPOLL */ +static inline void remove_epoll_user( struct fd *fd, int user ) +{ + if (epoll_fd == -1) return; -static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) + if (pollfd[user].fd != -1) + { + struct epoll_event dummy; + epoll_ctl( epoll_fd, EPOLL_CTL_DEL, fd->unix_fd, &dummy ); + } +} + +static inline void main_loop_epoll(void) { + int i, ret, timeout; + struct epoll_event events[128]; + + assert( POLLIN == EPOLLIN ); + assert( POLLOUT == EPOLLOUT ); + assert( POLLERR == EPOLLERR ); + assert( POLLHUP == EPOLLHUP ); + + if (epoll_fd == -1) return; + + while (active_users) + { + timeout = get_next_timeout(); + + if (!active_users) break; /* last user removed by a timeout */ + if (epoll_fd == -1) break; /* an error occurred with epoll */ + + ret = epoll_wait( epoll_fd, events, sizeof(events)/sizeof(events[0]), timeout ); + + /* put the events into the pollfd array first, like poll does */ + for (i = 0; i < ret; i++) + { + int user = events[i].data.u32; + pollfd[user].revents = events[i].events; + } + + /* read events from the pollfd array, as set_fd_events may modify them */ + for (i = 0; i < ret; i++) + { + int user = events[i].data.u32; + if (pollfd[user].revents) fd_poll_event( poll_users[user], pollfd[user].revents ); + } + } } +#else /* USE_EPOLL */ + +static inline void init_epoll(void) { } +static inline void set_fd_epoll_events( struct fd *fd, int user, int events ) { } +static inline void remove_epoll_user( struct fd *fd, int user ) { } +static inline void main_loop_epoll(void) { } + #endif /* USE_EPOLL */ @@ -434,16 +489,7 @@ static int add_poll_user( struct fd *fd } poll_users = newusers; pollfd = newpoll; -#ifdef USE_EPOLL - if (!allocated_users) epoll_fd = epoll_create( new_count ); - if (epoll_fd != -1) - { - struct epoll_event *new_events; - if (!(new_events = realloc( epoll_events, new_count * sizeof(*epoll_events) ))) - return -1; - epoll_events = new_events; - } -#endif + if (!allocated_users) init_epoll(); allocated_users = new_count; } ret = nb_users++; @@ -462,13 +508,7 @@ static void remove_poll_user( struct fd assert( user >= 0 ); assert( poll_users[user] == fd ); -#ifdef USE_EPOLL - if (epoll_fd != -1 && pollfd[user].fd != -1) - { - struct epoll_event dummy; - epoll_ctl( epoll_fd, EPOLL_CTL_DEL, fd->unix_fd, &dummy ); - } -#endif + remove_epoll_user( fd, user ); pollfd[user].fd = -1; pollfd[user].events = 0; pollfd[user].revents = 0; @@ -529,40 +569,8 @@ void main_loop(void) { int i, ret, timeout; -#ifdef USE_EPOLL - assert( POLLIN == EPOLLIN ); - assert( POLLOUT == EPOLLOUT ); - assert( POLLERR == EPOLLERR ); - assert( POLLHUP == EPOLLHUP ); - - if (epoll_fd != -1) - { - while (active_users) - { - timeout = get_next_timeout(); - - if (!active_users) break; /* last user removed by a timeout */ - if (epoll_fd == -1) break; /* an error occurred with epoll */ - - ret = epoll_wait( epoll_fd, epoll_events, allocated_users, timeout ); - - /* put the events into the pollfd array first, like poll does */ - for (i = 0; i < ret; i++) - { - int user = epoll_events[i].data.u32; - pollfd[user].revents = epoll_events[i].events; - } - - /* read events from the pollfd array, as set_fd_events may modify them */ - for (i = 0; i < ret; i++) - { - int user = epoll_events[i].data.u32; - if (pollfd[user].revents) fd_poll_event( poll_users[user], pollfd[user].revents ); - } - } - } + main_loop_epoll(); /* fall through to normal poll loop */ -#endif /* USE_EPOLL */ while (active_users) {

1 0

Mikołaj Zalewski : shell32: Add property ids to header files.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 7523fd321a30d04b8e26485fdcb1918aba2d771b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7523fd321a30d04b8e26485… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Aug 3 18:55:52 2006 +0200 shell32: Add property ids to header files. --- include/ntquery.h | 21 +++++++++++++++++++++ include/shlguid.h | 12 ++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/ntquery.h b/include/ntquery.h index ec7e1c2..8ebe074 100644 --- a/include/ntquery.h +++ b/include/ntquery.h @@ -44,4 +44,25 @@ #include <poppack.h> STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); +#define PSGUID_STORAGE {0xb725f130, 0x47ef, 0x101a, {0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac}} +#define PID_STG_DIRECTORY ((PROPID)0x02) +#define PID_STG_CLASSID ((PROPID)0x03) +#define PID_STG_STORAGETYPE ((PROPID)0x04) +#define PID_STG_VOLUME_ID ((PROPID)0x05) +#define PID_STG_PARENT_WORKID ((PROPID)0x06) +#define PID_STG_SECONDARYSTORE ((PROPID)0x07) +#define PID_STG_FILEINDEX ((PROPID)0x08) +#define PID_STG_LASTCHANGEUSN ((PROPID)0x09) +#define PID_STG_NAME ((PROPID)0x0a) +#define PID_STG_PATH ((PROPID)0x0b) +#define PID_STG_SIZE ((PROPID)0x0c) +#define PID_STG_ATTRIBUTES ((PROPID)0x0d) +#define PID_STG_WRITETIME ((PROPID)0x0e) +#define PID_STG_CREATETIME ((PROPID)0x0f) +#define PID_STG_ACCESSTIME ((PROPID)0x10) +#define PID_STG_CHANGETIME ((PROPID)0x11) +#define PID_STG_CONTENTS ((PROPID)0x13) +#define PID_STG_SHORTNAME ((PROPID)0x14) +#define PID_STG_MAX PID_STG_SHORTNAME + #endif diff --git a/include/shlguid.h b/include/shlguid.h index 985aa91..bc25a4b 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -110,6 +110,8 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657 DEFINE_GUID(CLSID_AutoComplete, 0x00bb2763, 0x6a77, 0x11d0, 0xa5, 0x35, 0x00, 0xc0, 0x4f, 0xd7, 0xd0, 0x62); +#define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} +DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); #define PID_FINDDATA 0 #define PID_NETRESOURCE 1 #define PID_DESCRIPTIONID 2 @@ -117,4 +119,14 @@ #define PID_WHICHFOLDER 3 #define PID_NETWORKLOCATION 4 #define PID_COMPUTERNAME 5 +/* Note: PSGUID_STORAGE defined in ntquery.h */ +DEFINE_GUID(FMTID_Storage, 0xb725f130, 0x47ef, 0x101a, 0xa5, 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac); +/* PID_* for FMTID_Storage defined in ntquery.h*/ + +#define PSGUID_DISPLACED {0x9b174b33, 0x40ff, 0x11d2, 0xa2, 0x7e, 0x0, 0xc0, 0x4f, 0xc3, 0x8, 0x71} +DEFINE_GUID(FMTID_Displaced, 0x9b174b33, 0x40ff, 0x11d2, 0xa2, 0x7e, 0x0, 0xc0, 0x4f, 0xc3, 0x8, 0x71); +#define PID_DISPLACED_FROM 2 +#define PID_DISPLACED_DATE 3 + + #endif /* __WINE_SHLGUID_H */

1 0

Francois Gouget : include: Add the ShellFolderViewOC coclass.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 0a81f304605c9ba461a36049515989b5e61fecf2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a81f304605c9ba461a3604… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 3 19:02:21 2006 +0200 include: Add the ShellFolderViewOC coclass. --- include/shldisp.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index b786362..ee72261 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -83,3 +83,13 @@ interface IFolderViewOC : IDispatch { HRESULT SetFolderView( [in] IDispatch *pdisp ); } + +[ + uuid(9ba05971-f6a8-11cf-a442-00a0c90a8f39), + hidden +] +coclass ShellFolderViewOC +{ + [default] interface IFolderViewOC; + [default, source] dispinterface DShellFolderViewEvents; +}

1 0

Dmitry Timoshkov : hlink: Avoid double computation of the string length.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: f740a2806215c43ea6a37b534a1163919409ba63 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f740a2806215c43ea6a37b5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 3 23:39:00 2006 +0900 hlink: Avoid double computation of the string length. --- dlls/hlink/link.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index cce6955..4d3b074 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -72,24 +72,28 @@ static inline HlinkImpl* HlinkImpl_from_ static inline LPWSTR strdupW( LPCWSTR str ) { LPWSTR r; + UINT len; if (!str) return NULL; - r = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(str)+1) * sizeof (WCHAR)); + len = (lstrlenW(str)+1) * sizeof (WCHAR); + r = HeapAlloc(GetProcessHeap(), 0, len); if (r) - lstrcpyW(r, str); + memcpy(r, str, len); return r; } static inline LPWSTR co_strdupW( LPCWSTR str ) { LPWSTR r; + UINT len; if (!str) return NULL; - r = CoTaskMemAlloc((lstrlenW(str)+1) * sizeof (WCHAR)); + len = (lstrlenW(str)+1) * sizeof (WCHAR); + r = CoTaskMemAlloc(len); if (r) - lstrcpyW(r, str); + memcpy(r, str, len); return r; }

1 0

Alexandre Julliard : winex11.drv: Comment out the XCloseDisplay call on process detach.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 145e06040d053aedd7d728071809ac580484f3b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=145e06040d053aedd7d7280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 3 19:29:44 2006 +0200 winex11.drv: Comment out the XCloseDisplay call on process detach. It has a tendency to trigger X11 bugs, and it's not really useful anyway. --- dlls/winex11.drv/init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 651b2b4..b3ee171 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -108,8 +108,8 @@ static void device_init(void) void X11DRV_GDI_Finalize(void) { X11DRV_PALETTE_Cleanup(); - XCloseDisplay( gdi_display ); - gdi_display = NULL; + /* don't bother to close the display, it often triggers X bugs */ + /* XCloseDisplay( gdi_display ); */ } /**********************************************************************

1 0

Benjamin Arai : oleaut32: Conformance test for olefont:OLEFontImpl_IsEqual.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 41641554f4c4563a0c794375bc7ce60d13201c88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=41641554f4c4563a0c79437… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Aug 2 16:47:28 2006 -0700 oleaut32: Conformance test for olefont:OLEFontImpl_IsEqual. --- dlls/oleaut32/tests/olefont.c | 139 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 341ef61..bdc7536 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -473,6 +473,144 @@ static void test_Invoke(void) IFontDisp_Release(fontdisp); } +static void test_IsEqual() +{ + FONTDESC fd; + static const WCHAR system_font[] = { 'S','y','s','t','e','m',0 }; + static const WCHAR arial_font[] = { 'A','r','i','a','l',0 }; + LPVOID pvObj = NULL; + LPVOID pvObj2 = NULL; + IFont* ifnt = NULL; + IFont* ifnt2 = NULL; + HRESULT hres; + + /* Basic font description */ + fd.cbSizeofstruct = sizeof(FONTDESC); + fd.lpstrName = (WCHAR*)system_font; + S(fd.cySize).Lo = 100; + S(fd.cySize).Hi = 100; + fd.sWeight = 0; + fd.sCharset = 0; + fd.fItalic = 0; + fd.fUnderline = 0; + fd.fStrikethrough = 0; + + /* Create font */ + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj); + ifnt = pvObj; + + /* Test equal fonts */ + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + ifnt2 = pvObj2; + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_OK, + "IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08lx\n",hres); + } + IFont_Release(ifnt2); + + /* Check for bad pointer */ + hres = IFont_IsEqual(ifnt,NULL); + todo_wine { + ok(hres == E_POINTER, + "IFont_IsEqual: (NULL) Expected 0x80004003 but got 0x%08lx\n",hres); + } + + /* Test strName */ + fd.lpstrName = (WCHAR*)arial_font; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08lx\n",hres); + } + fd.lpstrName = (WCHAR*)system_font; + IFont_Release(ifnt2); + + /* Test lo font size */ + S(fd.cySize).Lo = 10000; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + ifnt2 = pvObj2; + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (Lo font size) Expected S_FALSE but got 0x%08lx\n",hres); + } + S(fd.cySize).Lo = 100; + IFont_Release(ifnt2); + + /* Test hi font size */ + S(fd.cySize).Hi = 10000; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + ifnt2 = pvObj2; + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (Hi font size) Expected S_FALSE but got 0x%08lx\n",hres); + } + S(fd.cySize).Hi = 100; + IFont_Release(ifnt2); + + /* Test font weight */ + fd.sWeight = 100; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + ifnt2 = pvObj2; + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08lx\n",hres); + } + fd.sWeight = 0; + IFont_Release(ifnt2); + + /* Test charset */ + fd.sCharset = 1; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08lx\n",hres); + } + fd.sCharset = 0; + IFont_Release(ifnt2); + + /* Test italic setting */ + fd.fItalic = 1; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08lx\n",hres); + } + fd.fItalic = 0; + IFont_Release(ifnt2); + + /* Test underline setting */ + fd.fUnderline = 1; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08lx\n",hres); + } + fd.fUnderline = 0; + IFont_Release(ifnt2); + + /* Test strikethrough setting */ + fd.fStrikethrough = 1; + pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + hres = IFont_IsEqual(ifnt,ifnt2); + todo_wine { + ok(hres == S_FALSE, + "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08lx\n",hres); + } + fd.fStrikethrough = 0; + IFont_Release(ifnt2); + + /* Free IFont. */ + IFont_Release(ifnt); +} + START_TEST(olefont) { hOleaut32 = LoadLibraryA("oleaut32.dll"); @@ -496,4 +634,5 @@ START_TEST(olefont) test_font_events_disp(); test_GetIDsOfNames(); test_Invoke(); + test_IsEqual(); }

1 0

Stefan Siebert : oleaut32: GetTypeInfoType - Return TYPE_E_ELEMENTNOTFOUND if index out of bounds.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 9776f5b83fbd30733b1a1f8598f67311c4f50cfc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9776f5b83fbd30733b1a1f8… Author: Stefan Siebert <stefan.siebert(a)web.de> Date: Thu Aug 3 17:54:06 2006 +0200 oleaut32: GetTypeInfoType - Return TYPE_E_ELEMENTNOTFOUND if index out of bounds. --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e648735..d75b665 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3602,6 +3602,9 @@ static HRESULT WINAPI ITypeLib2_fnGetTyp ITypeLibImpl *This = (ITypeLibImpl *)iface; int i; ITypeInfoImpl *pTInfo = This->pTypeInfo; + + if ((ITypeLib2_fnGetTypeInfoCount(iface) < index + 1) || (index < 0)) + return TYPE_E_ELEMENTNOTFOUND; TRACE("(%p) index %d\n", This, index);

1 0

Benjamin Arai : oleaut32: Implement function olefont:OLEFontImpl_IsEqual.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: be37e9510568c5e6afd2ffd7de3a70a42aed5d13 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be37e9510568c5e6afd2ffd… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Aug 2 16:47:48 2006 -0700 oleaut32: Implement function olefont:OLEFontImpl_IsEqual. --- dlls/oleaut32/olefont.c | 33 +++++++++++++++++++++++++++++++-- dlls/oleaut32/tests/olefont.c | 20 -------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index bdde164..ee52a05 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1139,8 +1139,37 @@ static HRESULT WINAPI OLEFontImpl_IsEqua IFont* iface, IFont* pFontOther) { - FIXME("(%p, %p), stub!\n",iface,pFontOther); - return E_NOTIMPL; + OLEFontImpl *left = (OLEFontImpl *)iface; + OLEFontImpl *right = (OLEFontImpl *)pFontOther; + HRESULT hres; + INT left_len,right_len; + + if((iface == NULL) || (pFontOther == NULL)) + return E_POINTER; + else if (left->description.cySize.s.Lo != right->description.cySize.s.Lo) + return S_FALSE; + else if (left->description.cySize.s.Hi != right->description.cySize.s.Hi) + return S_FALSE; + else if (left->description.sWeight != right->description.sWeight) + return S_FALSE; + else if (left->description.sCharset != right->description.sCharset) + return S_FALSE; + else if (left->description.fItalic != right->description.fItalic) + return S_FALSE; + else if (left->description.fUnderline != right->description.fUnderline) + return S_FALSE; + else if (left->description.fStrikethrough != right->description.fStrikethrough) + return S_FALSE; + + /* Check from string */ + left_len = strlenW(left->description.lpstrName); + right_len = strlenW(right->description.lpstrName); + hres = CompareStringW(0,0,left->description.lpstrName, left_len, + right->description.lpstrName, right_len); + if (hres != CSTR_EQUAL) + return S_FALSE; + + return S_OK; } /************************************************************************ diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index bdc7536..bd5fb73 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -503,27 +503,21 @@ static void test_IsEqual() pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_OK, "IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08lx\n",hres); - } IFont_Release(ifnt2); /* Check for bad pointer */ hres = IFont_IsEqual(ifnt,NULL); - todo_wine { ok(hres == E_POINTER, "IFont_IsEqual: (NULL) Expected 0x80004003 but got 0x%08lx\n",hres); - } /* Test strName */ fd.lpstrName = (WCHAR*)arial_font; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08lx\n",hres); - } fd.lpstrName = (WCHAR*)system_font; IFont_Release(ifnt2); @@ -532,10 +526,8 @@ static void test_IsEqual() pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (Lo font size) Expected S_FALSE but got 0x%08lx\n",hres); - } S(fd.cySize).Lo = 100; IFont_Release(ifnt2); @@ -544,10 +536,8 @@ static void test_IsEqual() pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (Hi font size) Expected S_FALSE but got 0x%08lx\n",hres); - } S(fd.cySize).Hi = 100; IFont_Release(ifnt2); @@ -556,10 +546,8 @@ static void test_IsEqual() pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); ifnt2 = pvObj2; hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08lx\n",hres); - } fd.sWeight = 0; IFont_Release(ifnt2); @@ -567,10 +555,8 @@ static void test_IsEqual() fd.sCharset = 1; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08lx\n",hres); - } fd.sCharset = 0; IFont_Release(ifnt2); @@ -578,10 +564,8 @@ static void test_IsEqual() fd.fItalic = 1; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08lx\n",hres); - } fd.fItalic = 0; IFont_Release(ifnt2); @@ -589,10 +573,8 @@ static void test_IsEqual() fd.fUnderline = 1; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08lx\n",hres); - } fd.fUnderline = 0; IFont_Release(ifnt2); @@ -600,10 +582,8 @@ static void test_IsEqual() fd.fStrikethrough = 1; pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); hres = IFont_IsEqual(ifnt,ifnt2); - todo_wine { ok(hres == S_FALSE, "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08lx\n",hres); - } fd.fStrikethrough = 0; IFont_Release(ifnt2);

1 0

Roderick Colenbrander : wined3d: Paletted texture support.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: c0c525d458cfc6e6aaff70a1ec6ecb772ff38986 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0c525d458cfc6e6aaff70a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 3 12:39:04 2006 +0200 wined3d: Paletted texture support. --- dlls/wined3d/surface.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b11dda8..011ee4f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1442,7 +1442,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Relea IWineD3DSurface Internal (No mapping to directx api) parts follow ****************************************************** */ -HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp) { +HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, GLenum *format, GLenum *internal, GLenum *type, CONVERT_TYPES *convert, int *target_bpp) { BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & DDSD_CKSRCBLT); const PixelFormatDesc *formatEntry = getFormatDescEntry(This->resource.format); @@ -1459,7 +1459,10 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceI /* **************** Paletted Texture **************** */ - if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) || colorkey_active) { + /* Use conversion when the paletted texture extension is not available, or when it is available make sure it is used + * for texturing as it won't work for calls like glDraw-/glReadPixels and further also use conversion in case of color keying. + */ + if(!GL_SUPPORT(EXT_PALETTED_TEXTURE) || colorkey_active || (!use_texturing && GL_SUPPORT(EXT_PALETTED_TEXTURE)) ) { *format = GL_RGBA; *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE; @@ -1688,6 +1691,58 @@ HRESULT d3dfmt_convert_surface(BYTE *src return WINED3D_OK; } +/* This function is used in case of 8bit paletted textures to upload the palette. + For now it only supports GL_EXT_paletted_texture extension but support for other + extensions like ARB_fragment_program and ATI_fragment_shaders will be added aswell. +*/ +void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DPaletteImpl* pal = This->palette; + BYTE table[256][4]; + int i; + + if (pal == NULL) { + /* Still no palette? Use the device's palette */ + /* Get the surface's palette */ + for (i = 0; i < 256; i++) { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + table[i][0] = device->palettes[device->currentPalette][i].peRed; + table[i][1] = device->palettes[device->currentPalette][i].peGreen; + table[i][2] = device->palettes[device->currentPalette][i].peBlue; + if ((convert == CONVERT_PALETTED_CK) && + (i >= This->SrcBltCKey.dwColorSpaceLowValue) && + (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { + /* We should maybe here put a more 'neutral' color than the standard bright purple + one often used by application to prevent the nice purple borders when bi-linear + filtering is on */ + table[i][3] = 0x00; + } else { + table[i][3] = 0xFF; + } + } + } else { + TRACE("Using surface palette %p\n", pal); + /* Get the surface's palette */ + for (i = 0; i < 256; i++) { + table[i][0] = pal->palents[i].peRed; + table[i][1] = pal->palents[i].peGreen; + table[i][2] = pal->palents[i].peBlue; + if ((convert == CONVERT_PALETTED_CK) && + (i >= This->SrcBltCKey.dwColorSpaceLowValue) && + (i <= This->SrcBltCKey.dwColorSpaceHighValue)) { + /* We should maybe here put a more 'neutral' color than the standard bright purple + one often used by application to prevent the nice purple borders when bi-linear + filtering is on */ + table[i][3] = 0x00; + } else { + table[i][3] = 0xFF; + } + } + } + GL_EXTCALL(glColorTableEXT(GL_TEXTURE_2D,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table)); +} + static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -1810,7 +1865,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp This->glCKey = This->SrcBltCKey; } else This->Flags &= ~SFLAG_GLCKEY; - d3dfmt_get_conv(This, TRUE /* We need color keying */, &format, &internal, &type, &convert, &bpp); + d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp); if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { int width = This->glRect.right - This->glRect.left; @@ -1832,6 +1887,15 @@ static HRESULT WINAPI IWineD3DSurfaceImp glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch); This->Flags |= SFLAG_CONVERTED; + } else if(This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) { + int pitch = IWineD3DSurface_GetPitch(iface); + d3dfmt_p8_upload_palette(iface, convert); + + /* Make sure the correct pitch is used */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, pitch); + + This->Flags &= ~SFLAG_CONVERTED; + mem = This->resource.allocatedMemory; } else { This->Flags &= ~SFLAG_CONVERTED; mem = This->resource.allocatedMemory;

1 0