July 2017 - Wine-commits - list.winehq.org

Alexandre Julliard : wineandroid: Add networking permissions.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: bc70768c981c60e8583c5c7e99b15a372de45fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc70768c981c60e8583c5c7e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 20:57:50 2017 +0200 wineandroid: Add networking permissions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wineandroid.drv/AndroidManifest.xml b/dlls/wineandroid.drv/AndroidManifest.xml index 631cc1a..c4c83d6 100644 --- a/dlls/wineandroid.drv/AndroidManifest.xml +++ b/dlls/wineandroid.drv/AndroidManifest.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.winehq.wine"> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <application android:icon="@drawable/wine" android:label="Wine" >

1 0

Alexandre Julliard : wineandroid: Support running binaries from the application directory.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 9027b927a47b413445403ec582d828d1035616b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9027b927a47b413445403ec58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 20:58:01 2017 +0200 wineandroid: Support running binaries from the application directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 16857f2..d1fe305 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -91,6 +91,7 @@ public class WineActivity extends Activity env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir ); env.put( "LC_ALL", locale ); env.put( "LANG", locale ); + env.put( "PATH", bindir.toString() + ":" + System.getenv( "PATH" )); if (cmdline == null) {

1 0

Andrew Eikum : wineandroid: Add an audio driver.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 287be7c5ee5ed4d070d93209c6cd355be6ed46da URL: http://source.winehq.org/git/wine.git/?a=commit;h=287be7c5ee5ed4d070d93209c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jul 3 20:59:40 2017 +0200 wineandroid: Add an audio driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/mmdevapi/main.c | 2 +- dlls/wineandroid.drv/AndroidManifest.xml | 1 + dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/mmdevdrv.c | 2937 +++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 6 + 7 files changed, 2949 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287be7c5ee5ed4d070d93…

1 0

Hugh McMaster : regedit/tests: Test the effect of whitespace-only lines during hex data concatenation.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 2db2a7aeefb27144cca9fb353900627a2b5ba1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db2a7aeefb27144cca9fb353… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:34 2017 +0000 regedit/tests: Test the effect of whitespace-only lines during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 71d0f14..3b5a7f5 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1464,12 +1464,21 @@ static void test_import_with_whitespace(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine10\"=hex(7):4c,69,6e,65,20,\\\n" + "\"Wine10a\"=hex(7):4c,69,6e,65,20,\\\n" " 63,6f,6e,\\\n\n" " 63,61,74,\\\n\n\n" " 65,6e,\\\n\n\n\n" " 61,74,69,6f,6e,00,00\n\n"); - verify_reg(hkey, "Wine10", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n \n" + " 63,61,74,\\\n\t\n\t\n" + " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" + " 61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, TODO_REG_SIZE); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : regedit: Remove un-necessary parser state assignment if we are returning to the same state.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: c750c2a98d20ed5bb91ccbe380fd9fb44975f832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c750c2a98d20ed5bb91ccbe38… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:43 2017 +0000 regedit: Remove un-necessary parser state assignment if we are returning to the same state. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index d6ea5c7..e5a4f74 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -532,7 +532,7 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) return NULL; if (strncmpW(line, hkcr, ARRAY_SIZE(hkcr))) - goto invalid; + return line; /* get key name */ while (line[key_end] && !isspaceW(line[key_end])) key_end++; @@ -548,7 +548,7 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) if (open_key(parser, line) != ERROR_SUCCESS) { output_message(STRING_OPEN_KEY_FAILED, line); - goto invalid; + return line; } parser->value_name = NULL; @@ -558,10 +558,6 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) set_state(parser, SET_VALUE); return value; - -invalid: - set_state(parser, PARSE_WIN31_LINE); - return line; } /* handler for parser LINE_START state */ @@ -589,7 +585,6 @@ static WCHAR *line_start_state(struct parser *parser, WCHAR *pos) case '\t': break; default: - set_state(parser, LINE_START); return p; } }

1 0

Hugh McMaster : regedit: Improve the parsing of multiline hex data during the registry import operation.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 032d32f94052a5e7386d07b4a4986d1140f736e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032d32f94052a5e7386d07b4a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 30 13:42:55 2017 +0000 regedit: Improve the parsing of multiline hex data during the registry import operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 143 +++++++++++++++++++++++++++++---------- programs/regedit/tests/regedit.c | 125 +++++++++++++++++----------------- 2 files changed, 171 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=032d32f94052a5e7386d0…

1 0

Piotr Caban : winedump: Add initial support for handling EMF+ records.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 26b1c6611e35b59b4b1efc1d9ad123308fb6f432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b1c6611e35b59b4b1efc1d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 30 18:03:38 2017 +0200 winedump: Add initial support for handling EMF+ records. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 2 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index 68f5b41..cce66c8 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -35,6 +35,15 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "gdiplusenums.h" + +typedef struct +{ + WORD Type; + WORD Flags; + DWORD Size; + DWORD DataSize; +} EmfPlusRecordHeader; static const char *debugstr_wn(const WCHAR *wstr, unsigned int n) { @@ -67,6 +76,7 @@ static unsigned int read_int(const unsigned char *buffer) } #define EMRCASE(x) case x: printf("%-20s %08x\n", #x, length); break +#define EMRPLUSCASE(x) case x: printf(" %-20s %04x %08x %08x\n", #x, header->Flags, header->Size, header->DataSize); break static unsigned offset = 0; @@ -162,7 +172,120 @@ static int dump_emfrecord(void) EMRCASE(EMR_WIDENPATH); EMRCASE(EMR_SELECTCLIPPATH); EMRCASE(EMR_ABORTPATH); - EMRCASE(EMR_GDICOMMENT); + + case EMR_GDICOMMENT: + { + printf("%-20s %08x\n", "EMR_GDICOMMENT", length); + + /* Handle EMF+ records */ + if (length >= 16 && !memcmp((char*)PRD(offset + 12, sizeof(unsigned int)), "EMF+", 4)) + { + const EmfPlusRecordHeader *header; + const unsigned int *data_size; + + offset += 8; + length -= 8; + data_size = PRD(offset, sizeof(*data_size)); + printf("data size = %x\n", *data_size); + offset += 8; + length -= 8; + + while (length >= sizeof(*header)) + { + header = PRD(offset, sizeof(*header)); + switch(header->Type) + { + EMRPLUSCASE(EmfPlusRecordTypeInvalid); + EMRPLUSCASE(EmfPlusRecordTypeHeader); + EMRPLUSCASE(EmfPlusRecordTypeEndOfFile); + EMRPLUSCASE(EmfPlusRecordTypeComment); + EMRPLUSCASE(EmfPlusRecordTypeGetDC); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatStart); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatSection); + EMRPLUSCASE(EmfPlusRecordTypeMultiFormatEnd); + EMRPLUSCASE(EmfPlusRecordTypeObject); + EMRPLUSCASE(EmfPlusRecordTypeClear); + EMRPLUSCASE(EmfPlusRecordTypeFillRects); + EMRPLUSCASE(EmfPlusRecordTypeDrawRects); + EMRPLUSCASE(EmfPlusRecordTypeFillPolygon); + EMRPLUSCASE(EmfPlusRecordTypeDrawLines); + EMRPLUSCASE(EmfPlusRecordTypeFillEllipse); + EMRPLUSCASE(EmfPlusRecordTypeDrawEllipse); + EMRPLUSCASE(EmfPlusRecordTypeFillPie); + EMRPLUSCASE(EmfPlusRecordTypeDrawPie); + EMRPLUSCASE(EmfPlusRecordTypeDrawArc); + EMRPLUSCASE(EmfPlusRecordTypeFillRegion); + EMRPLUSCASE(EmfPlusRecordTypeFillPath); + EMRPLUSCASE(EmfPlusRecordTypeDrawPath); + EMRPLUSCASE(EmfPlusRecordTypeFillClosedCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawClosedCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawCurve); + EMRPLUSCASE(EmfPlusRecordTypeDrawBeziers); + EMRPLUSCASE(EmfPlusRecordTypeDrawImage); + EMRPLUSCASE(EmfPlusRecordTypeDrawImagePoints); + EMRPLUSCASE(EmfPlusRecordTypeDrawString); + EMRPLUSCASE(EmfPlusRecordTypeSetRenderingOrigin); + EMRPLUSCASE(EmfPlusRecordTypeSetAntiAliasMode); + EMRPLUSCASE(EmfPlusRecordTypeSetTextRenderingHint); + EMRPLUSCASE(EmfPlusRecordTypeSetTextContrast); + EMRPLUSCASE(EmfPlusRecordTypeSetInterpolationMode); + EMRPLUSCASE(EmfPlusRecordTypeSetPixelOffsetMode); + EMRPLUSCASE(EmfPlusRecordTypeSetCompositingMode); + EMRPLUSCASE(EmfPlusRecordTypeSetCompositingQuality); + EMRPLUSCASE(EmfPlusRecordTypeSave); + EMRPLUSCASE(EmfPlusRecordTypeRestore); + EMRPLUSCASE(EmfPlusRecordTypeBeginContainer); + EMRPLUSCASE(EmfPlusRecordTypeBeginContainerNoParams); + EMRPLUSCASE(EmfPlusRecordTypeEndContainer); + EMRPLUSCASE(EmfPlusRecordTypeSetWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeResetWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeMultiplyWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeTranslateWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeScaleWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeRotateWorldTransform); + EMRPLUSCASE(EmfPlusRecordTypeSetPageTransform); + EMRPLUSCASE(EmfPlusRecordTypeResetClip); + EMRPLUSCASE(EmfPlusRecordTypeSetClipRect); + EMRPLUSCASE(EmfPlusRecordTypeSetClipPath); + EMRPLUSCASE(EmfPlusRecordTypeSetClipRegion); + EMRPLUSCASE(EmfPlusRecordTypeOffsetClip); + EMRPLUSCASE(EmfPlusRecordTypeDrawDriverString); + EMRPLUSCASE(EmfPlusRecordTypeStrokeFillPath); + EMRPLUSCASE(EmfPlusRecordTypeSerializableObject); + EMRPLUSCASE(EmfPlusRecordTypeSetTSGraphics); + EMRPLUSCASE(EmfPlusRecordTypeSetTSClip); + EMRPLUSCASE(EmfPlusRecordTotal); + + default: + printf(" unknown EMF+ record %x %04x %08x\n", header->Type, header->Flags, header->Size); + break; + } + + if (length<sizeof(*header) || header->Size%4) + return -1; + + length -= sizeof(*header); + offset += sizeof(*header); + + for (i=0; i<header->Size-sizeof(*header); i+=4) + { + if (i%16 == 0) + printf(" "); + if (!(ptr = PRD(offset, 4))) return -1; + length -= 4; + offset += 4; + printf("%08x ", read_int(ptr)); + if ((i % 16 == 12) || (i + 4 == header->Size - sizeof(*header))) + printf("\n"); + } + } + + return 0; + } + + break; + } + EMRCASE(EMR_FILLRGN); EMRCASE(EMR_FRAMERGN); EMRCASE(EMR_INVERTRGN); @@ -178,7 +301,7 @@ static int dump_emfrecord(void) if (length >= sizeof(*clip) + sizeof(*data)) rc_count = data->rdh.nCount; - printf("%-20s %08x\n", "EMREXTSELECTCLIPRGN", length); + printf("%-20s %08x\n", "EMR_EXTSELECTCLIPRGN", length); printf("mode %d, rects %d\n", clip->iMode, rc_count); for (i = 0, rc = (const RECT *)data->Buffer; i < rc_count; i++, rc++) printf(" (%d,%d)-(%d,%d)", rc->left, rc->top, rc->right, rc->bottom);

1 0

Alistair Leslie-Hughes : include: Support wine_dbgstr_longlong in tests.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: 87b72098c3a1e4b60b21d9a5703870e3a30fc89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b72098c3a1e4b60b21d9a57… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 23:08:09 2017 +0000 include: Support wine_dbgstr_longlong in tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index af602c0..4ec66d5 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -68,6 +68,7 @@ extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); extern const char *wine_dbgstr_guid( const GUID *guid ); extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } +extern const char *wine_dbgstr_longlong( ULONGLONG ll ); /* strcmpW is available for tests compiled under Wine, but not in standalone * builds under Windows, so we reimplement it under a different name. */ @@ -541,6 +542,19 @@ const char *wine_dbgstr_rect( const RECT *rect ) return res; } +const char *wine_dbgstr_longlong( ULONGLONG ll ) +{ + char *res; + + res = get_temp_buffer( 17 ); + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf( res, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); + else + sprintf( res, "%lx", (unsigned long)ll ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

1 0

Alistair Leslie-Hughes : propsys/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: b2f266906ba8e24e9adb438a99b2e2b55e0826be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f266906ba8e24e9adb438a9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:43:58 2017 +0000 propsys/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 54b45ac..776ccd0 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -763,16 +763,6 @@ static void test_PropVariantCompare(void) SysFreeString(str_b.u.bstrVal); } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static void test_intconversions(void) { PROPVARIANT propvar; @@ -796,7 +786,7 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -818,11 +808,11 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == S_OK, "hr=%x\n", hr); - ok(ullval == 5, "got wrong value %s\n", debugstr_longlong(ullval)); + ok(ullval == 5, "got wrong value %s\n", wine_dbgstr_longlong(ullval)); hr = PropVariantToInt32(&propvar, &lval); ok(hr == S_OK, "hr=%x\n", hr); @@ -845,7 +835,7 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -5, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -5, "got wrong value %s\n", wine_dbgstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); @@ -869,28 +859,28 @@ static void test_intconversions(void) hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I4; propvar.u.lVal = -6; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -6, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -6, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_UI2; propvar.u.uiVal = 7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == 7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == 7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); propvar.vt = VT_I2; propvar.u.iVal = -7; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == -7, "got wrong value %s\n", wine_dbgstr_longlong(llval)); } static void test_PropVariantChangeType_LPWSTR(void)

1 0

Alistair Leslie-Hughes : ntdll/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 03 Jul '17

03 Jul '17

Module: wine Branch: master Commit: a3c1fbae2aa565569961a8df2e335496776563be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c1fbae2aa565569961a8df2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:06 2017 +0000 ntdll/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 9de9009..71b37e4 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -87,16 +87,6 @@ static inline BOOL is_signaled( HANDLE obj ) return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } -static const char* debugstr_longlong(ULONGLONG ll) -{ - static char str[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(str, "%lx", (unsigned long)ll); - return str; -} - #define TEST_BUF_LEN 3 static HANDLE create_temp_file( ULONG flags ) @@ -1134,10 +1124,10 @@ static void test_file_full_size_information(void) /* Test for FileFsSizeInformation */ ok(fsi.TotalAllocationUnits.QuadPart > 0, "[fsi] TotalAllocationUnits expected positive, got 0x%s\n", - debugstr_longlong(fsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.TotalAllocationUnits.QuadPart)); ok(fsi.AvailableAllocationUnits.QuadPart > 0, "[fsi] AvailableAllocationUnits expected positive, got 0x%s\n", - debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); /* Assume file system is NTFS */ ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); @@ -1147,21 +1137,21 @@ static void test_file_full_size_information(void) { ok(ffsi.TotalAllocationUnits.QuadPart > 0, "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); ok(ffsi.CallerAvailableAllocationUnits.QuadPart > 0, "[ffsi] CallerAvailableAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); ok(ffsi.ActualAvailableAllocationUnits.QuadPart > 0, "[ffsi] ActualAvailableAllocationUnits expected positive, got negative value 0x%s\n", - debugstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); ok(ffsi.TotalAllocationUnits.QuadPart == fsi.TotalAllocationUnits.QuadPart, "[ffsi] TotalAllocationUnits error fsi:0x%s, ffsi:0x%s\n", - debugstr_longlong(fsi.TotalAllocationUnits.QuadPart), - debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.TotalAllocationUnits.QuadPart), + wine_dbgstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); ok(ffsi.CallerAvailableAllocationUnits.QuadPart == fsi.AvailableAllocationUnits.QuadPart, "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", - debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart), - debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + wine_dbgstr_longlong(fsi.AvailableAllocationUnits.QuadPart), + wine_dbgstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); } /* Assume file system is NTFS */

1 0