wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Frédéric Delanoy : winelib: Use valid values for 'filename' tag attributes.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: f4f1d0ef4d4963520a06bbf73bb85d0a5b60edcb URL: http://source.winehq.org/git/docs.git/?a=commit;h=f4f1d0ef4d4963520a06bbf73… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 14:20:19 2013 +0200 winelib: Use valid values for 'filename' tag attributes. --- en/winelib-bindlls.sgml | 4 ++-- en/winelib-intro.sgml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index 596c112..304a3fe 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -45,7 +45,7 @@ extremely simple and leads into the subject in "baby steps". The second example is the ODBC interface proxy in Wine. The files to which we will refer for the ODBC example are currently in the - <filename class="Directory">dlls/odbc32</filename> directory of the + <filename class="directory">dlls/odbc32</filename> directory of the Wine source. </para> <para> @@ -170,7 +170,7 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, <para> For a more extensive case we can use the ODBC example. This is implemented as a header file - (<filename class="HeaderFile">proxyodbc.h</filename>) and the actual + (<filename class="headerfile">proxyodbc.h</filename>) and the actual C source file (<filename>proxyodbc.c</filename>). Although the file is quite long it is extremely simple in structure. </para> diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index 8a6fe38..0f85543 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -208,8 +208,8 @@ can help it guess what it is that your project is trying to build. Otherwise, it is able to understand Visual C++ projects. Usually the executables and libraries are - in a <filename class="Directory">Release</filename> or - <filename class="Directory">Debug</filename> subdirectory of the + in a <filename class="directory">Release</filename> or + <filename class="directory">Debug</filename> subdirectory of the directory where the sources are. So it's best if you can transfer the source files and either of these directories to Linux. Note that you don't need to transfer the

1 0

Frédéric Delanoy : winelib: Standardize on " winelib" spelling.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: 8bdd595486c00f63f31484af192718f36253bee6 URL: http://source.winehq.org/git/docs.git/?a=commit;h=8bdd595486c00f63f31484af1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 12:02:37 2013 +0200 winelib: Standardize on "winelib" spelling. --- en/winelib-bindlls.sgml | 6 +++--- en/winelib-mfc.sgml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index e72cae8..596c112 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -1,6 +1,6 @@ <chapter id="bindlls">  - <title id="bindlls.title">Building WineLib DLLs</title> + <title id="bindlls.title">Building Winelib DLLs</title> <sect1 id="bindlls-intro"> <title id="binary-dlls-intro.title">Introduction</title> <para> @@ -136,8 +136,8 @@ signed short MyLinuxFunc (unsigned short a, void *b, void *c, * Note that this is a Unix file; please don't go converting it to DOS format * (e.g. converting line feeds to Carriage return/Line feed). * - * This file should be built in a Wine environment as a WineLib library, - * linked to the Linux <3rd party> libraries (currently libxxxx.so and + * This file should be built in a Wine environment as a Winelib library, + * linked to the Linux <3rd party> libraries (currently libxxxx.so and * libyyyy.so) */ diff --git a/en/winelib-mfc.sgml b/en/winelib-mfc.sgml index 3583b19..5d38105 100644 --- a/en/winelib-mfc.sgml +++ b/en/winelib-mfc.sgml @@ -133,7 +133,7 @@ <title id="mfc-compiling.title">Compiling the MFC</title> <para> Here is a set of recommendations for getting the MFC compiled with - WineLib: + Winelib: </para> <para> We recommend running winemaker in

1 0

Frédéric Delanoy : wineusr: Use double quotes around SGML attribute values.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: 21d506ee9ad000619004b464408ab0e92e028b33 URL: http://source.winehq.org/git/docs.git/?a=commit;h=21d506ee9ad000619004b4644… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 01:22:33 2013 +0200 wineusr: Use double quotes around SGML attribute values. --- en/wineusr-introduction.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-introduction.sgml b/en/wineusr-introduction.sgml index bb578e4..070bb00 100644 --- a/en/wineusr-introduction.sgml +++ b/en/wineusr-introduction.sgml @@ -286,7 +286,7 @@ purchasing these products. </para> <table><title>Various Wine offerings</title> - <tgroup cols=3 align="left"> + <tgroup cols="3" align="left"> <thead> <row> <entry>Product</entry>

1 0

Frédéric Delanoy : winedev: Use double quotes around SGML attribute values.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: bd93071030c8f4ae6d30b341feb2c78b3501c00f URL: http://source.winehq.org/git/docs.git/?a=commit;h=bd93071030c8f4ae6d30b341f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 01:22:32 2013 +0200 winedev: Use double quotes around SGML attribute values. --- en/winedev-debugger.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 6bec08b..c727985 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2608,7 +2608,7 @@ $ gdb wine <sect2> <title>Main differences between winedbg and regular Unix debuggers</title> <table><title>Debuggers comparison</title> - <tgroup cols=2 align="left"> + <tgroup cols="2" align="left"> <tbody> <row> <entry>WineDbg</entry><entry>gdb</entry>

1 0

Nikolay Sivov : ntdll/tests: Properly skip on missing functions.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 7e136d68f7625b61afeb61b003b9602124a4c74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e136d68f7625b61afeb61b00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 22 13:02:04 2013 +0400 ntdll/tests: Properly skip on missing functions. --- dlls/ntdll/tests/rtlstr.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 69f2586..e8524da 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -196,6 +196,12 @@ static void test_RtlInitUnicodeStringEx(void) UNICODE_STRING uni; NTSTATUS result; + if (!pRtlInitUnicodeStringEx) + { + win_skip("RtlInitUnicodeStringEx is not available\n"); + return; + } + teststring2 = HeapAlloc(GetProcessHeap(), 0, (TESTSTRING2_LEN + 1) * sizeof(WCHAR)); memset(teststring2, 'X', TESTSTRING2_LEN * sizeof(WCHAR)); teststring2[TESTSTRING2_LEN] = '\0'; @@ -410,6 +416,12 @@ static void test_RtlDuplicateUnicodeString(void) NTSTATUS result; unsigned int test_num; + if (!pRtlDuplicateUnicodeString) + { + win_skip("RtlDuplicateUnicodeString is not available\n"); + return; + } + for (test_num = 0; test_num < NB_DUPL_USTR; test_num++) { source_str.Length = dupl_ustr[test_num].source_Length; source_str.MaximumLength = dupl_ustr[test_num].source_MaximumLength; @@ -1184,6 +1196,12 @@ static void test_RtlFindCharInUnicodeString(void) unsigned int idx; unsigned int test_num; + if (!pRtlFindCharInUnicodeString) + { + win_skip("RtlFindCharInUnicodeString is not available\n"); + return; + } + for (test_num = 0; test_num < NB_FIND_CH_IN_USTR; test_num++) { if (find_ch_in_ustr[test_num].main_str != NULL) { main_str.Length = strlen(find_ch_in_ustr[test_num].main_str) * sizeof(WCHAR); @@ -1714,6 +1732,12 @@ static void test_RtlIsTextUnicode(void) int flags; int i; + if (!pRtlIsTextUnicode) + { + win_skip("RtlIsTextUnicode is not available\n"); + return; + } + ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); res = pRtlIsTextUnicode(unicode, sizeof(unicode), NULL); @@ -1843,6 +1867,12 @@ static void test_RtlGUIDFromString(void) UNICODE_STRING str; NTSTATUS ret; + if (!pRtlGUIDFromString) + { + win_skip("RtlGUIDFromString is not available\n"); + return; + } + str.Length = str.MaximumLength = sizeof(szGuid) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid; @@ -1862,6 +1892,12 @@ static void test_RtlStringFromGUID(void) UNICODE_STRING str; NTSTATUS ret; + if (!pRtlStringFromGUID) + { + win_skip("RtlStringFromGUID is not available\n"); + return; + } + str.Length = str.MaximumLength = 0; str.Buffer = NULL; @@ -1955,18 +1991,12 @@ START_TEST(rtlstr) test_RtlAppendUnicodeStringToString(); } - if (pRtlInitUnicodeStringEx) - test_RtlInitUnicodeStringEx(); - if (pRtlDuplicateUnicodeString) - test_RtlDuplicateUnicodeString(); - if (pRtlFindCharInUnicodeString) - test_RtlFindCharInUnicodeString(); - if (pRtlGUIDFromString) - test_RtlGUIDFromString(); - if (pRtlStringFromGUID) - test_RtlStringFromGUID(); - if (pRtlIsTextUnicode) - test_RtlIsTextUnicode(); + test_RtlInitUnicodeStringEx(); + test_RtlDuplicateUnicodeString(); + test_RtlFindCharInUnicodeString(); + test_RtlGUIDFromString(); + test_RtlStringFromGUID(); + test_RtlIsTextUnicode(); if(0) { test_RtlUpcaseUnicodeChar();

1 0

Marcus Meissner : msxml3/tests: Check ISAXContentHandler_endDocument ( Coverity).
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: f6a16d8e0428abf40064d6731c5710ff00e0c152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6a16d8e0428abf40064d6731… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jul 22 09:01:31 2013 +0200 msxml3/tests: Check ISAXContentHandler_endDocument (Coverity). --- dlls/msxml3/tests/saxreader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index df0aa47..dec62bb 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3712,7 +3712,8 @@ static void test_mxwriter_startendelement(void) ok(!lstrcmpW(_bstr_("<abc>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); - ISAXContentHandler_endDocument(content); + hr = ISAXContentHandler_endDocument(content); + EXPECT_HR(hr, S_OK); IMXWriter_flush(writer); hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("abdcdef"), 3);

1 0

Dmitry Timoshkov : kernel32: GetShortPathName for a non-existent short file name should fail.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 4cc482bc0df758bec76ad1466abcba7f85e3cc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc482bc0df758bec76ad1466… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 14:02:38 2013 +0900 kernel32: GetShortPathName for a non-existent short file name should fail. --- dlls/kernel32/path.c | 30 ++++++++---------------------- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 63d977b..5cd3c4b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -441,8 +441,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl DWORD tmplen; WIN32_FIND_DATAW wfd; HANDLE goit; - UNICODE_STRING ustr; - WCHAR ustr_buf[8+1+3+1]; TRACE("%s\n", debugstr_w(longpath)); @@ -465,10 +463,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl sp = lp = 2; } - ustr.Buffer = ustr_buf; - ustr.Length = 0; - ustr.MaximumLength = sizeof(ustr_buf); - while (longpath[lp]) { /* check for path delimiters and reproduce them */ @@ -485,29 +479,21 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl continue; } - for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (longpath + lp); - lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); - /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3) + p = longpath + lp; + if (lp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) { - BOOLEAN spaces; - memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); - ustr_buf[tmplen] = '\0'; - ustr.Length = tmplen * sizeof(WCHAR); - if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) - { - sp += tmplen; - lp += tmplen; - continue; - } + tmpshortpath[sp++] = *p++; + tmpshortpath[sp++] = *p++; } + for (; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (longpath + lp); + lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); /* Check if the file exists and use the existing short file name */ goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; FindClose(goit); - strcpyW(tmpshortpath + sp, wfd.cAlternateFileName); + strcpyW(tmpshortpath + sp, wfd.cAlternateFileName[0] ? wfd.cAlternateFileName : wfd.cFileName); sp += strlenW(tmpshortpath + sp); lp += tmplen; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index d703aa9..c49a76f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1281,9 +1281,7 @@ static void test_GetShortPathNameW(void) /* GetShortPathName for a non-existent short file name should fail */ SetLastError(0xdeadbeef); length = GetShortPathNameW( short_path, path, 0 ); -todo_wine ok(!length, "GetShortPathNameW should fail\n"); -todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );

1 0

Aric Stewart : wineqtdecoder: Calculate AvgTimePerFrame for video tracks.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: deff27e23ee9dca1791501c3ba31a0e6cf042c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deff27e23ee9dca1791501c3b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 15 13:04:42 2013 -0500 wineqtdecoder: Calculate AvgTimePerFrame for video tracks. --- dlls/wineqtdecoder/qtsplitter.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 03cc8a9..9aa6314 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -884,6 +884,10 @@ static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) int t; DWORD outputWidth, outputHeight, outputDepth; Fixed trackWidth, trackHeight; + Media videoMedia; + long sampleCount; + TimeValue64 duration; + TimeScale timeScale; ZeroMemory(&amt, sizeof(amt)); amt.formattype = FORMAT_VideoInfo; @@ -952,6 +956,12 @@ static HRESULT QT_Process_Video_Track(QTSplitter* filter, Track trk) return E_FAIL; } + videoMedia = GetTrackMedia(trk); + sampleCount = GetMediaSampleCount(videoMedia); + timeScale = GetMediaTimeScale(videoMedia); + duration = GetMediaDisplayDuration(videoMedia); + pvi->AvgTimePerFrame = (100000.0 * sampleCount * timeScale) / duration; + piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &filter->filter.IBaseFilter_iface; lstrcpyW(piOutput.achName,szwVideoOut);

1 0

Rico Schüller : d3dx9/tests: Add ID3DXConstantTable scalar test.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 0a2085f50227d3793df50e293982dbc89b2655ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2085f50227d3793df50e293… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:47 2013 +0200 d3dx9/tests: Add ID3DXConstantTable scalar test. --- dlls/d3dx9_36/tests/shader.c | 606 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 606 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a2085f50227d3793df50…

1 0

Rico Schüller : d3dx9: Improve ID3DXConstantTable:: Set*().
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 8231c8ef50ca26f9e9208ffe3db4563f9a77dc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8231c8ef50ca26f9e9208ffe3… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jul 22 14:35:41 2013 +0200 d3dx9: Improve ID3DXConstantTable::Set*(). --- dlls/d3dx9_36/shader.c | 665 ++++++++++++++++++++++++------------------ dlls/d3dx9_36/tests/shader.c | 2 +- 2 files changed, 383 insertions(+), 284 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8231c8ef50ca26f9e9208…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
45
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 July 2013