October 2007 - Wine-Commits

Luke Bratch : winecfg: Add more keyboard shortcuts.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 77f00dd7094c705e7716f7ce8d452f06015945f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f00dd7094c705e7716f7ce8… Author: Luke Bratch <l_bratch(a)yahoo.co.uk> Date: Mon Oct 1 18:22:05 2007 +0100 winecfg: Add more keyboard shortcuts. --- programs/winecfg/En.rc | 62 ++++++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77f00dd7094c705e7716f…

1 0

Chris Spencer : wine.inf: Create psapi.dll as a fake dll.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 3e76083bd1feeb15b7f2fc4a38550124ed268af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e76083bd1feeb15b7f2fc4a3… Author: Chris Spencer <spencercw(a)googlemail.com> Date: Mon Oct 1 17:34:55 2007 +0100 wine.inf: Create psapi.dll as a fake dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index cfad301..2676f16 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2230,6 +2230,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,olepro32.dll 11,,opengl32.dll 11,,progman.exe +11,,psapi.dll 11,,quartz.dll 11,,regsvr32.exe 11,,riched20.dll

1 0

Dmitry Timoshkov : gdi32: Prefer a Microsoft cmap table over other platform ones.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 5b8f591192d3d841653f27aba7e585800a578690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8f591192d3d841653f27aba… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 2 12:04:25 2007 +0900 gdi32: Prefer a Microsoft cmap table over other platform ones. --- dlls/gdi32/freetype.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6036f48..f3c76da 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -170,6 +170,7 @@ MAKE_FUNCPTR(FT_Outline_Get_Bitmap); MAKE_FUNCPTR(FT_Outline_Transform); MAKE_FUNCPTR(FT_Outline_Translate); MAKE_FUNCPTR(FT_Select_Charmap); +MAKE_FUNCPTR(FT_Set_Charmap); MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FT_Vector_Transform); static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); @@ -2045,6 +2046,7 @@ BOOL WineEngInit(void) LOAD_FUNCPTR(FT_Outline_Transform) LOAD_FUNCPTR(FT_Outline_Translate) LOAD_FUNCPTR(FT_Select_Charmap) + LOAD_FUNCPTR(FT_Set_Charmap) LOAD_FUNCPTR(FT_Set_Pixel_Sizes) LOAD_FUNCPTR(FT_Vector_Transform) @@ -2720,6 +2722,61 @@ static BOOL create_child_font_list(GdiFont *font) return ret; } +static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding) +{ + FT_Error ft_err = FT_Err_Invalid_CharMap_Handle; + + if (pFT_Set_Charmap) + { + FT_Int i; + FT_CharMap cmap0, cmap1, cmap2, cmap3, cmap_def; + + cmap0 = cmap1 = cmap2 = cmap3 = cmap_def = NULL; + + for (i = 0; i < ft_face->num_charmaps; i++) + { + if (ft_face->charmaps[i]->encoding == encoding) + { + TRACE("found cmap with platform_id %u, encoding_id %u\n", + ft_face->charmaps[i]->platform_id, ft_face->charmaps[i]->encoding_id); + + switch (ft_face->charmaps[i]->platform_id) + { + default: + cmap_def = ft_face->charmaps[i]; + break; + case 0: /* Apple Unicode */ + cmap0 = ft_face->charmaps[i]; + break; + case 1: /* Macintosh */ + cmap1 = ft_face->charmaps[i]; + break; + case 2: /* ISO */ + cmap2 = ft_face->charmaps[i]; + break; + case 3: /* Microsoft */ + cmap3 = ft_face->charmaps[i]; + break; + } + } + + if (cmap3) /* prefer Microsoft cmap table */ + ft_err = pFT_Set_Charmap(ft_face, cmap3); + else if (cmap1) + ft_err = pFT_Set_Charmap(ft_face, cmap1); + else if (cmap2) + ft_err = pFT_Set_Charmap(ft_face, cmap2); + else if (cmap0) + ft_err = pFT_Set_Charmap(ft_face, cmap0); + else if (cmap_def) + ft_err = pFT_Set_Charmap(ft_face, cmap_def); + } + return ft_err == FT_Err_Ok; + } + + return pFT_Select_Charmap(ft_face, encoding) == FT_Err_Ok; +} + /************************************************************* * WineEngCreateFontInstance * @@ -3007,14 +3064,14 @@ found: ret->ntmFlags = face->ntmFlags; if (ret->charset == SYMBOL_CHARSET && - !pFT_Select_Charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) { + select_charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) { /* No ops */ } - else if (!pFT_Select_Charmap(ret->ft_face, FT_ENCODING_UNICODE)) { + else if (select_charmap(ret->ft_face, FT_ENCODING_UNICODE)) { /* No ops */ } else { - pFT_Select_Charmap(ret->ft_face, FT_ENCODING_APPLE_ROMAN); + select_charmap(ret->ft_face, FT_ENCODING_APPLE_ROMAN); } ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0;

1 0

Juan Lang : crypt32: Don' t check decoded length against encoded length for indefinite-form sequences .
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 5b0928771397ff3d2fc07dda14499ce2eef8ad96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0928771397ff3d2fc07dda1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 1 16:04:34 2007 -0700 crypt32: Don't check decoded length against encoded length for indefinite-form sequences. --- dlls/crypt32/decode.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 082c28a..7bba04b 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -467,10 +467,14 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], { DWORD lenBytes = GET_LEN_BYTES(pbEncoded[1]), cbDecoded; const BYTE *ptr = pbEncoded + 1 + lenBytes; + BOOL indefinite = FALSE; cbEncoded -= 1 + lenBytes; if (dataLen == CMSG_INDEFINITE_LENGTH) + { dataLen = cbEncoded; + indefinite = TRUE; + } else if (cbEncoded < dataLen) { TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, @@ -501,7 +505,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], cbDecoded += 2; } } - if (ret && cbDecoded != dataLen) + if (ret && !indefinite && cbDecoded != dataLen) { TRACE("expected %d decoded, got %d, failing\n", dataLen, cbDecoded);

1 0

Louis Lenders : faultrep: Add stub for ReportFault.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 127fd82a9b7122cc204c5ab7031844c4c7080ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=127fd82a9b7122cc204c5ab70… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 1 22:22:29 2007 +0100 faultrep: Add stub for ReportFault. --- dlls/faultrep/faultrep.c | 9 +++++++++ dlls/faultrep/faultrep.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index 3a04754..365f143 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -102,6 +102,15 @@ BOOL WINAPI AddERExcludedApplicationA(LPCSTR lpAppFileName) return ret; } +/************************************************************************* + * ReportFault [FAULTREP.@] + */ +EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS pep, DWORD dwOpt) +{ + FIXME("%p 0x%x stub\n", pep, dwOpt); + return frrvOk; +} + /*********************************************************************** * DllMain. */ diff --git a/dlls/faultrep/faultrep.spec b/dlls/faultrep/faultrep.spec index 77a2827..77e543f 100644 --- a/dlls/faultrep/faultrep.spec +++ b/dlls/faultrep/faultrep.spec @@ -4,7 +4,7 @@ @ stub CreateMinidumpW @ stub ReportEREvent @ stub ReportEREventDW -@ stub ReportFault +@ stdcall ReportFault(ptr long) @ stub ReportFaultDWM @ stub ReportFaultFromQueue @ stub ReportFaultToQueue

1 0

Gerald Pfeifer : mshtml: Removed unused function get_child_text_node().
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 47032fd07c1e94548e00fcf0433f446e5e1046e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47032fd07c1e94548e00fcf04… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 29 17:04:12 2007 +0200 mshtml: Removed unused function get_child_text_node(). --- dlls/mshtml/editor.c | 65 -------------------------------------------------- 1 files changed, 0 insertions(+), 65 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 000299a..239bba5 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -385,71 +385,6 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsIDOMDocument_Release(nsdoc); } -static BOOL is_visible_text_node(nsIDOMNode *node) -{ - nsIDOMCharacterData *char_data; - nsAString data_str; - LPCWSTR data, ptr; - PRUint32 len; - - nsIDOMNode_QueryInterface(node, &IID_nsIDOMCharacterData, (void**)&char_data); - - nsIDOMCharacterData_GetLength(char_data, &len); - - nsAString_Init(&data_str, NULL); - nsIDOMCharacterData_GetData(char_data, &data_str); - nsAString_GetData(&data_str, &data, NULL); - - if(*data == '\n') { - len--; - for(ptr=data+1; ptr && isspaceW(*ptr); ptr++) - len--; - } - - nsAString_Finish(&data_str); - - nsIDOMCharacterData_Release(char_data); - - return len != 0; -} - -static nsIDOMNode *get_child_text_node(nsIDOMNode *node, BOOL first) -{ - nsIDOMNode *iter, *iter2; - - if(first) - nsIDOMNode_GetFirstChild(node, &iter); - else - nsIDOMNode_GetLastChild(node, &iter); - - while(iter) { - PRUint16 node_type; - - nsIDOMNode_GetNodeType(iter, &node_type); - switch(node_type) { - case TEXT_NODE: - if(is_visible_text_node(iter)) - return iter; - case ELEMENT_NODE: - iter2 = get_child_text_node(iter, first); - if(iter2) { - nsIDOMNode_Release(iter); - return iter2; - } - } - - if(first) - nsIDOMNode_GetNextSibling(iter, &iter2); - else - nsIDOMNode_GetPreviousSibling(iter, &iter2); - - nsIDOMNode_Release(iter); - iter = iter2; - } - - return NULL; -} - static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char * const cmds[4]) { int i=0;

1 0

Gerald Pfeifer : winex11.drv: Move X11DRV_XRender_Installed under #ifdef SONAME_LIBXRENDER.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: fe534ddde1e975d06340a4f64ea4053a7ed34f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe534ddde1e975d06340a4f64… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 29 17:04:55 2007 +0200 winex11.drv: Move X11DRV_XRender_Installed under #ifdef SONAME_LIBXRENDER. --- dlls/winex11.drv/xrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c792eff..b768ed8 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -36,13 +36,14 @@ #include "wine/unicode.h" #include "wine/debug.h" -static BOOL X11DRV_XRender_Installed = FALSE; int using_client_side_fonts = FALSE; WINE_DEFAULT_DEBUG_CHANNEL(xrender); #ifdef SONAME_LIBXRENDER +static BOOL X11DRV_XRender_Installed = FALSE; + #include <X11/Xlib.h> #include <X11/extensions/Xrender.h>

1 0

Gerald Pfeifer : kernel32: Fix types for the FreeBSD implementation of GlobalMemoryStatusEx().
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 9498ada7a2de5bd37fe22d30dbade7bc4e488dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9498ada7a2de5bd37fe22d30d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 29 16:02:02 2007 +0200 kernel32: Fix types for the FreeBSD implementation of GlobalMemoryStatusEx(). --- dlls/kernel32/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 9375a2e..c3598af 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1206,7 +1206,8 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) FILE *f; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) unsigned long val; - int size_sys, mib[2]; + int mib[2]; + size_t size_sys; #elif defined(__APPLE__) unsigned int val; int mib[2];

1 0

Gerald Pfeifer : kernel32: Fix signedess for FreeBSD-specific implementation of GetSystemInfo().
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: d328c07bd3344ec8b63a90b3c5f84e719d51468f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d328c07bd3344ec8b63a90b3c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Sep 29 15:50:28 2007 +0200 kernel32: Fix signedess for FreeBSD-specific implementation of GetSystemInfo(). --- dlls/kernel32/cpu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 7567af5..c7d366e 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -641,7 +641,8 @@ VOID WINAPI GetSystemInfo( } #elif defined(__FreeBSD__) { - int ret, len, num; + int ret, num; + unsigned len; get_cpuinfo( &cachedsi );

1 0

Andrew Talbot : ole32: Fix some memory leaks.
by Alexandre Julliard Oct. 2, 2007

Oct. 2, 2007

Module: wine Branch: master Commit: 001d36b10e452fc2e7a90e1a4a265e33dbeb85af URL: http://source.winehq.org/git/wine.git/?a=commit;h=001d36b10e452fc2e7a90e1a4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 1 20:17:29 2007 +0100 ole32: Fix some memory leaks. --- dlls/ole32/compositemoniker.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index c49e9b8..825a2ab 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -1813,12 +1813,16 @@ CompositeMonikerImpl_Construct(IMoniker** ppMoniker, if (++This->tabLastIndex==This->tabSize){ + LPVOID tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); - if (This->tabMoniker==NULL) + if (This->tabMoniker==NULL){ + HeapFree(GetProcessHeap(), 0, tab_moniker); + HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; + } } } @@ -1862,13 +1866,17 @@ CompositeMonikerImpl_Construct(IMoniker** ppMoniker, /* resize tabMoniker if needed */ if (This->tabLastIndex==This->tabSize){ + LPVOID tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); - if (This->tabMoniker==NULL) - return E_OUTOFMEMORY; + if (This->tabMoniker==NULL){ + HeapFree(GetProcessHeap(), 0, tab_moniker); + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } } } else{ @@ -1901,13 +1909,17 @@ CompositeMonikerImpl_Construct(IMoniker** ppMoniker, } if (This->tabLastIndex==This->tabSize){ + LPVOID tab_moniker = This->tabMoniker; This->tabSize+=BLOCK_TAB_SIZE; This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker)); - if (This->tabMoniker==NULL) + if (This->tabMoniker==NULL){ + HeapFree(GetProcessHeap(), 0, tab_moniker); + HeapFree(GetProcessHeap(), 0, This); return E_OUTOFMEMORY; + } } }

1 0