wine-commits July 2019

wine-commits@winehq.org

2 participants
228 discussions

Zebediah Figura : user32/tests: Test opening raw input devices.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 2ed141d6807da1e2e23c71d01aaf7af64af10ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ed141d6807da1e2e23c71d0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 3 11:09:36 2019 -0500 user32/tests: Test opening raw input devices. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 168b055..d0dc4a8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1625,6 +1625,7 @@ static void test_GetRawInputDeviceList(void) char nameA[128]; UINT sz, len; RID_DEVICE_INFO info; + HANDLE file; /* get required buffer size */ name[0] = '\0'; @@ -1664,6 +1665,14 @@ static void test_GetRawInputDeviceList(void) ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + /* setupapi returns an NT device path, but CreateFile() < Vista can't + * understand that; so use the \\?\ prefix instead */ + name[1] = '\\'; + file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + todo_wine_if(info.dwType != RIM_TYPEHID) + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + CloseHandle(file); } /* check if variable changes from larger to smaller value */

1 0

Zebediah Figura : ntoskrnl.exe: Use the registered interface class in IoSetDeviceInterfaceState().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 2698249362e7dce9426a948f55c921f931bb0dc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2698249362e7dce9426a948f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 17:44:35 2019 -0500 ntoskrnl.exe: Use the registered interface class in IoSetDeviceInterfaceState(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 77 +------------------------------------------------ 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 4ec8aaa..30865a0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -71,77 +71,6 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en static struct wine_rb_tree device_interfaces = { interface_rb_compare }; -static inline BOOL is_valid_hex(WCHAR c) -{ - if (!(((c >= '0') && (c <= '9')) || - ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) - return FALSE; - return TRUE; -} - -static const BYTE guid_conv_table[256] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ -}; - -static BOOL guid_from_string(const WCHAR *s, GUID *id) -{ - int i; - - if (!s || s[0] != '{') - { - memset( id, 0, sizeof (CLSID) ); - return FALSE; - } - - id->Data1 = 0; - for (i = 1; i < 9; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; - } - if (s[9] != '-') return FALSE; - - id->Data2 = 0; - for (i = 10; i < 14; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; - } - if (s[14] != '-') return FALSE; - - id->Data3 = 0; - for (i = 15; i < 19; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; - } - if (s[19] != '-') return FALSE; - - for (i = 20; i < 37; i += 2) - { - if (i == 24) - { - if (s[i] != '-') return FALSE; - i++; - } - if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; - } - - if (s[37] == '}') - return TRUE; - - return FALSE; -} - static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) { HANDLE event = context; @@ -594,7 +523,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable UNICODE_STRING string; DWORD data = enable; NTSTATUS ret; - GUID class; ULONG len; TRACE("device %s, enable %u.\n", debugstr_us(name), enable); @@ -615,9 +543,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (*p == '\\') refstr = p; if (!refstr) refstr = p; - if (!guid_from_string( refstr - 38, &class )) - return STATUS_INVALID_PARAMETER; - len = lstrlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) @@ -676,7 +601,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable { broadcast->dbcc_size = len; broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = class; + broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast );

1 0

Jacek Caban : ntdll: Implement _snprintf_s and _vsnprintf_s.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 4c2afc8ad95d8e19b1fe1c470a2b23eaba5bf81b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c2afc8ad95d8e19b1fe1c47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 3 21:06:21 2019 +0200 ntdll: Implement _snprintf_s and _vsnprintf_s. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/printf.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/string.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 94bc52c..299bfac 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1406,6 +1406,7 @@ @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) @ varargs _snprintf(ptr long str) NTDLL__snprintf +@ varargs _snprintf_s(ptr long long str) _snprintf_s @ varargs _snwprintf(ptr long wstr) NTDLL__snwprintf @ cdecl _splitpath(str ptr ptr ptr ptr) @ cdecl _strcmpi(str str) _stricmp @@ -1420,6 +1421,7 @@ @ cdecl _ultoa(long ptr long) @ cdecl _ultow(long ptr long) @ cdecl -norelay _vsnprintf(ptr long str ptr) NTDLL__vsnprintf +@ cdecl _vsnprintf_s(ptr long str ptr) _vsnprintf_s @ cdecl _vsnwprintf(ptr long wstr ptr) NTDLL__vsnwprintf @ cdecl _wcsicmp(wstr wstr) NTDLL__wcsicmp @ cdecl _wcslwr(wstr) NTDLL__wcslwr diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 6b7293b..018f774 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -765,6 +765,51 @@ int WINAPIV NTDLL__snwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, ... ) /********************************************************************* + * _vsnprintf_s (NTDLL.@) + */ +int CDECL _vsnprintf_s( char *str, SIZE_T size, SIZE_T len, const char *format, __ms_va_list args ) +{ + DWORD sz; + LPWSTR formatW = NULL; + pf_output out; + int r; + + out.unicode = FALSE; + out.buf.A = str; + out.used = 0; + out.len = min( size, len ); + + if (format) + { + RtlMultiByteToUnicodeSize( &sz, format, strlen(format) + 1 ); + if (!(formatW = RtlAllocateHeap( GetProcessHeap(), 0, sz ))) return -1; + RtlMultiByteToUnicodeN( formatW, sz, NULL, format, strlen(format) + 1 ); + } + r = pf_vsnprintf( &out, formatW, args ); + RtlFreeHeap( GetProcessHeap(), 0, formatW ); + if (out.used < size) str[out.used] = 0; + else str[0] = 0; + if (r == size) r = -1; + return r; +} + + +/********************************************************************* + * _snprintf_s (NTDLL.@) + */ +int WINAPIV _snprintf_s( char *str, SIZE_T size, SIZE_T len, const char *format, ... ) +{ + int ret; + __ms_va_list valist; + + __ms_va_start( valist, format ); + ret = _vsnprintf_s( str, size, len, format, valist ); + __ms_va_end( valist ); + return ret; +} + + +/********************************************************************* * vsprintf (NTDLL.@) */ int CDECL NTDLL_vsprintf( char *str, const char *format, __ms_va_list args ) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 7954508..5a2d845 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -61,6 +61,7 @@ static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *p_bsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); +static int (WINAPIV *p__snprintf_s)(char *, size_t, size_t, const char *, ...); static int (__cdecl *p_tolower)(int); static int (__cdecl *p_toupper)(int); @@ -103,6 +104,7 @@ static void InitFunctionPtrs(void) p_bsearch= (void *)GetProcAddress(hntdll, "bsearch"); p__snprintf = (void *)GetProcAddress(hntdll, "_snprintf"); + p__snprintf_s = (void *)GetProcAddress(hntdll, "_snprintf_s"); p_tolower = (void *)GetProcAddress(hntdll, "tolower"); p_toupper = (void *)GetProcAddress(hntdll, "toupper"); @@ -1333,6 +1335,53 @@ static void test__snprintf(void) res = p__snprintf(buffer, strlen(teststring) + 1, teststring); ok(res == lstrlenA(teststring), "_snprintf returned %d, expected %d.\n", res, lstrlenA(teststring)); ok(!strcmp(buffer, teststring), "_snprintf returned buffer '%s', expected '%s'.\n", buffer, teststring); + + memset(buffer, 0x7c, sizeof(buffer)); + res = p__snprintf(buffer, 4, "test"); + ok(res == 4, "res = %d\n", res); + ok(!memcmp(buffer, "test", 4), "buf = %s\n", buffer); + ok(buffer[4] == 0x7c, "buffer[4] = %x\n", buffer[4]); + + memset(buffer, 0x7c, sizeof(buffer)); + res = p__snprintf(buffer, 3, "test"); + ok(res == -1, "res = %d\n", res); + } + +static void test__snprintf_s(void) +{ + char buf[32]; + int res; + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, sizeof(buf), sizeof(buf), "test"); + ok(res == 4, "res = %d\n", res); + ok(!strcmp(buf, "test"), "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 4, 4, "test"); + ok(res == -1, "res = %d\n", res); + ok(!buf[0], "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 5, 4, "test"); + ok(res == 4, "res = %d\n", res); + ok(!strcmp(buf, "test"), "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 5, 3, "test"); + ok(res == -1, "res = %d\n", res); + ok(!strcmp(buf, "tes"), "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 4, 10, "test"); + ok(res == -1, "res = %d\n", res); + ok(!buf[0], "buf = %s\n", buf); + + memset(buf, 0xcc, sizeof(buf)); + res = p__snprintf_s(buf, 6, 5, "test%c", 0); + ok(res == 5, "res = %d\n", res); + ok(!memcmp(buf, "test\0", 6), "buf = %s\n", buf); + } static void test_tolower(void) @@ -1442,6 +1491,10 @@ START_TEST(string) test_bsearch(); if (p__snprintf) test__snprintf(); + if (p__snprintf_s) + test__snprintf_s(); + else + win_skip("_snprintf_s not available\n"); test_tolower(); test_toupper(); test__strnicmp();

1 0

Jacek Caban : ntdll: Move null terminating result to pf_vsnprintf callers.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: b350095b7660bd91c42d66ce12cd206586ea6b62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b350095b7660bd91c42d66ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 3 21:06:14 2019 +0200 ntdll: Move null terminating result to pf_vsnprintf callers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index c1a0194..6b7293b 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -75,17 +75,23 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) if( out->unicode ) { LPWSTR p = out->buf.W + out->used; - out->used += len; if (!out->buf.W) + { + out->used += len; return len; + } if( space >= len ) { memcpy( p, str, len*sizeof(WCHAR) ); + out->used += len; return len; } if( space > 0 ) + { memcpy( p, str, space*sizeof(WCHAR) ); + out->used += space; + } } else { @@ -93,16 +99,23 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) ULONG n; RtlUnicodeToMultiByteSize( &n, str, len * sizeof(WCHAR) ); - out->used += n; if (!out->buf.A) + { + out->used += n; return len; + } if( space >= n ) { RtlUnicodeToMultiByteN( p, n, NULL, str, len * sizeof(WCHAR) ); + out->used += n; return len; } - if (space > 0) RtlUnicodeToMultiByteN( p, space, NULL, str, len * sizeof(WCHAR) ); + if (space > 0) + { + RtlUnicodeToMultiByteN( p, space, NULL, str, len * sizeof(WCHAR) ); + out->used += space; + } } return -1; } @@ -116,17 +129,23 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) if( !out->unicode ) { LPSTR p = out->buf.A + out->used; - out->used += len; if (!out->buf.A) + { + out->used += len; return len; + } if( space >= len ) { memcpy( p, str, len ); + out->used += len; return len; } if( space > 0 ) + { memcpy( p, str, space ); + out->used += space; + } } else { @@ -134,16 +153,23 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) ULONG n; RtlMultiByteToUnicodeSize( &n, str, len ); - out->used += n / sizeof(WCHAR); if (!out->buf.W) + { + out->used += n / sizeof(WCHAR); return len; + } if (space >= n / sizeof(WCHAR)) { RtlMultiByteToUnicodeN( p, n, NULL, str, len ); + out->used += n / sizeof(WCHAR); return len; } - if (space > 0) RtlMultiByteToUnicodeN( p, space * sizeof(WCHAR), NULL, str, len ); + if (space > 0) + { + RtlMultiByteToUnicodeN( p, space * sizeof(WCHAR), NULL, str, len ); + out->used += space; + } } return -1; } @@ -657,9 +683,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis /* check we reached the end, and null terminate the string */ assert( *p == 0 ); - pf_output_stringW( out, p, 1 ); - - return out->used - 1; + return out->used; } @@ -686,6 +710,7 @@ int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_l } r = pf_vsnprintf( &out, formatW, args ); RtlFreeHeap( GetProcessHeap(), 0, formatW ); + if (out.used < len) str[out.used] = 0; return r; } @@ -696,13 +721,16 @@ int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_l int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) { pf_output out; + int r; out.unicode = TRUE; out.buf.W = str; out.used = 0; out.len = len; - return pf_vsnprintf( &out, format, args ); + r = pf_vsnprintf( &out, format, args ); + if (out.used < len) str[out.used] = 0; + return r; }

1 0

Alexandre Julliard : wineboot: Avoid using getopt_long().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 51bc180c1fde3b425a806ae977a3af4c8169c44d URL: https://source.winehq.org/git/wine.git/?a=commit;h=51bc180c1fde3b425a806ae9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 3 20:58:43 2019 +0200 wineboot: Avoid using getopt_long(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 62 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index defd126..b7192fe 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -61,9 +61,6 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_GETOPT_H -# include <getopt.h> -#endif #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -1226,7 +1223,7 @@ done: return ret; } -static void usage(void) +static void usage( int status ) { WINE_MESSAGE( "Usage: wineboot [options]\n" ); WINE_MESSAGE( "Options;\n" ); @@ -1238,23 +1235,9 @@ static void usage(void) WINE_MESSAGE( " -r,--restart Restart only, don't do normal startup operations\n" ); WINE_MESSAGE( " -s,--shutdown Shutdown only, don't reboot\n" ); WINE_MESSAGE( " -u,--update Update the wineprefix directory\n" ); + exit( status ); } -static const char short_options[] = "efhikrsu"; - -static const struct option long_options[] = -{ - { "help", 0, 0, 'h' }, - { "end-session", 0, 0, 'e' }, - { "force", 0, 0, 'f' }, - { "init" , 0, 0, 'i' }, - { "kill", 0, 0, 'k' }, - { "restart", 0, 0, 'r' }, - { "shutdown", 0, 0, 's' }, - { "update", 0, 0, 'u' }, - { NULL, 0, 0, 0 } -}; - int __cdecl main( int argc, char *argv[] ) { static const WCHAR RunW[] = {'R','u','n',0}; @@ -1264,7 +1247,7 @@ int __cdecl main( int argc, char *argv[] ) static const WCHAR wineboot_eventW[] = {'_','_','w','i','n','e','b','o','o','t','_','e','v','e','n','t',0}; /* First, set the current directory to SystemRoot */ - int optc; + int i, j; BOOL end_session, force, init, kill, restart, shutdown, update; HANDLE event; SECURITY_ATTRIBUTES sa; @@ -1299,19 +1282,36 @@ int __cdecl main( int argc, char *argv[] ) Wow64RevertWow64FsRedirection( redir ); } - while ((optc = getopt_long(argc, argv, short_options, long_options, NULL )) != -1) + for (i = 1; i < argc; i++) { - switch(optc) + if (argv[i][0] != '-') continue; + if (argv[i][1] == '-') { - case 'e': end_session = TRUE; break; - case 'f': force = TRUE; break; - case 'i': init = TRUE; break; - case 'k': kill = TRUE; break; - case 'r': restart = TRUE; break; - case 's': shutdown = TRUE; break; - case 'u': update = TRUE; break; - case 'h': usage(); return 0; - case '?': usage(); return 1; + if (!strcmp( argv[i], "--help" )) usage( 0 ); + else if (!strcmp( argv[i], "--end-session" )) end_session = TRUE; + else if (!strcmp( argv[i], "--force" )) force = TRUE; + else if (!strcmp( argv[i], "--init" )) init = TRUE; + else if (!strcmp( argv[i], "--kill" )) kill = TRUE; + else if (!strcmp( argv[i], "--restart" )) restart = TRUE; + else if (!strcmp( argv[i], "--shutdown" )) shutdown = TRUE; + else if (!strcmp( argv[i], "--update" )) update = TRUE; + else usage( 1 ); + continue; + } + for (j = 1; argv[i][j]; j++) + { + switch (argv[i][j]) + { + case 'e': end_session = TRUE; break; + case 'f': force = TRUE; break; + case 'i': init = TRUE; break; + case 'k': kill = TRUE; break; + case 'r': restart = TRUE; break; + case 's': shutdown = TRUE; break; + case 'u': update = TRUE; break; + case 'h': usage(0); break; + default: usage(1); break; + } } }

1 0

Hans Leidekker : wbemprox: Retrieve the system UUID from the SMBIOS table.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: ea3caa2d83d1dfa85b7830e7f8f431b51b77377e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea3caa2d83d1dfa85b7830e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 3 12:38:30 2019 +0200 wbemprox: Retrieve the system UUID from the SMBIOS table. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 124 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 41 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6c56d0d..6302cf5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1493,52 +1493,94 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co return status; } +#include "pshpack1.h" +struct smbios_prologue +{ + BYTE calling_method; + BYTE major_version; + BYTE minor_version; + BYTE revision; + DWORD length; +}; + +struct smbios_header +{ + BYTE type; + BYTE length; + WORD handle; +}; + +struct smbios_system +{ + struct smbios_header hdr; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; + BYTE uuid[16]; +}; +#include "poppack.h" + +#define RSMB (('R' << 24) | ('S' << 16) | ('M' << 8) | 'B') + static WCHAR *get_compsysproduct_uuid(void) { -#ifdef __APPLE__ - unsigned char uuid[16]; - const struct timespec timeout = {1, 0}; - if (!gethostuuid( uuid, &timeout )) - { - static const WCHAR fmtW[] = - {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; - WCHAR *ret = heap_alloc( 37 * sizeof(WCHAR) ); - if (!ret) return NULL; - sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], - uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); - return ret; - } -#endif -#ifdef __linux__ - int file; - if ((file = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) - { - unsigned char buf[32]; - if (read( file, buf, sizeof(buf) ) == sizeof(buf)) + static const WCHAR fmtW[] = + {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; + static const BYTE none[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; + ULONG len; + char *buf = NULL; + const char *ptr, *start; + const struct smbios_prologue *prologue; + const struct smbios_header *hdr; + const struct smbios_system *system; + const BYTE *uuid = NULL; + WCHAR *ret = NULL; + + if ((len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 )) < sizeof(*prologue) ) goto done; + if (!(buf = heap_alloc( len ))) goto done; + GetSystemFirmwareTable( RSMB, 0, buf, len ); + + prologue = (const struct smbios_prologue *)buf; + if (prologue->length < sizeof(*hdr)) goto done; + start = (const char *)(prologue + 1); + hdr = (const struct smbios_header *)start; + + for (;;) + { + if (uuid || (const char *)hdr - start >= prologue->length - sizeof(*hdr)) break; + if (!hdr->length) + { + WARN( "invalid entry\n" ); + break; + } + + switch (hdr->type) { - unsigned int i, j; - WCHAR *ret, *p; - - close( file ); - if (!(p = ret = heap_alloc( 37 * sizeof(WCHAR) ))) return NULL; - for (i = 0, j = 0; i < 8; i++) p[i] = toupperW( buf[j++] ); - p[8] = '-'; - for (i = 9; i < 13; i++) p[i] = toupperW( buf[j++] ); - p[13] = '-'; - for (i = 14; i < 18; i++) p[i] = toupperW( buf[j++] ); - p[18] = '-'; - for (i = 19; i < 23; i++) p[i] = toupperW( buf[j++] ); - p[23] = '-'; - for (i = 24; i < 36; i++) p[i] = toupperW( buf[j++] ); - ret[i] = 0; - return ret; + case 1: /* system entry */ + if (hdr->length < sizeof(*system) || (const char *)hdr - start + hdr->length > prologue->length) break; + system = (const struct smbios_system *)hdr; + uuid = system->uuid; + break; + + default: /* skip other entries */ + for (ptr = (const char *)hdr + hdr->length; *ptr; ptr += strlen(ptr) + 1) { /* nothing */ } + if (ptr == (const char *)hdr + hdr->length) ptr++; + hdr = (const struct smbios_header *)(ptr + 1); + break; } - close( file ); } -#endif - return heap_strdupW( compsysproduct_uuidW ); + if (!uuid || !memcmp( uuid, none, sizeof(none) ) || !(ret = heap_alloc( 37 * sizeof(WCHAR) ))) goto done; + + sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8], + uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); + +done: + heap_free( buf ); + if (!ret) ret = heap_strdupW( compsysproduct_uuidW ); + return ret; } static enum fill_status fill_compsysproduct( struct table *table, const struct expr *cond )

1 0

Henri Verbeet : wined3d: Also try to create a depth/ stencil buffer for WINED3D_NO3D devices in swapchain_init().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 4ed190e8ac50de60bfcd0c54462b690bf83c44b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed190e8ac50de60bfcd0c54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:07 2019 +0430 wined3d: Also try to create a depth/stencil buffer for WINED3D_NO3D devices in swapchain_init(). If requested. It will fail as it should, but the client library should never request it. I.e., the additional check is redundant. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9be6658..69580ad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -938,7 +938,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } /* Swapchains share the depth/stencil buffer, so only create a single depthstencil surface. */ - if (desc->enable_auto_depth_stencil && !(device->wined3d->flags & WINED3D_NO3D)) + if (desc->enable_auto_depth_stencil) { TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil_view)

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to set_glsl_compute_shader_program().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 3d8c15dc85cf0251420593170a705f1088a8a083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8c15dc85cf025142059317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:06 2019 +0430 wined3d: Pass a wined3d_context_gl structure to set_glsl_compute_shader_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34bb0b7..1cd6bb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10062,16 +10062,15 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_ } /* Context activation is done by the caller. */ -static void set_glsl_compute_shader_program(const struct wined3d_context *context, +static void set_glsl_compute_shader_program(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; GLuint cs_id; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) return; if (!(shader = state->shader[WINED3D_SHADER_TYPE_COMPUTE])) @@ -10591,13 +10590,14 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex static void shader_glsl_select_compute(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; GLuint program_id, prev_id; prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_compute_shader_program(context, state, priv, ctx_data); + set_glsl_compute_shader_program(context_gl, state, priv, ctx_data); program_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; TRACE("Using GLSL program %u.\n", program_id);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_compute_shader().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 7d8ad2e8d8ccbd4dc8118c6173e97dbd26b42a87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8ad2e8d8ccbd4dc8118c61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:05 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_glsl_compute_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e7c7bca..34bb0b7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10043,10 +10043,9 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, return WINED3D_OK; } -static GLuint find_glsl_compute_shader(const struct wined3d_context *context, +static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_private *shader_data; if (!shader->backend_data) @@ -10066,6 +10065,7 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context *context, static void set_glsl_compute_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; @@ -10081,7 +10081,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex return; } - cs_id = find_glsl_compute_shader(context, priv, shader); + cs_id = find_glsl_compute_shader(context_gl, priv, shader); memset(&key, 0, sizeof(key)); key.cs_id = cs_id; if (!(entry = get_glsl_program_entry(priv, &key)))

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_compile_compute_shader ().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: dbb0139e3eb3136274d3f0c2a02baa0cc6ffe1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb0139e3eb3136274d3f0c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:04 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_compile_compute_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 88f1cae..e7c7bca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9964,12 +9964,11 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * } static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, - const struct wined3d_context *context, struct wined3d_shader *shader) + const struct wined3d_context_gl *context_gl, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - struct glsl_context_data *ctx_data = context->shader_backend_data; + struct glsl_context_data *ctx_data = context_gl->c.shader_backend_data; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_cs_compiled_shader *gl_shaders; struct glsl_shader_private *shader_data; struct glsl_shader_prog_link *entry; @@ -10047,12 +10046,13 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, static GLuint find_glsl_compute_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_private *shader_data; if (!shader->backend_data) { WARN("Failed to find GLSL program for compute shader %p.\n", shader); - if (FAILED(shader_glsl_compile_compute_shader(priv, context, shader))) + if (FAILED(shader_glsl_compile_compute_shader(priv, context_gl, shader))) { ERR("Failed to compile compute shader %p.\n", shader); return 0; @@ -10522,7 +10522,7 @@ static void shader_glsl_precompile(void *shader_priv, struct wined3d_shader *sha if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) { context = context_acquire(device, NULL, 0); - shader_glsl_compile_compute_shader(shader_priv, context, shader); + shader_glsl_compile_compute_shader(shader_priv, wined3d_context_gl(context), shader); context_release(context); } }

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
23
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 2019