wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

André Hentschel : propsys: Mention that the functions are stubs.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 164369736521bc6c2c9e5ea762a0c77b48465757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=164369736521bc6c2c9e5ea76… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 14 21:26:39 2010 +0200 propsys: Mention that the functions are stubs. --- dlls/propsys/propsys_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index d2b1744..cdda06d 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -50,14 +50,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { - FIXME("%s\n", debugstr_w(path)); + FIXME("%s stub\n", debugstr_w(path)); return S_OK; } HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR path) { - FIXME("%s\n", debugstr_w(path)); + FIXME("%s stub\n", debugstr_w(path)); return E_NOTIMPL; }

1 0

Dylan Smith : wordpad: Fix failing GetDlgItem that forced screen repaint.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 250855bfb0fd5535757bc4707cae7b36c321afac URL: http://source.winehq.org/git/wine.git/?a=commit;h=250855bfb0fd5535757bc4707… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 15 00:07:40 2010 -0400 wordpad: Fix failing GetDlgItem that forced screen repaint. The rebar is the parent of the ruler, not the top level window, so GetDlgItem was returning NULL when the window is resized. As a result the screen was being invalidated and repainted instead of the ruler. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 3b8b6bc..d73a79b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2546,7 +2546,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) HWND hwndEditor = preview_isactive() ? GetDlgItem(hWnd, IDC_PREVIEW) : GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); - HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER); + HWND hRulerWnd = GetDlgItem(hwndReBar, IDC_RULER); int rebarHeight = 0; if (hwndStatusBar)

1 0

Damjan Jovanovic : kernel32: Add a CopyFile test.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 6e5a22c733282a767c0d306d82b88de9520431bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5a22c733282a767c0d306d8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jun 15 07:22:43 2010 +0200 kernel32: Add a CopyFile test. --- dlls/kernel32/tests/file.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 550fc95..7e6b3de 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -640,7 +640,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok(retok, - "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", ret, GetLastError()); + "copying from an r+w opened and r shared file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying from a delete-locked source is unreliable */ @@ -648,7 +648,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok((!retok && GetLastError() == ERROR_SHARING_VIOLATION) || broken(retok) /* 98, Vista, 2k8, 7 */, - "copying from a delete-locked file failed (ret=%d, err=%d)\n", ret, GetLastError()); + "copying from a delete-locked file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying to a write-locked destination fails */ @@ -656,7 +656,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, - "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); + "copying to a write-locked file didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying to a r+w opened, w shared destination mostly succeeds */ @@ -664,7 +664,7 @@ static void test_CopyFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); retok = CopyFileA(source, dest, FALSE); ok(retok || broken(!retok && GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */, - "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", ret, GetLastError()); + "copying to a r+w opened and w shared file failed (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); /* copying to a delete-locked destination fails, even when the destination is delete-shared */ @@ -675,10 +675,18 @@ static void test_CopyFileA(void) { retok = CopyFileA(source, dest, FALSE); ok(!retok && GetLastError() == ERROR_SHARING_VIOLATION, - "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", ret, GetLastError()); + "copying to a delete-locked shared file didn't fail (ret=%d, err=%d)\n", retok, GetLastError()); CloseHandle(hfile); } + /* copy to a file that's opened the way Wine opens the source */ + hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file, error %d\n", GetLastError()); + retok = CopyFileA(source, dest, FALSE); + ok(retok || broken(GetLastError() == ERROR_SHARING_VIOLATION) /* Win 9x */, + "copying to a file opened the way Wine opens the source failed (ret=%d, err=%d)\n", retok, GetLastError()); + CloseHandle(hfile); + /* make sure that destination has correct size */ hfile = CreateFileA(dest, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to open destination file\n");

1 0

Nikolay Sivov : winhlp32: Added missed Russian resource.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 5c5b9a69334117c369c8f7e6759f426e8e4145ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5b9a69334117c369c8f7e67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 14 23:54:50 2010 +0400 winhlp32: Added missed Russian resource. --- programs/winhlp32/Ru.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Ru.rc b/programs/winhlp32/Ru.rc index 165094f..e1a7d25 100644 --- a/programs/winhlp32/Ru.rc +++ b/programs/winhlp32/Ru.rc @@ -80,6 +80,14 @@ CAPTION "Указатель" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Поиск" +{ + LTEXT "Не реализовано", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE {

1 0

Alexandre Julliard : include: Define the SPLREG winspool string constants.
by Alexandre Julliard 15 Jun '10

15 Jun '10

Module: wine Branch: master Commit: 44fedb5404d24d9771222b460ecae12bc883fb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fedb5404d24d9771222b460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 14 17:25:56 2010 +0200 include: Define the SPLREG winspool string constants. --- include/winspool.h | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 292 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44fedb5404d24d9771222…

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

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

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: Add proper skips when msxml3 DOM interfaces are unavailable.
by Alexandre Julliard 14 Jun '10

14 Jun '10

Module: wine Branch: master Commit: 341f878cbc376a51efddd04787990ce33ac64ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=341f878cbc376a51efddd0478… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jun 14 07:54:16 2010 -0500 msxml3: Add proper skips when msxml3 DOM interfaces are unavailable. --- dlls/msxml3/tests/domdoc.c | 117 +++++++++++++++++++++++++++++--------------- 1 files changed, 78 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=341f878cbc376a51efddd…

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

← Newer
1
...
35
36
37
38
39
40
41
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2010