June 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : winegcc: Load the Unicode argv dynamically from the generated stub.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 5f7bbb2ab2ce4f2d66e610e8f5039733dea2653e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f7bbb2ab2ce4f2d66e610e8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 15 18:28:29 2010 +0200 winegcc: Load the Unicode argv dynamically from the generated stub. --- tools/winegcc/winegcc.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 0dc7cc4..fd31060 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -561,10 +561,17 @@ static const char *mingw_unicode_hack( struct options *opts ) char *main_stub = get_temp_file( opts->output_name, ".c" ); create_file( main_stub, 0644, - "#include <stdlib.h>\n" - "extern int wmain(int,wchar_t**);\n" + "#include <stdarg.h>\n" + "#include <windef.h>\n" + "#include <winbase.h>\n" "int main( int argc, char *argv[] )\n{\n" - " return wmain( argc, __wargv );\n}\n" ); + " int wargc;\n" + " wchar_t **wargv, **wenv;\n" + " HMODULE msvcrt = LoadLibraryA( \"msvcrt.dll\" );\n" + " void __cdecl (*__wgetmainargs)(int *argc, wchar_t** *wargv, wchar_t** *wenvp, int expand_wildcards,\n" + " int *new_mode) = (void *)GetProcAddress( msvcrt, \"__wgetmainargs\" );\n" + " __wgetmainargs( &wargc, &wargv, &wenv, 0, NULL );\n" + " return wmain( wargc, wargv );\n}\n" ); return compile_to_object( opts, main_stub, NULL ); } @@ -736,7 +743,8 @@ static void build(struct options* opts) if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0"); if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); - if (!opts->shared && opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); + if (!opts->shared && opts->use_msvcrt && opts->target_platform == PLATFORM_CYGWIN) + add_library(opts, lib_dirs, files, "msvcrt"); for ( j = 0; j < files->size; j++ ) { @@ -768,12 +776,8 @@ static void build(struct options* opts) if (ext) *ext = 0; p += 3; - /* don't use Wine's msvcrt on mingw */ - if (strcmp( p, "msvcrt" ) || opts->target_platform == PLATFORM_CYGWIN) - { - strarray_add(link_args, strmake("-L%s", lib )); - strarray_add(link_args, strmake("-l%s", p )); - } + strarray_add(link_args, strmake("-L%s", lib )); + strarray_add(link_args, strmake("-l%s", p )); free( lib ); break; }

1 0

Andrew Nguyen : winex11.drv: Report a non-zero COLORRES capability value.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: b4d58fe58faf960f6914a91b4f9ca0052f90689a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d58fe58faf960f6914a91b4… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 00:26:20 2010 -0500 winex11.drv: Report a non-zero COLORRES capability value. --- dlls/gdi32/tests/dc.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 10 +++++++++- 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b081376..5d56caa 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -556,6 +556,45 @@ static void test_boundsrect_invalid(void) DeleteDC(hdc); } +static void test_desktop_colorres(void) +{ + HDC hdc = GetDC(NULL); + int bitspixel, colorres; + + bitspixel = GetDeviceCaps(hdc, BITSPIXEL); + ok(bitspixel != 0, "Expected to get valid BITSPIXEL capability value\n"); + + colorres = GetDeviceCaps(hdc, COLORRES); + ok(colorres != 0 || + broken(colorres == 0), /* Win9x */ + "Expected to get valid COLORRES capability value\n"); + + if (colorres) + { + switch (bitspixel) + { + case 8: + ok(colorres == 18, + "Expected COLORRES to be 18, got %d\n", colorres); + break; + case 16: + ok(colorres == 16, + "Expected COLORRES to be 16, got %d\n", colorres); + break; + case 24: + case 32: + ok(colorres == 24, + "Expected COLORRES to be 24, got %d\n", bitspixel); + break; + default: + ok(0, "Got unknown BITSPIXEL %d with COLORRES %d\n", bitspixel, colorres); + break; + } + } + + DeleteDC(hdc); +} + START_TEST(dc) { test_savedc(); @@ -565,4 +604,5 @@ START_TEST(dc) test_DC_bitmap(); test_DeleteDC(); test_boundsrect_invalid(); + test_desktop_colorres(); } diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ba6cc51..1462b5e 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -235,6 +235,15 @@ INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap ) return text_caps; case CLIPCAPS: return CP_REGION; + case COLORRES: + /* The observed correspondence between BITSPIXEL and COLORRES is: + * BITSPIXEL: 8 -> COLORRES: 18 + * BITSPIXEL: 16 -> COLORRES: 16 + * BITSPIXEL: 24 -> COLORRES: 24 + * (note that depth_to_bpp never chooses a bpp of 24) + * BITSPIXEL: 32 -> COLORRES: 24 */ + return (screen_bpp <= 8) ? 18 : + (screen_bpp == 32) ? 24 : screen_bpp; case RASTERCAPS: return (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | @@ -258,7 +267,6 @@ INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap ) case SIZEPALETTE: return palette_size; case NUMRESERVED: - case COLORRES: case PHYSICALWIDTH: case PHYSICALHEIGHT: case PHYSICALOFFSETX:

1 0

Rico Schüller : wined3d: Improve fglrx glsl spam filter.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: c223e73bbb6dad17123f5bb5fd3f3c34c9bb282d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c223e73bbb6dad17123f5bb5f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jun 15 17:20:39 2010 +0200 wined3d: Improve fglrx glsl spam filter. --- dlls/wined3d/glsl_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba16eae..9781a4b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -203,10 +203,13 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLhandleA "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx, with \n */ "Fragment shader was successfully compiled to run on hardware.", /* fglrx, no \n */ "Fragment shader(s) linked, vertex shader(s) linked. \n ", /* fglrx, with \n */ + "Fragment shader(s) linked, vertex shader(s) linked. \n", /* fglrx, with \n */ "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ "Vertex shader(s) linked, no fragment shader(s) defined. \n ", /* fglrx, with \n */ + "Vertex shader(s) linked, no fragment shader(s) defined. \n", /* fglrx, with \n */ "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ "Fragment shader(s) linked, no vertex shader(s) defined. \n ", /* fglrx, with \n */ + "Fragment shader(s) linked, no vertex shader(s) defined. \n", /* fglrx, with \n */ "Fragment shader(s) linked, no vertex shader(s) defined.", /* fglrx, no \n */ };

1 0

Sven Baars : oleacc: Fix Dutch translation.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: ec25a446cd45de6be6deffa95b04973fe217e4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec25a446cd45de6be6deffa95… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jun 15 17:40:05 2010 +0200 oleacc: Fix Dutch translation. --- dlls/oleacc/oleacc_Nl.rc | 66 +++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/oleacc/oleacc_Nl.rc b/dlls/oleacc/oleacc_Nl.rc index 47daa1f..8c9552b 100644 --- a/dlls/oleacc/oleacc_Nl.rc +++ b/dlls/oleacc/oleacc_Nl.rc @@ -25,44 +25,44 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { 0 "onbekend object" /* undocumented */ - ROLE_SYSTEM_TITLEBAR "titel balk" - ROLE_SYSTEM_MENUBAR "menu balk" - ROLE_SYSTEM_SCROLLBAR "scroll balk" + ROLE_SYSTEM_TITLEBAR "titelbalk" + ROLE_SYSTEM_MENUBAR "menubalk" + ROLE_SYSTEM_SCROLLBAR "scrollbalk" ROLE_SYSTEM_GRIP "handvat" ROLE_SYSTEM_SOUND "geluid" ROLE_SYSTEM_CURSOR "cursor" - ROLE_SYSTEM_CARET "tekst cursor" - ROLE_SYSTEM_ALERT "alarm" + ROLE_SYSTEM_CARET "tekstcursor" + ROLE_SYSTEM_ALERT "waarschuwing" ROLE_SYSTEM_WINDOW "venster" ROLE_SYSTEM_CLIENT "client" - ROLE_SYSTEM_MENUPOPUP "popup menu" - ROLE_SYSTEM_MENUITEM "menu item" - ROLE_SYSTEM_TOOLTIP "tool tip" + ROLE_SYSTEM_MENUPOPUP "popupmenu" + ROLE_SYSTEM_MENUITEM "menu-item" + ROLE_SYSTEM_TOOLTIP "tooltip" ROLE_SYSTEM_APPLICATION "programma" ROLE_SYSTEM_DOCUMENT "document" ROLE_SYSTEM_PANE "sectie" ROLE_SYSTEM_CHART "diagram" - ROLE_SYSTEM_DIALOG "keuze" - ROLE_SYSTEM_BORDER "randen" + ROLE_SYSTEM_DIALOG "dialoog" + ROLE_SYSTEM_BORDER "rand" ROLE_SYSTEM_GROUPING "groepering" - ROLE_SYSTEM_SEPARATOR "separator" - ROLE_SYSTEM_TOOLBAR "knoppen balk" - ROLE_SYSTEM_STATUSBAR "status balk" + ROLE_SYSTEM_SEPARATOR "scheidingsteken" + ROLE_SYSTEM_TOOLBAR "gereedschapsbalk" + ROLE_SYSTEM_STATUSBAR "statusbalk" ROLE_SYSTEM_TABLE "tabel" - ROLE_SYSTEM_COLUMNHEADER "kolom hoofd" - ROLE_SYSTEM_ROWHEADER "rij hoofd" + ROLE_SYSTEM_COLUMNHEADER "kolomtitel" + ROLE_SYSTEM_ROWHEADER "rij-titel" ROLE_SYSTEM_COLUMN "kolom" ROLE_SYSTEM_ROW "rij" ROLE_SYSTEM_CELL "cel" ROLE_SYSTEM_LINK "link" - ROLE_SYSTEM_HELPBALLOON "help ballon" + ROLE_SYSTEM_HELPBALLOON "help-ballon" ROLE_SYSTEM_CHARACTER "karakter" ROLE_SYSTEM_LIST "lijst" - ROLE_SYSTEM_LISTITEM "lijst onderdeel" - ROLE_SYSTEM_OUTLINE "outline" - ROLE_SYSTEM_OUTLINEITEM "outline onderdeel" - ROLE_SYSTEM_PAGETAB "pagina tab" - ROLE_SYSTEM_PROPERTYPAGE "eigenschappen pagina" + ROLE_SYSTEM_LISTITEM "lijstonderdeel" + ROLE_SYSTEM_OUTLINE "omtrek" + ROLE_SYSTEM_OUTLINEITEM "omtrekonderdeel" + ROLE_SYSTEM_PAGETAB "paginatab" + ROLE_SYSTEM_PROPERTYPAGE "eigenschap-pagina" ROLE_SYSTEM_INDICATOR "indicator" ROLE_SYSTEM_GRAPHIC "grafisch" ROLE_SYSTEM_STATICTEXT "vaste tekst" @@ -70,23 +70,23 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_PUSHBUTTON "drukknop" ROLE_SYSTEM_CHECKBUTTON "aankruisvakje" ROLE_SYSTEM_RADIOBUTTON "radioknop" - ROLE_SYSTEM_COMBOBOX "combo box" - ROLE_SYSTEM_DROPLIST "selectie box" + ROLE_SYSTEM_COMBOBOX "combinatievak" + ROLE_SYSTEM_DROPLIST "selectievak" ROLE_SYSTEM_PROGRESSBAR "voortgangsbalk" - ROLE_SYSTEM_DIAL "draaiknop" - ROLE_SYSTEM_HOTKEYFIELD "hotkey veld" + ROLE_SYSTEM_DIAL "bellen" + ROLE_SYSTEM_HOTKEYFIELD "sneltoetsveld" ROLE_SYSTEM_SLIDER "schuifknop" - ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_SPINBUTTON "draaischijf" ROLE_SYSTEM_DIAGRAM "diagram" ROLE_SYSTEM_ANIMATION "animatie" ROLE_SYSTEM_EQUATION "formule" - ROLE_SYSTEM_BUTTONDROPDOWN "dropdown knop" - ROLE_SYSTEM_BUTTONMENU "menu knop" - ROLE_SYSTEM_BUTTONDROPDOWNGRID "dropdown grid knop" + ROLE_SYSTEM_BUTTONDROPDOWN "dropdownknop" + ROLE_SYSTEM_BUTTONMENU "menuknop" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "grid dropdownknop" ROLE_SYSTEM_WHITESPACE "lege ruimte" - ROLE_SYSTEM_PAGETABLIST "pagina tab lijst" + ROLE_SYSTEM_PAGETABLIST "paginatablijst" ROLE_SYSTEM_CLOCK "klok" - ROLE_SYSTEM_SPLITBUTTON "splits knop" - ROLE_SYSTEM_IPADDRESS "IP adres" - ROLE_SYSTEM_OUTLINEBUTTON "outline knop" + ROLE_SYSTEM_SPLITBUTTON "splitsknop" + ROLE_SYSTEM_IPADDRESS "IP-adres" + ROLE_SYSTEM_OUTLINEBUTTON "omtrekknop" }

1 0

Detlef Riekenberg : winspool: Support the spooler in GetPrinterData.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: ce51d9d0c966c542851940a11c415a085ea436d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce51d9d0c966c542851940a11… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 15 17:25:16 2010 +0200 winspool: Support the spooler in GetPrinterData. --- dlls/winspool.drv/info.c | 78 ++++++++++++++++++++++++++++++--------------- tools/wine.inf.in | 1 + 2 files changed, 53 insertions(+), 26 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4993a78..3f97ebd 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5354,27 +5354,40 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, LPCSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { - HKEY hkeyPrinter, hkeySubkey; + opened_printer_t *printer; + HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0; DWORD ret; - TRACE("(%p, %s, %s %p, %p, %08x, %p)\n", hPrinter, - debugstr_a(pKeyName), debugstr_a(pValueName), pType, pData, nSize, - pcbNeeded); + TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_a(pKeyName), + debugstr_a(pValueName), pType, pData, nSize, pcbNeeded); - if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter)) - != ERROR_SUCCESS) - return ret; + printer = get_opened_printer(hPrinter); + if(!printer) return ERROR_INVALID_HANDLE; - if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) - != ERROR_SUCCESS) { - WARN("Can't open subkey %s\n", debugstr_a(pKeyName)); - RegCloseKey(hkeyPrinter); - return ret; + ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); + if (ret) return ret; + + if (printer->name) { + + ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); + if (ret) { + RegCloseKey(hkeyPrinters); + return ret; + } + if((ret = RegOpenKeyA(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) { + WARN("Can't open subkey %s: %d\n", debugstr_a(pKeyName), ret); + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + return ret; + } } *pcbNeeded = nSize; - ret = RegQueryValueExA(hkeySubkey, pValueName, 0, pType, pData, pcbNeeded); + ret = RegQueryValueExA(printer->name ? hkeySubkey : hkeyPrinters, pValueName, + 0, pType, pData, pcbNeeded); + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); return ret; } @@ -5385,27 +5398,40 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, LPCWSTR pValueName, LPDWORD pType, LPBYTE pData, DWORD nSize, LPDWORD pcbNeeded) { - HKEY hkeyPrinter, hkeySubkey; + opened_printer_t *printer; + HKEY hkeyPrinters, hkeyPrinter = 0, hkeySubkey = 0; DWORD ret; - TRACE("(%p, %s, %s %p, %p, %08x, %p)\n", hPrinter, - debugstr_w(pKeyName), debugstr_w(pValueName), pType, pData, nSize, - pcbNeeded); + TRACE("(%p, %s, %s, %p, %p, %u, %p)\n", hPrinter, debugstr_w(pKeyName), + debugstr_w(pValueName), pType, pData, nSize, pcbNeeded); - if((ret = WINSPOOL_GetOpenedPrinterRegKey(hPrinter, &hkeyPrinter)) - != ERROR_SUCCESS) - return ret; + printer = get_opened_printer(hPrinter); + if(!printer) return ERROR_INVALID_HANDLE; - if((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) - != ERROR_SUCCESS) { - WARN("Can't open subkey %s\n", debugstr_w(pKeyName)); - RegCloseKey(hkeyPrinter); - return ret; + ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); + if (ret) return ret; + + if (printer->name) { + + ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); + if (ret) { + RegCloseKey(hkeyPrinters); + return ret; + } + if((ret = RegOpenKeyW(hkeyPrinter, pKeyName, &hkeySubkey)) != ERROR_SUCCESS) { + WARN("Can't open subkey %s: %d\n", debugstr_w(pKeyName), ret); + RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); + return ret; + } } *pcbNeeded = nSize; - ret = RegQueryValueExW(hkeySubkey, pValueName, 0, pType, pData, pcbNeeded); + ret = RegQueryValueExW(printer->name ? hkeySubkey : hkeyPrinters, pValueName, + 0, pType, pData, pcbNeeded); + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); + RegCloseKey(hkeyPrinters); return ret; } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index b8f4a82..63a78d2 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -1009,6 +1009,7 @@ HKLM,"Software\Microsoft\OLE","EnableRemoteConnect",,"N" [Printing] HKLM,%Control%\Print\Monitors\Local Port,"Driver",2,"localspl.dll" +HKLM,%Control%\Print\Printers,"DefaultSpoolDirectory",2,"%11%\spool\printers" HKLM,%CurrentVersionNT%\Ports,"FILE:",,"" HKLM,%CurrentVersionNT%\Ports,"LPT1:",,"" HKLM,%CurrentVersionNT%\Ports,"LPT2:",,""

1 0

Andrew Nguyen : msxml3: Ignore the encoding attribute when loading a new XML document in IXMLDOMDocument ::loadXML.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 9f1fb46543fccc9075a2dd6fea9f16423ba60728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1fb46543fccc9075a2dd6fe… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 14 07:54:40 2010 -0500 msxml3: Ignore the encoding attribute when loading a new XML document in IXMLDOMDocument::loadXML. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/domdoc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index e24077e..34be70c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -148,7 +148,7 @@ static xmlDocPtr doparse( char *ptr, int len ) * use xmlReadMemory if possible so we can suppress * writing errors to stderr */ - return xmlReadMemory( ptr, len, NULL, NULL, + return xmlReadMemory( ptr, len, NULL, "UTF-8", XML_PARSE_NOERROR | XML_PARSE_NOWARNING | XML_PARSE_NOBLANKS ); #else return xmlParseMemory( ptr, len ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c04078c..818f628 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -90,6 +90,16 @@ static const WCHAR szComplete5[] = { '<','/','S',':','s','e','a','r','c','h','>',0 }; +static const WCHAR szComplete6[] = { + '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\'','1','.','0','\'',' ', + 'e','n','c','o','d','i','n','g','=','\'','W','i','n','d','o','w','s','-','1','2','5','2','\'','?','>','\n', + '<','o','p','e','n','>','<','/','o','p','e','n','>','\n',0 +}; + +static const CHAR szNonUnicodeXML[] = +"<?xml version='1.0' encoding='Windows-1252'?>\n" +"<open></open>\n"; + static const CHAR szExampleXML[] = "<?xml version='1.0' encoding='utf-8'?>\n" "<root xmlns:foo='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" @@ -618,6 +628,22 @@ if (0) ok( r == S_OK, "loadXML failed\n"); ok( b == VARIANT_TRUE, "failed to load XML string\n"); + /* loadXML ignores the encoding attribute and always expects Unicode */ + b = VARIANT_FALSE; + str = SysAllocString( szComplete6 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + /* try a BSTR containing a Windows-1252 document */ + b = VARIANT_TRUE; + str = SysAllocStringByteLen( szNonUnicodeXML, sizeof(szNonUnicodeXML) - 1 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_FALSE, "loadXML succeeded\n"); + ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); + SysFreeString( str ); + /* try to load something valid */ b = VARIANT_FALSE; str = SysAllocString( szComplete1 );

1 0

Andrew Nguyen : msxml3/tests: Correct the sense of a few test failure messages.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 6002cb06fbe60dea7c3fb91ee006b4c88e0e86ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6002cb06fbe60dea7c3fb91ee… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 14 07:54:48 2010 -0500 msxml3/tests: Correct the sense of a few test failure messages. --- dlls/msxml3/tests/domdoc.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 818f628..605628f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -563,11 +563,11 @@ if (0) /* try some stupid things */ r = IXMLDOMDocument_loadXML( doc, NULL, NULL ); - ok( r == S_FALSE, "loadXML failed\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); b = VARIANT_TRUE; r = IXMLDOMDocument_loadXML( doc, NULL, &b ); - ok( r == S_FALSE, "loadXML failed\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); ok( b == VARIANT_FALSE, "failed to load XML string\n"); /* try to load a document from a nonexistent file */ @@ -578,16 +578,16 @@ if (0) V_BSTR(&var) = str; r = IXMLDOMDocument_load( doc, var, &b); - ok( r == S_FALSE, "load (from file) failed\n"); - ok( b == VARIANT_FALSE, "failed to load XML file\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); + ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); /* try load an empty document */ b = VARIANT_TRUE; str = SysAllocString( szEmpty ); r = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( r == S_FALSE, "loadXML failed\n"); - ok( b == VARIANT_FALSE, "failed to load XML string\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); + ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); r = IXMLDOMDocument_get_async( doc, &b ); @@ -609,8 +609,8 @@ if (0) b = VARIANT_TRUE; str = SysAllocString( szIncomplete ); r = IXMLDOMDocument_loadXML( doc, str, &b ); - ok( r == S_FALSE, "loadXML failed\n"); - ok( b == VARIANT_FALSE, "failed to load XML string\n"); + ok( r == S_FALSE, "loadXML succeeded\n"); + ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); /* check that there's no document element */

1 0

Alexandre Julliard : winegcc: Add explicit support for the Cygwin platform.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: ba9ec152e17f436fb3e73d8e08af811ba3520cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9ec152e17f436fb3e73d8e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 15:58:07 2010 +0200 winegcc: Add explicit support for the Cygwin platform. On Cygwin we want to use Wine's msvcrt, unlike on Mingw. --- tools/winegcc/utils.c | 2 +- tools/winegcc/utils.h | 2 +- tools/winegcc/winegcc.c | 18 +++++++++++++----- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 411a9c1..05b9a65 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -261,7 +261,7 @@ static char* try_lib_path(const char* dir, const char* pre, static file_type guess_lib_type(enum target_platform platform, const char* dir, const char* library, const char *suffix, char** file) { - if (platform != PLATFORM_WINDOWS) + if (platform != PLATFORM_WINDOWS && platform != PLATFORM_CYGWIN) { /* Unix shared object */ if ((*file = try_lib_path(dir, "lib", library, ".so", file_so))) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 31cc3b9..d819415 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -38,7 +38,7 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS + PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS, PLATFORM_CYGWIN }; void error(const char* s, ...) DECLSPEC_NORETURN; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 7e9c3f6..0dc7cc4 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -173,6 +173,7 @@ static const struct { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, { "solaris", PLATFORM_SOLARIS }, + { "cygwin", PLATFORM_CYGWIN }, { "mingw32", PLATFORM_WINDOWS }, { "windows", PLATFORM_WINDOWS }, { "winnt", PLATFORM_WINDOWS } @@ -230,6 +231,8 @@ static const enum target_cpu build_cpu = CPU_ARM; static enum target_platform build_platform = PLATFORM_APPLE; #elif defined(__sun) static enum target_platform build_platform = PLATFORM_SOLARIS; +#elif defined(__CYGWIN__) +static enum target_platform build_platform = PLATFORM_CYGWIN; #elif defined(_WIN32) static enum target_platform build_platform = PLATFORM_WINDOWS; #else @@ -332,7 +335,8 @@ static void compile(struct options* opts, const char* lang) break; } - if (opts->target_platform == PLATFORM_WINDOWS) goto no_compat_defines; + if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN) + goto no_compat_defines; if (opts->processor != proc_cpp) { @@ -678,7 +682,7 @@ static void build(struct options* opts) /* building for Windows is completely different */ - if (opts->target_platform == PLATFORM_WINDOWS) + if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN) { strarray *resources = strarray_alloc(); char *res_o_name = NULL; @@ -732,6 +736,7 @@ static void build(struct options* opts) if (!opts->nostartfiles) add_library(opts, lib_dirs, files, "winecrt0"); if (opts->shared && !opts->nostdlib) add_library(opts, lib_dirs, files, "wine"); + if (!opts->shared && opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt"); for ( j = 0; j < files->size; j++ ) { @@ -763,8 +768,12 @@ static void build(struct options* opts) if (ext) *ext = 0; p += 3; - strarray_add(link_args, strmake("-L%s", lib )); - strarray_add(link_args, strmake("-l%s", p )); + /* don't use Wine's msvcrt on mingw */ + if (strcmp( p, "msvcrt" ) || opts->target_platform == PLATFORM_CYGWIN) + { + strarray_add(link_args, strmake("-L%s", lib )); + strarray_add(link_args, strmake("-l%s", p )); + } free( lib ); break; } @@ -782,7 +791,6 @@ static void build(struct options* opts) break; } } - if (!opts->shared && (opts->use_msvcrt || opts->unicode_app)) strarray_add(link_args, "-lmsvcrt"); if (res_o_name) compile_resources_to_object( opts, resources, res_o_name );

1 0

Detlef Riekenberg : msvcr100: Sync exports to msvcr90.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 4e1b0da81462c0b31853d8c7e9f67d598ecbe3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1b0da81462c0b31853d8c7e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 14 14:32:29 2010 +0200 msvcr100: Sync exports to msvcr90. --- dlls/msvcr100/msvcr100.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 44c5b31..0d05c28 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -607,7 +607,7 @@ @ stub _fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ stub _fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32 @ stub _ftell_nolock @ stub _ftelli64 @ stub _ftelli64_nolock @@ -1079,7 +1079,7 @@ @ stub _stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 -@ stub _stat64i32 +@ cdecl _stat64i32(str ptr) msvcr90._stat64i32 @ cdecl _statusfp() msvcrt._statusfp @ stub _statusfp2 @ stub _strcoll_l

1 0

Detlef Riekenberg : msvcr80: Sync exports to msvcr90.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: d1a939bbdc6102334b44f222d3c8e3540dbfe3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a939bbdc6102334b44f222d… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 14 14:32:28 2010 +0200 msvcr80: Sync exports to msvcr90. --- dlls/msvcr80/msvcr80.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 256031c..b4c168a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -441,7 +441,7 @@ @ stub _fstat32 @ stub _fstat32i64 @ cdecl _fstat64(long ptr) msvcrt._fstat64 -@ stub _fstat64i32 +@ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32 @ stub _ftell_nolock @ stub _ftelli64 @ stub _ftelli64_nolock @@ -926,7 +926,7 @@ @ stub _stat32 @ stub _stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 -@ stub _stat64i32 +@ cdecl _stat64i32(str ptr) msvcr90._stat64i32 @ cdecl _statusfp() msvcrt._statusfp @ stub _statusfp2 @ stub _strcoll_l

1 0