April 2012 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use return_nsstr helper in HTMLElement object implementation.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 29fbc70267059289d5d81823dd461c207ab27d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fbc70267059289d5d81823d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:02:31 2012 +0200 mshtml: Use return_nsstr helper in HTMLElement object implementation. --- dlls/mshtml/htmlelem.c | 72 ++++++----------------------------------------- dlls/mshtml/htmlelem2.c | 28 ++++------------- 2 files changed, 16 insertions(+), 84 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1baf9e2..02a49d2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -352,7 +352,6 @@ static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) HTMLElement *This = impl_from_IHTMLElement(iface); nsAString class_str; nsresult nsres; - HRESULT hres = S_OK; TRACE("(%p)->(%p)\n", This, p); @@ -363,20 +362,7 @@ static HRESULT WINAPI HTMLElement_get_className(IHTMLElement *iface, BSTR *p) nsAString_Init(&class_str, NULL); nsres = nsIDOMHTMLElement_GetClassName(This->nselem, &class_str); - - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *class; - nsAString_GetData(&class_str, &class); - *p = *class ? SysAllocString(class) : NULL; - }else { - ERR("GetClassName failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&class_str); - - TRACE("className=%s\n", debugstr_w(*p)); - return hres; + return return_nsstr(nsres, &class_str, p); } static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v) @@ -404,34 +390,24 @@ static HRESULT WINAPI HTMLElement_put_id(IHTMLElement *iface, BSTR v) static HRESULT WINAPI HTMLElement_get_id(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - const PRUnichar *id; nsAString id_str; nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - - if(!This->nselem) + if(!This->nselem) { + *p = NULL; return S_OK; + } nsAString_Init(&id_str, NULL); nsres = nsIDOMHTMLElement_GetId(This->nselem, &id_str); - nsAString_GetData(&id_str, &id); - - if(NS_FAILED(nsres)) - ERR("GetId failed: %08x\n", nsres); - else if(*id) - *p = SysAllocString(id); - - nsAString_Finish(&id_str); - return S_OK; + return return_nsstr(nsres, &id_str, p); } static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - const PRUnichar *tag; nsAString tag_str; nsresult nsres; @@ -443,21 +419,12 @@ static HRESULT WINAPI HTMLElement_get_tagName(IHTMLElement *iface, BSTR *p) WARN("NULL nselem, assuming comment\n"); *p = SysAllocString(comment_tagW); - return S_OK; + return *p ? S_OK : E_OUTOFMEMORY; } nsAString_Init(&tag_str, NULL); nsres = nsIDOMHTMLElement_GetTagName(This->nselem, &tag_str); - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&tag_str, &tag); - *p = SysAllocString(tag); - }else { - ERR("GetTagName failed: %08x\n", nsres); - *p = NULL; - } - nsAString_Finish(&tag_str); - - return S_OK; + return return_nsstr(nsres, &tag_str, p); } static HRESULT WINAPI HTMLElement_get_parentElement(IHTMLElement *iface, IHTMLElement **p) @@ -787,17 +754,7 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) nsAString_Init(&title_str, NULL); nsres = nsIDOMHTMLElement_GetTitle(This->nselem, &title_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *title; - - nsAString_GetData(&title_str, &title); - *p = *title ? SysAllocString(title) : NULL; - }else { - ERR("GetTitle failed: %08x\n", nsres); - return E_FAIL; - } - - return S_OK; + return return_nsstr(nsres, &title_str, p); } static HRESULT WINAPI HTMLElement_put_language(IHTMLElement *iface, BSTR v) @@ -1018,18 +975,7 @@ static HRESULT WINAPI HTMLElement_get_innerHTML(IHTMLElement *iface, BSTR *p) nsAString_Init(&html_str, NULL); nsres = nsIDOMHTMLElement_GetInnerHTML(This->nselem, &html_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *html; - - nsAString_GetData(&html_str, &html); - *p = *html ? SysAllocString(html) : NULL; - }else { - FIXME("SetInnerHtml failed %08x\n", nsres); - *p = NULL; - } - - nsAString_Finish(&html_str); - return S_OK; + return return_nsstr(nsres, &html_str, p); } static HRESULT WINAPI HTMLElement_put_innerText(IHTMLElement *iface, BSTR v) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 2538b55..9362805 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -978,32 +978,18 @@ static HRESULT WINAPI HTMLElement2_put_dir(IHTMLElement2 *iface, BSTR v) static HRESULT WINAPI HTMLElement2_get_dir(IHTMLElement2 *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); + nsAString dir_str; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - *p = NULL; - - if(This->nselem) { - nsAString dir_str; - nsresult nsres; - - nsAString_Init(&dir_str, NULL); - - nsres = nsIDOMHTMLElement_GetDir(This->nselem, &dir_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *dir; - nsAString_GetData(&dir_str, &dir); - if(*dir) - *p = SysAllocString(dir); - }else { - ERR("GetDir failed: %08x\n", nsres); - } - - nsAString_Finish(&dir_str); + if(!This->nselem) { + *p = NULL; + return S_OK; } - TRACE("ret %s\n", debugstr_w(*p)); - return S_OK; + nsres = nsIDOMHTMLElement_GetDir(This->nselem, &dir_str); + return return_nsstr(nsres, &dir_str, p); } static HRESULT WINAPI HTMLElement2_createControlRange(IHTMLElement2 *iface, IDispatch **range)

1 0

Jacek Caban : mshtml: Use return_nsstr helper in more functions.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 16a5a5c91b1142adbfbb7b274eacc338a399c4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a5a5c91b1142adbfbb7b274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 13 12:20:25 2012 +0200 mshtml: Use return_nsstr helper in more functions. --- dlls/mshtml/htmlframebase.c | 34 +++++++--------------------------- dlls/mshtml/htmlimg.c | 30 +++++------------------------- dlls/mshtml/htmlinput.c | 28 ++-------------------------- dlls/mshtml/htmlnode.c | 26 +++++--------------------- dlls/mshtml/htmloption.c | 24 ++---------------------- dlls/mshtml/htmlscript.c | 10 +--------- dlls/mshtml/htmlselect.c | 28 ++-------------------------- dlls/mshtml/htmltextarea.c | 28 ++-------------------------- dlls/mshtml/htmlwindow.c | 20 +------------------- 9 files changed, 27 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16a5a5c91b1142adbfbb7…

1 0

Huw Davies : wineps: Add the duplex entry to the list.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: cd83f8857664bd5635d7fb7ad28962ff3f116312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd83f8857664bd5635d7fb7ad… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 13 12:57:47 2012 +0100 wineps: Add the duplex entry to the list. --- dlls/wineps.drv/ppd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 456195d..6ee11b0 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -894,6 +894,7 @@ PPD *PSDRV_ParsePPD(char *fname) duplex->WinDuplex = DMDUP_SIMPLEX; } tuple.option = tuple.opttrans = tuple.value = NULL; + list_add_tail( &ppd->Duplexes, &duplex->entry ); } else if(!strcmp("*DefaultDuplex", tuple.key)) {

1 0

Huw Davies : wineps: Move ppd filename retrieval to a separate function.
by Alexandre Julliard 13 Apr '12

13 Apr '12

Module: wine Branch: master Commit: 72cfc219f0ba2fc3aea19760558f7820f4883176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72cfc219f0ba2fc3aea197605… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 13 12:57:48 2012 +0100 wineps: Move ppd filename retrieval to a separate function. --- dlls/wineps.drv/init.c | 205 ++++++++++++++++++++++++++---------------------- 1 files changed, 112 insertions(+), 93 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 584254c..b2597d7 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -573,6 +573,106 @@ static BOOL set_devmode( HANDLE printer, PSDRV_DEVMODE *dm ) return SetPrinterW( printer, 9, (BYTE *)&info, 0 ); } +static inline char *expand_env_string( char *str, DWORD type ) +{ + if (type == REG_EXPAND_SZ) + { + char *tmp; + DWORD needed = ExpandEnvironmentStringsA( str, NULL, 0 ); + tmp = HeapAlloc( GetProcessHeap(), 0, needed ); + if (tmp) + { + ExpandEnvironmentStringsA( str, tmp, needed ); + HeapFree( GetProcessHeap(), 0, str ); + return tmp; + } + } + return str; +} + +static char *get_ppd_filename( HANDLE printer, const char *nameA, BOOL *needs_unlink ) +{ + char *ret = NULL; + DWORD needed, err, type; + HKEY hkey; + const char *data_dir, *filename; + + *needs_unlink = FALSE; + +#ifdef SONAME_LIBCUPS + if (cupshandle != (void*)-1) + { + typeof(cupsGetPPD) *pcupsGetPPD; + + pcupsGetPPD = wine_dlsym( cupshandle, "cupsGetPPD", NULL, 0 ); + if (pcupsGetPPD) + { + filename = pcupsGetPPD( nameA ); + + if (filename) + { + needed = strlen( filename ) + 1; + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + memcpy( ret, filename, needed ); + *needs_unlink = TRUE; + return ret; + } + else + WARN( "CUPS did not find ppd for %s\n", debugstr_a(nameA) ); + } + } +#endif + + err = GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed ); + if (err == ERROR_MORE_DATA) + { + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!ret) return NULL; + GetPrinterDataExA( printer, "PrinterDriverData", "PPD File", &type, + (BYTE *)ret, needed, &needed ); + return expand_env_string( ret, type ); + } + + /* Look for a ppd file for this printer in the config file. + * First look under that printer's name, and then under 'generic' + */ + /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ + if (RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", &hkey ) == ERROR_SUCCESS ) + { + const char *value_name = NULL; + + if (RegQueryValueExA( hkey, nameA, 0, NULL, NULL, &needed ) == ERROR_SUCCESS) + value_name = nameA; + else if (RegQueryValueExA( hkey, "generic", 0, NULL, NULL, &needed ) == ERROR_SUCCESS) + value_name = "generic"; + + if (value_name) + { + ret = HeapAlloc( GetProcessHeap(), 0, needed ); + if (!ret) return NULL; + RegQueryValueExA( hkey, value_name, 0, &type, (BYTE *)ret, &needed ); + } + RegCloseKey( hkey ); + if (ret) return expand_env_string( ret, type ); + } + + if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; + else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; + else + { + ERR( "Error getting PPD file name for printer '%s'\n", debugstr_a(nameA) ); + return NULL; + } + ret = HeapAlloc( GetProcessHeap(), 0, strlen(data_dir) + strlen(filename) + 1 ); + if (ret) + { + strcpy( ret, data_dir ); + strcat( ret, filename ); + } + + return ret; +} + static struct list printer_list = LIST_INIT( printer_list ); /********************************************************************** @@ -585,11 +685,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) FONTNAME *font; const AFM *afm; HANDLE hPrinter = 0; - const char *ppd = NULL; - DWORD ppdType; - char *ppdFileName = NULL, *nameA = NULL; - HKEY hkey; - BOOL using_default_devmode = FALSE; + char *ppd_filename = NULL, *nameA = NULL; + BOOL using_default_devmode = FALSE, needs_unlink = FALSE; int len; TRACE("'%s'\n", debugstr_w(name)); @@ -618,93 +715,14 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode ); if (!pi->Devmode) goto fail; -#ifdef SONAME_LIBCUPS - if (cupshandle != (void*)-1) { - typeof(cupsGetPPD) * pcupsGetPPD = NULL; - - pcupsGetPPD = wine_dlsym(cupshandle, "cupsGetPPD", NULL, 0); - if (pcupsGetPPD) { - ppd = pcupsGetPPD( nameA ); - - if (ppd) { - needed=strlen(ppd)+1; - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - memcpy(ppdFileName, ppd, needed); - ppdType=REG_SZ; - res = ERROR_SUCCESS; - /* we should unlink() that file later */ - } else { - res = ERROR_FILE_NOT_FOUND; - WARN("Did not find ppd for %s\n", debugstr_w(name)); - } - } - } -#endif - if (!ppdFileName) { - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed); - if ((res==ERROR_SUCCESS) || (res==ERROR_MORE_DATA)) { - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", &ppdType, - (LPBYTE)ppdFileName, needed, &needed); - } - } - /* Look for a ppd file for this printer in the config file. - * First look under that printer's name, and then under 'generic' - */ - /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ - if((res != ERROR_SUCCESS) && !RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", &hkey)) - { - const char* value_name; - - if (RegQueryValueExA(hkey, nameA, 0, NULL, NULL, &needed) == ERROR_SUCCESS) { - value_name=nameA; - } else if (RegQueryValueExA(hkey, "generic", 0, NULL, NULL, &needed) == ERROR_SUCCESS) { - value_name="generic"; - } else { - value_name=NULL; - } - if (value_name) { - HeapFree(PSDRV_Heap, 0, ppdFileName); - ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - RegQueryValueExA(hkey, value_name, 0, &ppdType, (LPBYTE)ppdFileName, &needed); - } - RegCloseKey(hkey); - } + ppd_filename = get_ppd_filename( hPrinter, nameA, &needs_unlink ); + if (!ppd_filename) goto fail; - if (!ppdFileName) + pi->ppd = PSDRV_ParsePPD( ppd_filename ); + if (!pi->ppd) { - const char *data_dir, *filename; - - if ((data_dir = wine_get_data_dir())) filename = "/generic.ppd"; - else if ((data_dir = wine_get_build_dir())) filename = "/dlls/wineps.drv/generic.ppd"; - else - { - res = ERROR_FILE_NOT_FOUND; - ERR ("Error %i getting PPD file name for printer '%s'\n", res, debugstr_w(name)); - goto fail; - } - ppdFileName = HeapAlloc( PSDRV_Heap, 0, strlen(data_dir) + strlen(filename) + 1 ); - strcpy( ppdFileName, data_dir ); - strcat( ppdFileName, filename ); - } else { - res = ERROR_SUCCESS; - if (ppdType==REG_EXPAND_SZ) { - char* tmp; - - /* Expand environment variable references */ - needed=ExpandEnvironmentStringsA(ppdFileName,NULL,0); - tmp=HeapAlloc(PSDRV_Heap, 0, needed); - ExpandEnvironmentStringsA(ppdFileName,tmp,needed); - HeapFree(PSDRV_Heap, 0, ppdFileName); - ppdFileName=tmp; - } - } - - pi->ppd = PSDRV_ParsePPD(ppdFileName); - if(!pi->ppd) { - MESSAGE("Couldn't find PPD file '%s', expect a crash now!\n", - ppdFileName); - goto fail; + WARN( "Couldn't parse PPD file '%s'\n", ppd_filename ); + goto fail; } if(using_default_devmode) { @@ -780,19 +798,20 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) } ClosePrinter( hPrinter ); HeapFree( GetProcessHeap(), 0, nameA ); - if (ppd) unlink(ppd); + if (needs_unlink) unlink( ppd_filename ); + HeapFree( GetProcessHeap(), 0, ppd_filename ); list_add_head( &printer_list, &pi->entry ); return pi; fail: if (hPrinter) ClosePrinter( hPrinter ); - HeapFree(PSDRV_Heap, 0, ppdFileName); HeapFree(PSDRV_Heap, 0, pi->FontSubTable); HeapFree(PSDRV_Heap, 0, pi->friendly_name); HeapFree(PSDRV_Heap, 0, pi->Devmode); HeapFree(PSDRV_Heap, 0, pi); HeapFree( GetProcessHeap(), 0, nameA ); - if (ppd) unlink(ppd); + if (needs_unlink) unlink( ppd_filename ); + HeapFree( GetProcessHeap(), 0, ppd_filename ); return NULL; }

1 0

Huw Davies : wineps: Move the default resolution fallback to the ppd parser .
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 1d2cd06592da89b0a8401cc8a1d331181a8a8f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2cd06592da89b0a8401cc8a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 12 13:03:13 2012 +0100 wineps: Move the default resolution fallback to the ppd parser. --- dlls/wineps.drv/init.c | 5 ----- dlls/wineps.drv/ppd.c | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0134bd6..584254c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -707,11 +707,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) goto fail; } - /* Some gimp-print ppd files don't contain a DefaultResolution line - set it to 300 if it's not specified */ - if(pi->ppd->DefaultResolution == 0) - pi->ppd->DefaultResolution = 300; - if(using_default_devmode) { DWORD papersize; diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index c4dff21..456195d 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -634,6 +634,10 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->InputSlots ); list_init( &ppd->Duplexes ); + /* Some gimp-print ppd files don't contain a DefaultResolution line + so default to 300 */ + ppd->DefaultResolution = 300; + /* * The Windows PostScript drivers create the following "virtual bin" for * every PostScript printer

1 0

Ilya Basin : regedit: Fix buffer size when exporting binary values.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: f900ed1474b0fd05dbf0a11907d0bf0682fff979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900ed1474b0fd05dbf0a1190… Author: Ilya Basin <basinilya(a)gmail.com> Date: Thu Apr 12 18:10:59 2012 +0400 regedit: Fix buffer size when exporting binary values. --- programs/regedit/regproc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 1a87442..f82d793 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1018,12 +1018,13 @@ static void REGPROC_export_binary(WCHAR **line_buf, DWORD *line_buf_size, DWORD /* - The 2 spaces that concat places at the start of the * line effectively reduce the space available for data. * - If the value name and hex prefix are very long - * ( > REG_FILE_HEX_LINE_LEN) then we may overestimate + * ( > REG_FILE_HEX_LINE_LEN) or *line_len divides + * without a remainder then we may overestimate * the needed number of lines by one. But that's ok. - * - The trailing linefeed takes the place of a comma so - * it's accounted for already. + * - The trailing '\r' takes the place of a comma so + * we only need to add 1 for the trailing '\n' */ - *line_len += *line_len / (REG_FILE_HEX_LINE_LEN - concat_prefix) * concat_len; + *line_len += *line_len / (REG_FILE_HEX_LINE_LEN - concat_prefix) * concat_len + 1; REGPROC_resize_char_buffer(line_buf, line_buf_size, *line_len); lstrcpyW(*line_buf + hex_pos, hex_prefix); if (value_size)

1 0

Piotr Caban : msvcrt: Added support for _TRUNCATE flag in wcsncpy_s.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: a80aec4c56bfc9b845e89bf55af4e638f153b4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80aec4c56bfc9b845e89bf55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 12 16:19:31 2012 +0200 msvcrt: Added support for _TRUNCATE flag in wcsncpy_s. --- dlls/msvcrt/tests/string.c | 6 ++++++ dlls/msvcrt/wcs.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9f0d8be..afa9954 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -682,6 +682,12 @@ static void test_wcscpy_s(void) ret = p_wcsncpy_s(szDestShort, 8, szLongText, sizeof(szLongText)/sizeof(WCHAR)); ok(ret == ERANGE || ret == EINVAL, "expected ERANGE/EINVAL got %d\n", ret); ok(szDestShort[0] == 0, "szDestShort[0] not 0\n"); + + szDest[0] = 'A'; + ret = p_wcsncpy_s(szDest, 5, szLongText, -1); + ok(ret == STRUNCATE, "expected STRUNCATE got %d\n", ret); + ok(szDest[4] == 0, "szDest[4] not 0\n"); + ok(!memcmp(szDest, szLongText, 4*sizeof(WCHAR)), "szDest = %s\n", wine_dbgstr_w(szDest)); } static void test__wcsupr_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b6786ce..21cee47 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1230,6 +1230,7 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co MSVCRT_size_t count ) { MSVCRT_size_t size = 0; + INT ret = 0; if (!wcDest || !numElement) return MSVCRT_EINVAL; @@ -1242,8 +1243,12 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co } size = min(strlenW(wcSrc), count); - - if (size >= numElement) + if (count==MSVCRT__TRUNCATE && size>=numElement) + { + ret = MSVCRT_STRUNCATE; + size = numElement-1; + } + else if (size >= numElement) { return MSVCRT_ERANGE; } @@ -1251,7 +1256,7 @@ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, co memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); wcDest[size] = '\0'; - return 0; + return ret; } /******************************************************************

1 0

Aric Stewart : wineqtdecoder: Call OutputQueue_Destroy during pin disconnect.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 40456f4bb4089f4c77131bf99efc1cd0175f85e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40456f4bb4089f4c77131bf99… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 11 14:07:18 2012 -0500 wineqtdecoder: Call OutputQueue_Destroy during pin disconnect. --- dlls/wineqtdecoder/qtsplitter.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index ba2d05d..b21f198 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -745,6 +745,7 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) if (This->pVideo_Pin) { + OutputQueue_Destroy(This->pVideo_Pin->queue); hr = BaseOutputPinImpl_BreakConnect(&This->pVideo_Pin->pin); TRACE("Disconnect: %08x\n", hr); IPin_Release(&This->pVideo_Pin->pin.pin.IPin_iface); @@ -752,6 +753,7 @@ static HRESULT QT_RemoveOutputPins(QTSplitter *This) } if (This->pAudio_Pin) { + OutputQueue_Destroy(This->pAudio_Pin->queue); hr = BaseOutputPinImpl_BreakConnect(&This->pAudio_Pin->pin); TRACE("Disconnect: %08x\n", hr); IPin_Release(&This->pAudio_Pin->pin.pin.IPin_iface); @@ -1269,7 +1271,6 @@ static ULONG WINAPI QTOutPin_Release(IPin *iface) { DeleteMediaType(This->pmt); FreeMediaType(&This->pin.pin.mtCurrent); - OutputQueue_Destroy(This->queue); CoTaskMemFree(This); return 0; }

1 0

Akihiro Sagawa : comctl32: Add support for retrieving lpszText in TOOLINFO structure.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: b48f394e4f3ee73eb2f974d19770d411d13f3e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48f394e4f3ee73eb2f974d19… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 12 00:42:55 2012 +0900 comctl32: Add support for retrieving lpszText in TOOLINFO structure. --- dlls/comctl32/tests/tooltips.c | 16 ++++++++++++++++ dlls/comctl32/tooltips.c | 27 +++++++++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 596598f..31504d1 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -322,6 +322,11 @@ static void test_gettext(void) toolinfoA.lpszText = bufA; SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); + + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(toolinfoA.lpszText == NULL, + "expected NULL, got %p", toolinfoA.lpszText); } else { @@ -355,6 +360,12 @@ static void test_gettext(void) SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, testtipA) == 0, "lpszText should be an empty string\n"); + memset(bufA, 0x1f, sizeof(bufA)); + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(strcmp(toolinfoA.lpszText, testtipA) == 0, + "expected %s, got %p\n", testtipA, toolinfoA.lpszText); + length = SendMessage(hwnd, WM_GETTEXTLENGTH, 0, 0); ok(length == 0, "Expected 0, got %d\n", length); } @@ -378,6 +389,11 @@ static void test_gettext(void) SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(strcmp(toolinfoA.lpszText, testcallbackA) == 0, "lpszText should be an (%s) string\n", testcallbackA); + + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(toolinfoA.lpszText == LPSTR_TEXTCALLBACKA, + "expected LPSTR_TEXTCALLBACKA, got %p\n", toolinfoA.lpszText); } DestroyWindow(hwnd); diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 162867d..1d758b4 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -943,6 +943,21 @@ TOOLTIPS_GetToolFromPoint (const TOOLTIPS_INFO *infoPtr, HWND hwnd, const POINT return -1; } +static inline void +TOOLTIPS_CopyInfoT (const TTTOOL_INFO *toolPtr, TTTOOLINFOW *ti, BOOL isW) +{ + if (ti->lpszText) { + if (toolPtr->lpszText == NULL || + IS_INTRESOURCE(toolPtr->lpszText) || + toolPtr->lpszText == LPSTR_TEXTCALLBACKW) + ti->lpszText = toolPtr->lpszText; + else if (isW) + strcpyW (ti->lpszText, toolPtr->lpszText); + else + WideCharToMultiByte(CP_ACP, 0, toolPtr->lpszText, -1, + (LPSTR)ti->lpszText, INFOTIPSIZE, NULL, NULL); + } +} static BOOL TOOLTIPS_IsWindowActive (HWND hwnd) @@ -1199,8 +1214,7 @@ TOOLTIPS_EnumToolsT (const TOOLTIPS_INFO *infoPtr, UINT uIndex, TTTOOLINFOW *ti, ti->uId = toolPtr->uId; ti->rect = toolPtr->rect; ti->hinst = toolPtr->hinst; -/* ti->lpszText = toolPtr->lpszText; */ - ti->lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, ti, isW); if (ti->cbSize >= TTTOOLINFOA_V2_SIZE) ti->lParam = toolPtr->lParam; @@ -1246,8 +1260,7 @@ TOOLTIPS_GetCurrentToolT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL is ti->uFlags = toolPtr->uFlags; ti->rect = toolPtr->rect; ti->hinst = toolPtr->hinst; -/* ti->lpszText = toolPtr->lpszText; */ - ti->lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, ti, isW); if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) ti->lParam = toolPtr->lParam; @@ -1385,8 +1398,7 @@ TOOLTIPS_GetToolInfoT (const TOOLTIPS_INFO *infoPtr, TTTOOLINFOW *ti, BOOL isW) ti->uFlags = toolPtr->uFlags; ti->rect = toolPtr->rect; ti->hinst = toolPtr->hinst; -/* lpToolInfo->lpszText = toolPtr->lpszText; */ - ti->lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, ti, isW); if (ti->cbSize >= TTTOOLINFOW_V2_SIZE) ti->lParam = toolPtr->lParam; @@ -1420,8 +1432,7 @@ TOOLTIPS_HitTestT (const TOOLTIPS_INFO *infoPtr, LPTTHITTESTINFOW lptthit, lptthit->ti.uId = toolPtr->uId; lptthit->ti.rect = toolPtr->rect; lptthit->ti.hinst = toolPtr->hinst; -/* lptthit->ti.lpszText = toolPtr->lpszText; */ - lptthit->ti.lpszText = NULL; /* FIXME */ + TOOLTIPS_CopyInfoT (toolPtr, &lptthit->ti, isW); if (lptthit->ti.cbSize >= TTTOOLINFOW_V2_SIZE) lptthit->ti.lParam = toolPtr->lParam; }

1 0

André Hentschel : winedbg: Add partial ARM disassembler.
by Alexandre Julliard 12 Apr '12

12 Apr '12

Module: wine Branch: master Commit: 0fccc41c3fdcdfcdc8593ea451c3a99c83a6c826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fccc41c3fdcdfcdc8593ea45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 11 20:28:30 2012 +0200 winedbg: Add partial ARM disassembler. --- programs/winedbg/be_arm.c | 309 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 304 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fccc41c3fdcdfcdc8593…

1 0