November 2011 - Wine-Commits

Francois Gouget : include: Add some more sublanguages and sort orders.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: f7a70822a01a5434ad7059c20bb77e66c8d63217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a70822a01a5434ad7059c20… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 14 09:58:14 2011 +0100 include: Add some more sublanguages and sort orders. --- include/winnt.rh | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/winnt.rh b/include/winnt.rh index 6f06aee..2745f4d 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -343,7 +343,13 @@ #define SUBLANG_SERBIAN_CROATIA 0x01 #define SUBLANG_SERBIAN_LATIN 0x02 #define SUBLANG_SERBIAN_CYRILLIC 0x03 +#define SUBLANG_SERBIAN_SERBIA_LATIN 0x09 +#define SUBLANG_SERBIAN_SERBIA_CYRILLIC 0x0a +#define SUBLANG_SERBIAN_MONTENEGRO_LATIN 0x0b +#define SUBLANG_SERBIAN_MONTENEGRO_CYRILLIC 0x0c +#define SUBLANG_SINDHI_INDIA 0x01 #define SUBLANG_SINDHI_AFGHANISTAN 0x02 +#define SUBLANG_SINDHI_PAKISTAN SUBLANG_SINDHI_AFGHANISTAN #define SUBLANG_SINHALESE_SRI_LANKA 0x01 #define SUBLANG_SLOVAK_SLOVAKIA 0x01 #define SUBLANG_SLOVENIAN_SLOVENIA 0x01 @@ -429,9 +435,20 @@ */ #define SORT_DEFAULT 0x0 +#define SORT_INVARIANT_MATH 0x1 #define SORT_JAPANESE_XJIS 0x0 #define SORT_JAPANESE_UNICODE 0x1 +#define SORT_JAPANESE_RADICALSTROKE 0x4 #define SORT_CHINESE_BIG5 0x0 +#define SORT_CHINESE_PRCP 0x0 #define SORT_CHINESE_UNICODE 0x1 +#define SORT_CHINESE_PRC 0x2 +#define SORT_CHINESE_BOPOMOFO 0x3 +#define SORT_CHINESE_RADICALSTROKE 0x4 #define SORT_KOREAN_KSC 0x0 #define SORT_KOREAN_UNICODE 0x1 +#define SORT_GERMAN_PHONE_BOOK 0x1 +#define SORT_HUNGARIAN_DEFAULT 0x0 +#define SORT_HUNGARIAN_TECHNICAL 0x1 +#define SORT_GEORGIAN_TRADITIONAL 0x0 +#define SORT_GEORGIAN_MODERN 0x1

1 0

André Hentschel : tapi32: Implement tapiGetLocationInfoW.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: b4c3fcd17a7c91ca985c8422b16c6409d63251c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c3fcd17a7c91ca985c8422b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 17:23:46 2011 +0100 tapi32: Implement tapiGetLocationInfoW. --- dlls/tapi32/assisted.c | 87 +++++++++++++++++++++++++++++++++-------------- dlls/tapi32/tapi32.spec | 1 + 2 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c index 27a0c4c..9e68a5c 100644 --- a/dlls/tapi32/assisted.c +++ b/dlls/tapi32/assisted.c @@ -2,6 +2,7 @@ * TAPI32 Assisted Telephony * * Copyright 1999 Andreas Mohr + * Copyright 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,50 +30,61 @@ #include "winreg.h" #include "objbase.h" #include "tapi.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(tapi); /*********************************************************************** - * tapiGetLocationInfo (TAPI32.@) + * tapiGetLocationInfoW (TAPI32.@) */ -DWORD WINAPI tapiGetLocationInfoA(LPSTR lpszCountryCode, LPSTR lpszCityCode) +DWORD WINAPI tapiGetLocationInfoW(LPWSTR countrycode, LPWSTR citycode) { HKEY hkey, hsubkey; DWORD currid; DWORD valsize; DWORD type; DWORD bufsize; - BYTE buf[100]; - char szlockey[20]; - if(!RegOpenKeyA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion\\Telephony\\Locations", - &hkey) != ERROR_SUCCESS) { + BYTE buf[200]; + WCHAR szlockey[20]; + + static const WCHAR currentidW[] = {'C','u','r','r','e','n','t','I','D',0}; + static const WCHAR locationW[] = {'L','o','c','a','t','i','o','n','%','u',0}; + static const WCHAR areacodeW[] = {'A','r','e','a','C','o','d','e',0}; + static const WCHAR countryW[] = {'C','o','u','n','t','r','y',0}; + static const WCHAR fmtW[] = {'%','u',0}; + + static const WCHAR locations_keyW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','e','l','e','p','h','o','n','y','\\','L','o','c','a','t','i','o','n','s',0}; + + if(!RegOpenKeyW(HKEY_LOCAL_MACHINE, locations_keyW, &hkey) != ERROR_SUCCESS) { valsize = sizeof( DWORD); - if(!RegQueryValueExA(hkey, "CurrentID", 0, &type, (LPBYTE) &currid, - &valsize) && type == REG_DWORD) { + if(!RegQueryValueExW(hkey, currentidW, 0, &type, (LPBYTE) &currid, &valsize) && + type == REG_DWORD) { /* find a subkey called Location1, Location2... */ - sprintf( szlockey, "Location%u", currid); - if( !RegOpenKeyA( hkey, szlockey, &hsubkey)) { - if( lpszCityCode) { + sprintfW( szlockey, locationW, currid); + if( !RegOpenKeyW( hkey, szlockey, &hsubkey)) { + if( citycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "AreaCode", 0, &type, buf, - &bufsize) && type == REG_SZ) { - lstrcpynA( lpszCityCode, (char *) buf, 8); + if( !RegQueryValueExW( hsubkey, areacodeW, 0, &type, buf, &bufsize) && + type == REG_SZ) { + lstrcpynW( citycode, (WCHAR *) buf, 8); } else - lpszCityCode[0] = '\0'; + citycode[0] = '\0'; } - if( lpszCountryCode) { + if( countrycode) { bufsize=sizeof(buf); - if( !RegQueryValueExA( hsubkey, "Country", 0, &type, buf, - &bufsize) && type == REG_DWORD) - snprintf( lpszCountryCode, 8, "%u", *(LPDWORD) buf ); + if( !RegQueryValueExW( hsubkey, countryW, 0, &type, buf, &bufsize) && + type == REG_DWORD) + snprintfW( countrycode, 8, fmtW, *(LPDWORD) buf ); else - lpszCountryCode[0] = '\0'; + countrycode[0] = '\0'; } - TRACE("(%p \"%s\", %p \"%s\"): success.\n", - lpszCountryCode, debugstr_a(lpszCountryCode), - lpszCityCode, debugstr_a(lpszCityCode)); + TRACE("(%p \"%s\", %p \"%s\"): success.\n", countrycode, debugstr_w(countrycode), + citycode, debugstr_w(citycode)); RegCloseKey( hkey); RegCloseKey( hsubkey); return 0; /* SUCCESS */ @@ -80,11 +92,34 @@ DWORD WINAPI tapiGetLocationInfoA(LPSTR lpszCountryCode, LPSTR lpszCityCode) } RegCloseKey( hkey); } - WARN("(%p, %p): failed (no telephony registry entries?).\n", - lpszCountryCode, lpszCityCode); + WARN("(%p, %p): failed (no telephony registry entries?).\n", countrycode, citycode); return TAPIERR_REQUESTFAILED; } + +/*********************************************************************** + * tapiGetLocationInfoA (TAPI32.@) + */ +DWORD WINAPI tapiGetLocationInfoA(LPSTR countrycode, LPSTR citycode) +{ + DWORD ret, len; + LPWSTR country, city; + + len = MultiByteToWideChar( CP_ACP, 0, countrycode, -1, NULL, 0 ); + country = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, countrycode, -1, country, len ); + + len = MultiByteToWideChar( CP_ACP, 0, citycode, -1, NULL, 0 ); + city = HeapAlloc( GetProcessHeap(), 0, len ); + MultiByteToWideChar( CP_ACP, 0, citycode, -1, city, len ); + + ret = tapiGetLocationInfoW(country, city); + + HeapFree( GetProcessHeap(), 0, city ); + HeapFree( GetProcessHeap(), 0, country ); + return ret; +} + /*********************************************************************** * tapiRequestMakeCall (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index ce7a04d..b95f86f 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -160,6 +160,7 @@ @ stdcall phoneShutdown(long) @ stdcall tapiGetLocationInfo(str str) tapiGetLocationInfoA @ stdcall tapiGetLocationInfoA(str str) +@ stdcall tapiGetLocationInfoW(wstr wstr) @ stub tapiRequestDrop @ stdcall tapiRequestMakeCall(str str str str) tapiRequestMakeCallA @ stdcall tapiRequestMakeCallA(str str str str)

1 0

Matteo Bruni : wined3d: Fix post-pixelshader blending test.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 56c9952ee66dc5a7ec5281d874d8f9abe486c418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c9952ee66dc5a7ec5281d87… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Nov 9 22:16:36 2011 +0100 wined3d: Fix post-pixelshader blending test. --- dlls/wined3d/utils.c | 123 ++++++++++++++++++++++++++----------------------- 1 files changed, 65 insertions(+), 58 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 246c9bc..baf2548 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1080,7 +1080,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined } glEnable(GL_BLEND); - glClearColor(0, 0, 0, 1); + glClearColor(0.0f, 0.0f, 0.0f, 1.0f); glClear(GL_COLOR_BUFFER_BIT); if (glGetError() == GL_INVALID_FRAMEBUFFER_OPERATION) { @@ -1088,65 +1088,72 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined TRACE("Format doesn't support post-pixelshader blending.\n"); format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; } - - glViewport(0, 0, 16, 16); - glDisable(GL_LIGHTING); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - /* Draw a full-black quad */ - glBegin(GL_TRIANGLE_STRIP); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(-1.0f, -1.0f, 0.0f); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(1.0f, -1.0f, 0.0f); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(-1.0f, 1.0f, 0.0f); - glColor4ub(0x00, 0x00, 0x00, 0xff); - glVertex3f(1.0f, 1.0f, 0.0f); - glEnd(); - - /* Draw a half-transparent red quad */ - glBegin(GL_TRIANGLE_STRIP); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(-1.0f, -1.0f, 0.0f); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(1.0f, -1.0f, 0.0f); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(-1.0f, 1.0f, 0.0f); - glColor4ub(0xff, 0x00, 0x00, 0x80); - glVertex3f(1.0f, 1.0f, 0.0f); - glEnd(); - - glGenTextures(1, &tex2); - glBindTexture(GL_TEXTURE_2D, tex2); - - glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); - glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); - checkGLcall("Post-pixelshader blending check"); - - color = readback[7 * 16 + 7]; - a = color >> 24; - r = (color & 0x00ff0000) >> 16; - - if (format->red_mask && (r < 0x7b || r > 0x84)) - match = FALSE; - /* If the alpha component is more than 1 bit */ - else if ((format->alpha_mask & (format->alpha_mask - 1)) && (a < 0x9f || a > 0xdf)) - match = FALSE; - if (!match) + else { - TRACE("Format doesn't support post-pixelshader blending.\n"); - TRACE("Color output: %#x\n", color); - format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; - } + glViewport(0, 0, 16, 16); + glDisable(GL_LIGHTING); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + /* Draw a full-black quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0x00, 0x00, 0x00, 0xff); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + /* Draw a half-transparent red quad */ + glBegin(GL_TRIANGLE_STRIP); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, -1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(-1.0f, 1.0f, 0.0f); + glColor4ub(0xff, 0x00, 0x00, 0x80); + glVertex3f(1.0f, 1.0f, 0.0f); + glEnd(); + + glGenTextures(1, &tex2); + glBindTexture(GL_TEXTURE_2D, tex2); + + glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); + glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + checkGLcall("Post-pixelshader blending check"); + + color = readback[7 * 16 + 7]; + a = color >> 24; + r = (color & 0x00ff0000) >> 16; + + if (format->red_mask && (r < 0x7b || r > 0x84)) + match = FALSE; + /* If the alpha component is more than 1 bit */ + else if ((format->alpha_mask & (format->alpha_mask - 1)) && (a < 0x9f || a > 0xdf)) + match = FALSE; + if (!match) + { + TRACE("Format doesn't support post-pixelshader blending.\n"); + TRACE("Color output: %#x\n", color); + format->flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } + else + { + TRACE("Format supports post-pixelshader blending.\n"); + format->flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } - glBindTexture(GL_TEXTURE_2D, tex); - glDeleteTextures(1, &tex2); + glBindTexture(GL_TEXTURE_2D, tex); + glDeleteTextures(1, &tex2); + } if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL])

1 0

Francois Gouget : dlls: Remove unneeded include directives in resource files.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 8eef0cc258f86b8696bfa2b30eba8d2821102daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eef0cc258f86b8696bfa2b30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 09:54:01 2011 +0100 dlls: Remove unneeded include directives in resource files. --- dlls/msvcrt/rsrc.rc | 5 +---- dlls/ntprint/ntprint.rc | 3 --- dlls/printui/printui.rc | 3 --- dlls/version/tests/version.rc | 2 -- dlls/winscard/rsrc.rc | 5 +---- include/wine/wine_common_ver.rc | 4 +--- 6 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/rsrc.rc b/dlls/msvcrt/rsrc.rc index 39abbef..8fa3de9 100644 --- a/dlls/msvcrt/rsrc.rc +++ b/dlls/msvcrt/rsrc.rc @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" +#include "winresrc.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/dlls/ntprint/ntprint.rc b/dlls/ntprint/ntprint.rc index ca56d3f..272f151 100644 --- a/dlls/ntprint/ntprint.rc +++ b/dlls/ntprint/ntprint.rc @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winver.h" #define WINE_FILENAME_STR "ntprint.dll" diff --git a/dlls/printui/printui.rc b/dlls/printui/printui.rc index d8d0d4b..bfbae98 100644 --- a/dlls/printui/printui.rc +++ b/dlls/printui/printui.rc @@ -19,9 +19,6 @@ * */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winver.h" #define WINE_FILENAME_STR "printui.dll" diff --git a/dlls/version/tests/version.rc b/dlls/version/tests/version.rc index c754e0c..e7d1b33 100644 --- a/dlls/version/tests/version.rc +++ b/dlls/version/tests/version.rc @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" #include "winver.h" VS_VERSION_INFO VERSIONINFO diff --git a/dlls/winscard/rsrc.rc b/dlls/winscard/rsrc.rc index 8226e9d..3ec383d 100644 --- a/dlls/winscard/rsrc.rc +++ b/dlls/winscard/rsrc.rc @@ -18,10 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winver.h" +#include "winresrc.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 9cd607f..8447169 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -17,9 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winbase.h" -#include "winver.h" +#include "winresrc.h" /* Assign WINE_FILEVERSION and WINE_FILEVERSION_STR high enough number

1 0

Nikolay Sivov : msxml3: Fix getNamedItem() for qualified node names.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 02cd5a008f011fcd8a58b8346fb536d576227ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=02cd5a008f011fcd8a58b8346… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 12 17:14:11 2011 +0300 msxml3: Fix getNamedItem() for qualified node names. --- dlls/msxml3/nodemap.c | 42 +++++++++++++++- dlls/msxml3/tests/domdoc.c | 110 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 133 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index ebc2bd5..47adcd9 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -199,11 +199,47 @@ static HRESULT WINAPI xmlnodemap_Invoke( static HRESULT WINAPI xmlnodemap_getNamedItem( IXMLDOMNamedNodeMap *iface, BSTR name, - IXMLDOMNode** namedItem) + IXMLDOMNode** item) { xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); - TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), namedItem ); - return IXMLDOMNamedNodeMap_getQualifiedItem(iface, name, NULL, namedItem); + xmlChar *nameA, *local, *prefix; + BSTR uriW, localW; + xmlNsPtr ns; + HRESULT hr; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), item ); + + nameA = xmlchar_from_wchar(name); + local = xmlSplitQName2(nameA, &prefix); + heap_free(nameA); + + if (!local) + return IXMLDOMNamedNodeMap_getQualifiedItem(iface, name, NULL, item); + + /* try to get namespace uri for supplied qualified name */ + ns = xmlSearchNs(This->node->doc, This->node, prefix); + + xmlFree(prefix); + + if (!ns) + { + xmlFree(local); + if (item) *item = NULL; + return item ? S_FALSE : E_INVALIDARG; + } + + uriW = bstr_from_xmlChar(ns->href); + localW = bstr_from_xmlChar(local); + xmlFree(local); + + TRACE("got qualified node %s, uri=%s\n", debugstr_w(localW), debugstr_w(uriW)); + + hr = IXMLDOMNamedNodeMap_getQualifiedItem(iface, localW, uriW, item); + + SysFreeString(localW); + SysFreeString(uriW); + + return hr; } static HRESULT WINAPI xmlnodemap_setNamedItem( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index affdfaa..a79da43 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1746,6 +1746,12 @@ static const char* leading_spaces[] = { 0 }; +static const char default_ns_doc[] = { + "<?xml version=\"1.0\"?>" + "<a xmlns:ns=\"nshref\" xml:lang=\"ru\" ns:b=\"b attr\" xml:c=\"c attr\" " + " d=\"d attr\" />" +}; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -7973,63 +7979,135 @@ static void test_splitText(void) free_bstrs(); } +typedef struct { + const char *name; + const char *uri; + HRESULT hr; +} ns_item_t; + +/* default_ns_doc used */ +static const ns_item_t qualified_item_tests[] = { + { "xml:lang", NULL, S_FALSE }, + { "xml:lang", "http://www.w3.org/XML/1998/namespace", S_FALSE }, + { "lang", "http://www.w3.org/XML/1998/namespace", S_OK }, + { "ns:b", NULL, S_FALSE }, + { "ns:b", "nshref", S_FALSE }, + { "b", "nshref", S_OK }, + { "d", NULL, S_OK }, + { NULL } +}; + +static const ns_item_t named_item_tests[] = { + { "xml:lang", NULL, S_OK }, + { "lang", NULL, S_FALSE }, + { "ns:b", NULL, S_OK }, + { "b", NULL, S_FALSE }, + { "d", NULL, S_OK }, + { NULL } +}; + static void test_getQualifiedItem(void) { - IXMLDOMDocument *doc; - IXMLDOMElement *element; IXMLDOMNode *pr_node, *node; IXMLDOMNodeList *root_list; IXMLDOMNamedNodeMap *map; + IXMLDOMElement *element; + const ns_item_t* ptr; + IXMLDOMDocument *doc; VARIANT_BOOL b; + HRESULT hr; BSTR str; LONG len; - HRESULT hr; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; str = SysAllocString( szComplete4 ); hr = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( hr == S_OK, "loadXML failed\n"); + EXPECT_HR(hr, S_OK); ok( b == VARIANT_TRUE, "failed to load XML string\n"); SysFreeString( str ); hr = IXMLDOMDocument_get_documentElement(doc, &element); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = IXMLDOMElement_get_childNodes(element, &root_list); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); hr = IXMLDOMNodeList_get_item(root_list, 1, &pr_node); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); IXMLDOMNodeList_Release(root_list); hr = IXMLDOMNode_get_attributes(pr_node, &map); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); IXMLDOMNode_Release(pr_node); + len = 0; hr = IXMLDOMNamedNodeMap_get_length(map, &len); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); ok( len == 3, "length %d\n", len); hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); node = (void*)0xdeadbeef; hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, NULL, NULL, &node); - ok( hr == E_INVALIDARG, "ret %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); ok( node == (void*)0xdeadbeef, "got %p\n", node); hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, NULL); - ok( hr == E_INVALIDARG, "ret %08x\n", hr); + EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_("id"), NULL, &node); - ok( hr == S_OK, "ret %08x\n", hr); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMElement_Release(element); - IXMLDOMNamedNodeMap_Release( map ); - IXMLDOMElement_Release( element ); - IXMLDOMDocument_Release( doc ); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(default_ns_doc), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&element); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + + hr = IXMLDOMElement_get_attributes(element, &map); + EXPECT_HR(hr, S_OK); + + ptr = qualified_item_tests; + while (ptr->name) + { + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getQualifiedItem(map, _bstr_(ptr->name), _bstr_(ptr->uri), &node); + ok(hr == ptr->hr, "%s, %s: got 0x%08x, expected 0x%08x\n", ptr->name, ptr->uri, hr, ptr->hr); + if (hr == S_OK) + IXMLDOMNode_Release(node); + else + ok(node == NULL, "%s, %s: got %p\n", ptr->name, ptr->uri, node); + ptr++; + } + + ptr = named_item_tests; + while (ptr->name) + { + node = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_(ptr->name), &node); + ok(hr == ptr->hr, "%s: got 0x%08x, expected 0x%08x\n", ptr->name, hr, ptr->hr); + if (hr == S_OK) + IXMLDOMNode_Release(node); + else + ok(node == NULL, "%s: got %p\n", ptr->name, node); + ptr++; + } + + IXMLDOMNamedNodeMap_Release(map); + + IXMLDOMElement_Release(element); + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 5fca6525d2de1e3ba5661ed418bd344cb9761899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fca6525d2de1e3ba5661ed41… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 13 22:54:49 2011 +0900 po: Updated Korean translation. --- po/ko.po | 38 ++++++++++++++++++-------------------- 1 files changed, 18 insertions(+), 20 deletions(-) diff --git a/po/ko.po b/po/ko.po index cb6ede1..064b6c5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2026,77 +2026,75 @@ msgstr "지역 설정" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "%uMB 사용됨, %uMB 가능함" +msgstr "%uMB 사용됨, %uMB 사용 가능함" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "서" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "중부 유럽" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "키릴문자" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "녹색" +msgstr "그리스어" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "터키어" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "히브리어" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "아랍어" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "발트어" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "베트남어" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "타이어" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "틀" +msgstr "일본" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "중국어 GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "한글" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "중국어 BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "한글(조합)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "기호" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/도" #: hhctrl.rc:56 msgid "S&ync"

1 0

Hwang YunSong : cmdlgtst: Updated Korean translation.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: bc0a708f6da21fe6caa5b9db9e41a0dad8370fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0a708f6da21fe6caa5b9db9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 13 22:57:43 2011 +0900 cmdlgtst: Updated Korean translation. --- programs/cmdlgtst/Ko.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index fcd4eac..131d973 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -248,8 +248,8 @@ CAPTION "정보" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 72, 96, 50, 14 - LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 36, 168, 15 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기기 않는다면... 나누자!", -1, 18, 60, 157, 24 + LTEXT "공통 대화상자 시험 지그 운동기, 버젼 1.20", -1, 13, 36, 168, 15 + LTEXT "(c) 1999-2000, Eric Williams. WINE 라이센스 아래 권리가 부여됩니다. 코드를 숨기기 않는다면... 나누자!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -259,13 +259,13 @@ CAPTION "사용법" FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "확인", IDOK, 70, 276, 50, 14 - LTEXT "공통 대화상자 테스트 지그 액서사이저, 버젼 1.20", -1, 13, 48, 168, 12 - LTEXT "This tool tests COMMDLG for Wine.", -1, 12, 72, 168, 12 - LTEXT "Flags are specified in the Flags menu.", -1, 12, 96, 168, 12 - LTEXT "Color dialog changes background color.", -1, 12, 120, 168, 12 - LTEXT "Font dialog changes all fonts, and font color if CF_EFFECTS is selected.", -1, 12, 144, 168, 24 - LTEXT "Upper left hand corner indicate full pathname and title of the last successful Open or Save.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Rights are as granted under the WINE license. 코드를 숨기지 않는다면... 나누자!", -1, 12, 228, 168, 36 + LTEXT "공통 대화상자 시험 지그 운동기, 버젼 1.20", -1, 13, 48, 168, 12 + LTEXT "이 도구는 Wine의 공용대화상자를 시험합니다.", -1, 12, 72, 168, 12 + LTEXT "플래그는 플래그 메뉴에서 지정됩니다.", -1, 12, 96, 168, 12 + LTEXT "색상 대화상자는 배경 색상을 바꿉니다.", -1, 12, 120, 168, 12 + LTEXT "글꼴 대화상자는 모든 글꼴을 바꾸고, 만약 CF_EFFECTS가 선택되어있다면 글꼴 색상도 바꿀수 있습니다.", -1, 12, 144, 168, 24 + LTEXT "위쪽 왼쪽 구석에 마지막으로 성공한 열거나 저장한 완전한 경로명과 제목을 표시합니다.", -1, 12, 180, 168, 24 + LTEXT "(c) 1999-2000, Eric Williams. WINE 라이센스 아래 권리가 부여됩니다. 코드를 숨기지 않는다면... 나누자!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 } @@ -288,13 +288,13 @@ BEGIN AUTORADIOBUTTON "세로(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "가로(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "가장자리", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "왼쪽(&E):", stc15, 85, 172, 24, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "오른쪽(&R):", stc16, 155, 172, 31, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "왼쪽(&E):", stc15, 82, 173, 30, 8 + EDITTEXT edt4, 111, 173, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "오른쪽(&R):", stc16, 151, 173, 36, 8 + EDITTEXT edt6, 187, 173, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "위(&O):", stc17, 88, 192, 21, 8 EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER - LTEXT "아래(&B):", stc18, 159, 192, 23, 8 + LTEXT "아래(&B):", stc18, 153, 192, 30, 8 EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "확인", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "취소", IDCANCEL, 126, 220, 50, 14

1 0

Daniel Scharrer : include: Don't use min/max in d3dx9math. inl as they might not be defined at this point.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 86781a6a524fa336f893ffd0a87373ffd306913c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86781a6a524fa336f893ffd0a… Author: Daniel Scharrer <dscharrer(a)gmail.com> Date: Sat Nov 12 02:08:23 2011 +0100 include: Don't use min/max in d3dx9math.inl as they might not be defined at this point. --- include/d3dx9math.inl | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 3f55aef..0d80cf9 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -991,16 +991,16 @@ static inline D3DXVECTOR2* D3DXVec2Lerp(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv static inline D3DXVECTOR2* D3DXVec2Maximize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = max(pv1->x , pv2->x); - pout->y = max(pv1->y , pv2->y); + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; return pout; } static inline D3DXVECTOR2* D3DXVec2Minimize(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = min(pv1->x , pv2->x); - pout->y = min(pv1->y , pv2->y); + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; return pout; } @@ -1070,18 +1070,18 @@ static inline D3DXVECTOR3* D3DXVec3Lerp(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = max(pv1->x , pv2->x); - pout->y = max(pv1->y , pv2->y); - pout->z = max(pv1->z , pv2->z); + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z > pv2->z ? pv1->z : pv2->z; return pout; } static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = min(pv1->x , pv2->x); - pout->y = min(pv1->y , pv2->y); - pout->z = min(pv1->z , pv2->z); + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z < pv2->z ? pv1->z : pv2->z; return pout; } @@ -1146,20 +1146,20 @@ static inline D3DXVECTOR4* D3DXVec4Lerp(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = max(pv1->x , pv2->x); - pout->y = max(pv1->y , pv2->y); - pout->z = max(pv1->z , pv2->z); - pout->w = max(pv1->w , pv2->w); + pout->x = pv1->x > pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y > pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z > pv2->z ? pv1->z : pv2->z; + pout->w = pv1->w > pv2->w ? pv1->w : pv2->w; return pout; } static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; - pout->x = min(pv1->x , pv2->x); - pout->y = min(pv1->y , pv2->y); - pout->z = min(pv1->z , pv2->z); - pout->w = min(pv1->w , pv2->w); + pout->x = pv1->x < pv2->x ? pv1->x : pv2->x; + pout->y = pv1->y < pv2->y ? pv1->y : pv2->y; + pout->z = pv1->z < pv2->z ? pv1->z : pv2->z; + pout->w = pv1->w < pv2->w ? pv1->w : pv2->w; return pout; }

1 0

Henri Verbeet : ddraw: Use wined3d_mutex_lock() / wined3d_mutex_unlock() for locking.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: a2963b662c52d909f085888d31bf4b07cdb01620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2963b662c52d909f085888d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 13 19:52:24 2011 +0100 ddraw: Use wined3d_mutex_lock() / wined3d_mutex_unlock() for locking. --- dlls/ddraw/clipper.c | 30 ++-- dlls/ddraw/ddraw.c | 219 +++++++++++++------------ dlls/ddraw/ddraw_private.h | 3 - dlls/ddraw/device.c | 386 ++++++++++++++++++++++++-------------------- dlls/ddraw/light.c | 9 +- dlls/ddraw/main.c | 30 ++--- dlls/ddraw/material.c | 18 +- dlls/ddraw/palette.c | 19 ++- dlls/ddraw/surface.c | 284 ++++++++++++++++++--------------- dlls/ddraw/vertexbuffer.c | 33 +++-- dlls/ddraw/viewport.c | 73 +++++---- 11 files changed, 597 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2963b662c52d909f0858…

1 0

Matej Špindler : ws2_32: Test GetAddrInfo with zero port.
by Alexandre Julliard Nov. 14, 2011

Nov. 14, 2011

Module: wine Branch: master Commit: 2e5718ba95fadc8f4d0441cb3ca511bcec66a4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5718ba95fadc8f4d0441cb3… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri Nov 11 13:58:47 2011 +0100 ws2_32: Test GetAddrInfo with zero port. --- dlls/ws2_32/tests/sock.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7a64e0e..237bc86 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4152,6 +4152,7 @@ static void test_GetAddrInfoW(void) static const WCHAR port[] = {'8','0',0}; static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR zero[] = {'0',0}; int ret; ADDRINFOW *result, hint; @@ -4176,6 +4177,24 @@ static void test_GetAddrInfoW(void) } pFreeAddrInfoW(result); + result = NULL; + ret = pGetAddrInfoW(NULL, zero, NULL, &result); + todo_wine + { + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + } + pFreeAddrInfoW(result); + + result = NULL; + ret = pGetAddrInfoW(empty, zero, NULL, &result); + todo_wine + { + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + } + pFreeAddrInfoW(result); + ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result);

1 0