wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Hao Peng : wbemprox: Implement Win32_BaseBoard.Version.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: d5d4c19226273efe1ce1a11782bfbd70e58a70d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d4c19226273efe1ce1a1178… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 15:51:40 2015 +0800 wbemprox: Implement Win32_BaseBoard.Version. --- dlls/wbemprox/builtin.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 922f6c5..7c22ad8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -311,7 +311,8 @@ static const struct column col_baseboard[] = { prop_nameW, CIM_STRING }, { prop_productW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, - { prop_tagW, CIM_STRING|COL_FLAG_KEY } + { prop_tagW, CIM_STRING|COL_FLAG_KEY }, + { prop_versionW, CIM_STRING } }; static const struct column col_bios[] = { @@ -552,6 +553,8 @@ static const WCHAR baseboard_serialnumberW[] = {'N','o','n','e',0}; static const WCHAR baseboard_tagW[] = {'B','a','s','e',' ','B','o','a','r','d',0}; +static const WCHAR baseboard_versionW[] = + {'1','.','0',0}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; static const WCHAR bios_manufacturerW[] = @@ -644,6 +647,7 @@ struct record_baseboard const WCHAR *product; const WCHAR *serialnumber; const WCHAR *tag; + const WCHAR *version; }; struct record_bios { @@ -881,7 +885,7 @@ struct record_videocontroller static const struct record_baseboard data_baseboard[] = { - { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_tagW } + { baseboard_manufacturerW, baseboard_tagW, baseboard_tagW, baseboard_tagW, baseboard_serialnumberW, baseboard_versionW } }; static const struct record_bios data_bios[] = {

1 0

Hao Peng : wbemprox: Implement Win32_DiskDrive.PNPDeviceID.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: c0020b3ac39712f20f3c040d308dca76ea1a059d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0020b3ac39712f20f3c040d3… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 15:08:38 2015 +0800 wbemprox: Implement Win32_DiskDrive.PNPDeviceID. --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f566359..922f6c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -366,6 +366,7 @@ static const struct column col_diskdrive[] = { prop_manufacturerW, CIM_STRING }, { prop_mediatypeW, CIM_STRING }, { prop_modelW, CIM_STRING }, + { prop_pnpdeviceidW, CIM_STRING }, { prop_serialnumberW, CIM_STRING }, { prop_sizeW, CIM_UINT64 } }; @@ -595,6 +596,8 @@ static const WCHAR diskdrive_mediatype_removableW[] = {'R','e','m','o','v','a','b','l','e',' ','m','e','d','i','a',0}; static const WCHAR diskdrive_modelW[] = {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; +static const WCHAR diskdrive_pnpdeviceidW[] = + {'I','D','E','\\','D','i','s','k','\\','V','E','N','_','W','I','N','E',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= @@ -695,6 +698,7 @@ struct record_diskdrive const WCHAR *manufacturer; const WCHAR *mediatype; const WCHAR *model; + const WCHAR *pnpdevice_id; const WCHAR *serialnumber; UINT64 size; }; @@ -1621,6 +1625,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * else rec->mediatype = diskdrive_mediatype_removableW; rec->model = diskdrive_modelW; + rec->pnpdevice_id = diskdrive_pnpdeviceidW; rec->serialnumber = diskdrive_serialW; get_freespace( root, &size ); rec->size = size;

1 0

Hao Peng : wbemprox: Implement Win32_Processor.ProcessorType.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: fd08da6035d2bfcd11818b9a7c1f2ad86a6172af URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd08da6035d2bfcd11818b9a7… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jan 22 12:07:48 2015 +0800 wbemprox: Implement Win32_Processor.ProcessorType. --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 80a1657..f566359 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -240,6 +240,8 @@ static const WCHAR prop_processidW[] = {'P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processoridW[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; +static const WCHAR prop_processortypeW[] = + {'P','r','o','c','e','s','s','o','r','T','y','p','e',0}; static const WCHAR prop_productW[] = {'P','r','o','d','u','c','t',0}; static const WCHAR prop_productnameW[] = @@ -481,6 +483,7 @@ static const struct column col_processor[] = { prop_numcoresW, CIM_UINT32, VT_I4 }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_processortypeW, CIM_UINT16, VT_I4 }, { prop_uniqueidW, CIM_STRING } }; static const struct column col_qualifier[] = @@ -809,6 +812,7 @@ struct record_processor UINT32 num_cores; UINT32 num_logical_processors; const WCHAR *processor_id; + UINT16 processortype; const WCHAR *unique_id; }; struct record_qualifier @@ -2121,6 +2125,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->num_cores = num_cores; rec->num_logical_processors = num_logical_processors; rec->processor_id = heap_strdupW( processor_id ); + rec->processortype = 3; /* central processor */ rec->unique_id = NULL; if (!match_row( table, i, cond, &status )) {

1 0

André Hentschel : odbc32: Add winediag message when no drivers could be found.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: b5732b1c2ee7ca631bdabc0e45483a2ccaefcd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5732b1c2ee7ca631bdabc0e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 21 23:16:41 2015 +0100 odbc32: Add winediag message when no drivers could be found. --- dlls/odbc32/proxyodbc.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 89cf154..66b3a65 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -49,6 +49,7 @@ static BOOL ODBC_LoadDriverManager(void); static BOOL ODBC_LoadDMFunctions(void); WINE_DEFAULT_DEBUG_CHANNEL(odbc); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static SQLRETURN (*pSQLAllocConnect)(SQLHENV,SQLHDBC*); static SQLRETURN (*pSQLAllocEnv)(SQLHENV*); @@ -1914,11 +1915,19 @@ SQLRETURN WINAPI SQLDrivers( SQLSMALLINT cbDriverAttrMax, SQLSMALLINT *pcbDriverAttr) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("direction=%d\n", fDirection); if (!pSQLDrivers) return SQL_ERROR; - return pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + ret = pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. " + "Check the settings for your libodbc provider.\n"); + + return ret; } @@ -2647,11 +2656,19 @@ SQLRETURN WINAPI SQLDriversW( SQLSMALLINT cbDriverAttrMax, SQLSMALLINT *pcbDriverAttr) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("direction=%d\n", fDirection); if (!pSQLDriversW) return SQL_ERROR; - return pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + ret = pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. " + "Check the settings for your libodbc provider.\n"); + + return ret; } /*************************************************************************

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.7.
by Alexandre Julliard 22 Jan '15

22 Jan '15

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: bugzilla Branch: master Commit: 2e3e0b31a34a21d572d5c16267162d8bc354d52b URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=2e3e0b31a34a21d572d5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 22 09:08:12 2015 +0100 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.7.
by Alexandre Julliard 22 Jan '15

22 Jan '15

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 0b811eeabf0a02cde3a1200f5af5f3c0f4d00a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b811eeabf0a02cde3a1200f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 20 23:56:46 2015 +0100 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/msg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b243a74..66f054a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4533,6 +4533,7 @@ static void test_messages(void) MSG msg; LRESULT res; POINT pos; + BOOL ret; flush_sequence(); @@ -4819,7 +4820,8 @@ static void test_messages(void) flush_events(); flush_sequence(); - ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); @@ -4831,7 +4833,8 @@ static void test_messages(void) ok(hwnd != 0, "Failed to create custom dialog window\n"); flush_events(); flush_sequence(); - ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmEmptySeq, "DrawMenuBar for a child window", FALSE);

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: ae1251596e95de283bcf53e7c0199ce9a4b772bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1251596e95de283bcf53e7c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 20 23:56:41 2015 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/pipe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 056f95b..3570676 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -89,7 +89,7 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD { struct rpcThreadArgs rpcargs; HANDLE thread; - DWORD threadId; + DWORD threadId, ret; rpcargs.returnValue = 0; rpcargs.lastError = GetLastError(); @@ -102,7 +102,8 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD thread = CreateThread(NULL, 0, rpcThreadMain, (void *)&rpcargs, 0, &threadId); ok(thread != NULL, "CreateThread failed. %d\n", GetLastError()); - ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError()); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError()); CloseHandle(thread); SetLastError(rpcargs.lastError);

1 0

Piotr Caban : msvcrt: Drop read buffer in _flsbuf.
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: ba0d1586ff53221e449f2ed885a059232dd4bea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0d1586ff53221e449f2ed88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 21 16:20:48 2015 +0100 msvcrt: Drop read buffer in _flsbuf. --- dlls/msvcrt/file.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ff1f5d6..8c59239 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3781,12 +3781,24 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { msvcrt_alloc_buffer(file); } + if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else + if(!(file->_flag & MSVCRT__IORW)) { + file->_flag |= MSVCRT__IOERR; + return MSVCRT_EOF; + } + file->_flag |= MSVCRT__IOWRT; + } + if(file->_flag & MSVCRT__IOREAD) { + if(!(file->_flag & MSVCRT__IOEOF)) { + file->_flag |= MSVCRT__IOERR; return MSVCRT_EOF; + } + file->_cnt = 0; + file->_ptr = file->_base; + file->_flag &= ~(MSVCRT__IOREAD | MSVCRT__IOEOF); } + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int res = 0;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
31
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 January 2015