May 2017 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9: Don't call get_parameter_by_name() from get_valid_parameter() if D3DXFX_LARGEADDRESSAWARE flag is set.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 1817f63a519633c96f7726cf52ce62560fb1feb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1817f63a519633c96f7726cf5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 21:24:13 2017 +0300 d3dx9: Don't call get_parameter_by_name() from get_valid_parameter() if D3DXFX_LARGEADDRESSAWARE flag is set. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 787967d..1a14edb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -503,7 +503,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base sizeof(parameter_magic_string))) return handle_param; - return get_parameter_by_name(base, NULL, parameter); + return base->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(base, NULL, parameter); } static void free_state(struct d3dx_state *state)

1 0

Paul Gofman : d3dx9: Store effect creation flags in struct d3dx_base_effect.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: a52a2d1aab877925018903334a2315d082546750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52a2d1aab877925018903334… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 21:24:12 2017 +0300 d3dx9: Store effect creation flags in struct d3dx_base_effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6a5afff..787967d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -154,6 +154,7 @@ struct d3dx9_base_effect struct d3dx_object *objects; struct d3dx_effect_pool *pool; + DWORD flags; }; struct ID3DXEffectImpl @@ -169,7 +170,7 @@ struct ID3DXEffectImpl struct d3dx_technique *active_technique; struct d3dx_pass *active_pass; BOOL started; - DWORD flags; + DWORD begin_flags; D3DLIGHT9 current_light[8]; BOOL light_updated[8]; @@ -4019,7 +4020,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW *passes = technique->pass_count; effect->started = TRUE; - effect->flags = flags; + effect->begin_flags = flags; return D3D_OK; } @@ -4090,7 +4091,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) if (!effect->started) return D3D_OK; - if (effect->flags & D3DXFX_DONOTSAVESTATE) + if (effect->begin_flags & D3DXFX_DONOTSAVESTATE) { TRACE("State restoring disabled.\n"); } @@ -6238,6 +6239,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, base->effect = effect; base->pool = pool; + base->flags = eflags; read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag);

1 0

Daniel Lehman : msvcp140: Remove forwards for some _Thrd functions.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: abad9308e8e049a473df796b0582d49f96e23b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abad9308e8e049a473df796b0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue May 2 00:01:38 2017 -0700 msvcp140: Remove forwards for some _Thrd functions. To be consistent with the others and the rest of the file Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index fd8201b..c75f8dd 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3722,14 +3722,14 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl _Thrd_current() _Thrd_current -@ cdecl _Thrd_detach(ptr) msvcp110._Thrd_detach +@ cdecl _Thrd_detach(ptr) _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) _Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency @ cdecl _Thrd_id() _Thrd_id @ cdecl _Thrd_join(ptr long) _Thrd_join @ cdecl _Thrd_sleep(ptr) _Thrd_sleep -@ cdecl _Thrd_start(ptr ptr ptr) msvcp110._Thrd_start +@ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield @ stub _To_byte @ stub _To_wide

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXMatrixTest().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 891c155b8bda70e12dcd0735cb7eaa08e9a93b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891c155b8bda70e12dcd0735c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:09 2017 +0200 d3dx9/tests: Use compare_float() in D3DXMatrixTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2712009..2098e0f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -313,13 +313,13 @@ static void D3DXFresnelTest(void) static void D3DXMatrixTest(void) { D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; + BOOL expected, got, equal; + float angle, determinant; D3DXMATRIX *funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; D3DXVECTOR3 at, axis, eye, last; D3DXVECTOR4 light; - BOOL expected, got; - FLOAT angle, determinant, expectedfloat, gotfloat; U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; @@ -388,19 +388,19 @@ static void D3DXMatrixTest(void) expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixfDeterminant_____________*/ - expectedfloat = -147888.0f; - gotfloat = D3DXMatrixDeterminant(&mat); - ok(relative_error(gotfloat, expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, gotfloat); + determinant = D3DXMatrixDeterminant(&mat); + equal = compare_float(determinant, -147888.0f, 0); + ok(equal, "Got unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixInverse______________*/ U(expectedmat).m[0][0] = 16067.0f/73944.0f; U(expectedmat).m[0][1] = -10165.0f/147888.0f; U(expectedmat).m[0][2] = -2729.0f/147888.0f; U(expectedmat).m[0][3] = -1631.0f/49296.0f; U(expectedmat).m[1][0] = -565.0f/36972.0f; U(expectedmat).m[1][1] = 2723.0f/73944.0f; U(expectedmat).m[1][2] = -1073.0f/73944.0f; U(expectedmat).m[1][3] = 289.0f/24648.0f; U(expectedmat).m[2][0] = -389.0f/2054.0f; U(expectedmat).m[2][1] = 337.0f/4108.0f; U(expectedmat).m[2][2] = 181.0f/4108.0f; U(expectedmat).m[2][3] = 317.0f/4108.0f; U(expectedmat).m[3][0] = 163.0f/5688.0f; U(expectedmat).m[3][1] = -101.0f/11376.0f; U(expectedmat).m[3][2] = -73.0f/11376.0f; U(expectedmat).m[3][3] = -127.0f/3792.0f; - expectedfloat = -147888.0f; D3DXMatrixInverse(&gotmat,&determinant,&mat); expect_matrix(&expectedmat, &gotmat, 1); - ok(relative_error( determinant, expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, determinant); + equal = compare_float(determinant, -147888.0f, 0); + ok(equal, "Got unexpected determinant %.8e.\n", determinant); funcpointer = D3DXMatrixInverse(&gotmat,NULL,&mat2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXFresnelTest().
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 8034a3c6f50981c5ffbfe2743f4f112c3e5ba6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8034a3c6f50981c5ffbfe2743… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:08 2017 +0200 d3dx9/tests: Use compare_float() in D3DXFresnelTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c0f6bee..2712009 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -302,11 +302,12 @@ static void D3DXColorTest(void) static void D3DXFresnelTest(void) { - FLOAT expected, got; + float fresnel; + BOOL equal; - expected = 0.089187; - got = D3DXFresnelTerm(0.5f,1.5); - ok(relative_error(got, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + fresnel = D3DXFresnelTerm(0.5f, 1.5f); + equal = compare_float(fresnel, 8.91867056e-02f, 1); + ok(equal, "Got unexpected Fresnel term %.8e.\n", fresnel); } static void D3DXMatrixTest(void)

1 0

Alexandre Julliard : kernel32: Rely solely on the DosDevices symbolic links in QueryDosDevice.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: d23815827df5e2926192a0bfeed23dd77487ecd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23815827df5e2926192a0bfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 3 11:50:02 2017 +0200 kernel32: Rely solely on the DosDevices symbolic links in QueryDosDevice. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/volume.c | 160 ++----------------------------------------------- 1 file changed, 4 insertions(+), 156 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 92bcf53..b4163f0 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -68,36 +68,6 @@ enum fs_type FS_UDF /* For reference [E] = Ecma-167.pdf, [U] = udf260.pdf */ }; -/* read a Unix symlink; returned buffer must be freed by caller */ -static char *read_symlink( const char *path ) -{ - char *buffer; - int ret, size = 128; - - for (;;) - { - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return 0; - } - ret = readlink( path, buffer, size ); - if (ret == -1) - { - FILE_SetDosError(); - HeapFree( GetProcessHeap(), 0, buffer ); - return 0; - } - if (ret != size) - { - buffer[ret] = 0; - return buffer; - } - HeapFree( GetProcessHeap(), 0, buffer ); - size *= 2; - } -} - /* get the path of a dos device symlink in the $WINEPREFIX/dosdevices directory */ static char *get_dos_device_path( LPCWSTR name ) { @@ -1257,18 +1227,9 @@ BOOL WINAPI DefineDosDeviceA(DWORD flags, LPCSTR devname, LPCSTR targetpath) */ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) { - static const WCHAR auxW[] = {'A','U','X',0}; - static const WCHAR prnW[] = {'P','R','N',0}; - static const WCHAR comW[] = {'C','O','M',0}; - static const WCHAR lptW[] = {'L','P','T',0}; - static const WCHAR com0W[] = {'\\','?','?','\\','C','O','M','0',0}; - static const WCHAR com1W[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','C','O','M','1',0,0}; - static const WCHAR lpt1W[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','L','P','T','1',0,0}; static const WCHAR dosdevW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; UNICODE_STRING nt_name; - ANSI_STRING unix_name; - WCHAR nt_buffer[10]; NTSTATUS status; if (!bufsize) @@ -1279,8 +1240,7 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) if (devname) { - WCHAR *p, name[5]; - char *path, *link; + WCHAR name[8]; WCHAR *buffer; DWORD dosdev, ret = 0; @@ -1300,72 +1260,13 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) strcatW( buffer, devname ); status = read_nt_symlink( buffer, target, bufsize ); HeapFree( GetProcessHeap(), 0, buffer ); - if (!status) - { - ret = strlenW( target ) + 1; - goto done; - } - if (!dosdev) /* not a special DOS device */ + if (status) { SetLastError( RtlNtStatusToDosError(status) ); return 0; } - - /* FIXME: should read NT symlink for all devices */ - - if (!(path = get_dos_device_path( name ))) return 0; - link = read_symlink( path ); - HeapFree( GetProcessHeap(), 0, path ); - - if (link) - { - ret = MultiByteToWideChar( CP_UNIXCP, 0, link, -1, target, bufsize ); - HeapFree( GetProcessHeap(), 0, link ); - } - else /* look for device defaults */ - { - if (!strcmpiW( name, auxW )) - { - if (bufsize >= sizeof(com1W)/sizeof(WCHAR)) - { - memcpy( target, com1W, sizeof(com1W) ); - ret = sizeof(com1W)/sizeof(WCHAR); - } - else SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return ret; - } - if (!strcmpiW( name, prnW )) - { - if (bufsize >= sizeof(lpt1W)/sizeof(WCHAR)) - { - memcpy( target, lpt1W, sizeof(lpt1W) ); - ret = sizeof(lpt1W)/sizeof(WCHAR); - } - else SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return ret; - } - - nt_buffer[0] = '\\'; - nt_buffer[1] = '?'; - nt_buffer[2] = '?'; - nt_buffer[3] = '\\'; - strcpyW( nt_buffer + 4, name ); - RtlInitUnicodeString( &nt_name, nt_buffer ); - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, TRUE ); - if (status) SetLastError( RtlNtStatusToDosError(status) ); - else - { - ret = MultiByteToWideChar( CP_UNIXCP, 0, unix_name.Buffer, -1, target, bufsize ); - RtlFreeAnsiString( &unix_name ); - } - } - done: - if (ret) - { - if (ret < bufsize) target[ret++] = 0; /* add an extra null */ - for (p = target; *p; p++) if (*p == '/') *p = '\\'; - } - + ret = strlenW( target ) + 1; + if (ret < bufsize) target[ret++] = 0; /* add an extra null */ return ret; } else /* return a list of all devices */ @@ -1373,59 +1274,6 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) OBJECT_ATTRIBUTES attr; HANDLE handle; WCHAR *p = target; - int i; - - if (bufsize <= (sizeof(auxW)+sizeof(prnW))/sizeof(WCHAR)) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return 0; - } - - /* FIXME: these should be NT symlinks too */ - - memcpy( p, auxW, sizeof(auxW) ); - p += sizeof(auxW) / sizeof(WCHAR); - memcpy( p, prnW, sizeof(prnW) ); - p += sizeof(prnW) / sizeof(WCHAR); - - strcpyW( nt_buffer, com0W ); - RtlInitUnicodeString( &nt_name, nt_buffer ); - - for (i = 1; i <= 9; i++) - { - nt_buffer[7] = '0' + i; - if (!wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, TRUE )) - { - RtlFreeAnsiString( &unix_name ); - if (p + 5 >= target + bufsize) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return 0; - } - strcpyW( p, comW ); - p[3] = '0' + i; - p[4] = 0; - p += 5; - } - } - strcpyW( nt_buffer + 4, lptW ); - for (i = 1; i <= 9; i++) - { - nt_buffer[7] = '0' + i; - if (!wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, TRUE )) - { - RtlFreeAnsiString( &unix_name ); - if (p + 5 >= target + bufsize) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return 0; - } - strcpyW( p, lptW ); - p[3] = '0' + i; - p[4] = 0; - p += 5; - } - } RtlInitUnicodeString( &nt_name, dosdevW ); nt_name.Length -= sizeof(WCHAR); /* without trailing slash */

1 0

Alexandre Julliard : mountmgr: Create symbolic links in DosDevices for serial and parallel ports.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: 3fca6cd1ed4bf8416bca5d75bc92e67c607b140c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fca6cd1ed4bf8416bca5d75b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 3 11:49:05 2017 +0200 mountmgr: Create symbolic links in DosDevices for serial and parallel ports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 49bcc90..1b439d2 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1000,14 +1000,17 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p { static const WCHAR comW[] = {'C','O','M','%','u',0}; static const WCHAR lptW[] = {'L','P','T','%','u',0}; + static const WCHAR auxW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','A','U','X',0}; + static const WCHAR prnW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','P','R','N',0}; static const WCHAR device_serialW[] = {'\\','D','e','v','i','c','e','\\','S','e','r','i','a','l','%','u',0}; static const WCHAR device_parallelW[] = {'\\','D','e','v','i','c','e','\\','P','a','r','a','l','l','e','l','%','u',0}; + static const WCHAR dosdevices_comW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','C','O','M','%','u',0}; static const WCHAR dosdevices_lptW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\','L','P','T','%','u',0}; - const WCHAR *dos_name_format, *nt_name_format, *reg_value_format; - WCHAR dos_name[7], reg_value[256], nt_buffer[32]; + const WCHAR *dos_name_format, *nt_name_format, *reg_value_format, *symlink_format, *default_device; + WCHAR dos_name[7], reg_value[256], nt_buffer[32], symlink_buffer[32]; DWORD type, size; char override_path[256]; - UNICODE_STRING nt_name; + UNICODE_STRING nt_name, symlink_name, default_name; DEVICE_OBJECT *dev_obj; NTSTATUS status; @@ -1016,12 +1019,16 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p dos_name_format = comW; nt_name_format = device_serialW; reg_value_format = comW; + symlink_format = dosdevices_comW; + default_device = auxW; } else { dos_name_format = lptW; nt_name_format = device_parallelW; reg_value_format = dosdevices_lptW; + symlink_format = dosdevices_lptW; + default_device = prnW; } sprintfW( dos_name, dos_name_format, n ); @@ -1052,6 +1059,15 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p FIXME( "IoCreateDevice %s got %x\n", debugstr_w(nt_name.Buffer), status ); return FALSE; } + sprintfW( symlink_buffer, symlink_format, n ); + RtlInitUnicodeString( &symlink_name, symlink_buffer ); + IoCreateSymbolicLink( &symlink_name, &nt_name ); + if (n == 1) + { + RtlInitUnicodeString( &default_name, default_device ); + IoCreateSymbolicLink( &default_name, &symlink_name ); + } + /* TODO: store information about the Unix device in the NT device */ /* create registry entry */

1 0

Alexandre Julliard : mountmgr: Create the DEVICEMAP registry keys in their respective driver.
by Alexandre Julliard May 3, 2017

May 3, 2017

Module: wine Branch: master Commit: bbe6c13605dd63382712aa517bc3b41aea286049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe6c13605dd63382712aa517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 3 11:46:50 2017 +0200 mountmgr: Create the DEVICEMAP registry keys in their respective driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 3 ++- dlls/mountmgr.sys/mountmgr.c | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ee25999..49bcc90 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1121,7 +1121,8 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p += 3; RegOpenKeyExW( HKEY_LOCAL_MACHINE, ports_keyW, 0, KEY_QUERY_VALUE, &wine_ports_key ); - RegOpenKeyExW( HKEY_LOCAL_MACHINE, windows_ports_key_name, 0, KEY_SET_VALUE, &windows_ports_key ); + RegCreateKeyExW( HKEY_LOCAL_MACHINE, windows_ports_key_name, 0, NULL, REG_OPTION_VOLATILE, + KEY_ALL_ACCESS, NULL, &windows_ports_key, NULL ); /* remove old symlinks */ for (n = 1; n <= MAX_PORTS; n++) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d3f774a..1eb0a78 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -421,14 +421,10 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static const WCHAR harddiskW[] = {'\\','D','r','i','v','e','r','\\','H','a','r','d','d','i','s','k',0}; static const WCHAR driver_serialW[] = {'\\','D','r','i','v','e','r','\\','S','e','r','i','a','l',0}; static const WCHAR driver_parallelW[] = {'\\','D','r','i','v','e','r','\\','P','a','r','a','l','l','e','l',0}; - static const WCHAR devicemapW[] = {'H','A','R','D','W','A','R','E','\\','D','E','V','I','C','E','M','A','P',0}; - static const WCHAR parallelW[] = {'P','A','R','A','L','L','E','L',' ','P','O','R','T','S',0}; - static const WCHAR serialW[] = {'S','E','R','I','A','L','C','O','M','M',0}; UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; NTSTATUS status; - HKEY hkey, devicemap_key; TRACE( "%s\n", debugstr_w(path->Buffer) ); @@ -447,18 +443,6 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) RegCreateKeyExW( HKEY_LOCAL_MACHINE, mounted_devicesW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &mount_key, NULL ); - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, devicemapW, 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &devicemap_key, NULL )) - { - if (!RegCreateKeyExW( devicemap_key, parallelW, 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &hkey, NULL )) - RegCloseKey( hkey ); - if (!RegCreateKeyExW( devicemap_key, serialW, 0, NULL, REG_OPTION_VOLATILE, - KEY_ALL_ACCESS, NULL, &hkey, NULL )) - RegCloseKey( hkey ); - RegCloseKey( devicemap_key ); - } - RtlInitUnicodeString( &nameW, harddiskW ); status = IoCreateDriver( &nameW, harddisk_driver_entry );

1 0

Julian Rüger : German translation for release 2.7
by Jeremy Newman May 3, 2017

May 3, 2017

Module: website Branch: master Commit: eb22809be5537eee2a690c56f4be1f11f537c615 URL: http://source.winehq.org/git/website.git/?a=commit;h=eb22809be5537eee2a690c… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed May 3 13:49:24 2017 +0200 German translation for release 2.7 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017042801.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2017042801.xml b/news/de/2017042801.xml new file mode 100644 index 0000000..72b4040 --- /dev/null +++ b/news/de/2017042801.xml @@ -0,0 +1,18 @@ +<news> +<date>28. April 2017</date> +<title>Wine 2.7 freigegeben</title> +<body> + Die Entwicklungsversion 2.7 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.7">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von TCP- und UDP-Verbindungen in WebServices.</li> + <li>Diverse Shader-Verbesserungen für Direct3D 11.</li> + <li>Verbesserte Unterstützung von hohen DPI-Einstellungen.</li> + <li>Partielle Reimplementierung der GLU-Library.</li> + <li>Unterstützung von aktuellen Versionen von OSMesa.</li> + <li>Fenstermanagement-Verbesserungen unter macOS.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.7.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : Fix typo in German about page
by Jeremy Newman May 3, 2017

May 3, 2017

Module: website Branch: master Commit: 62b1e4530cccc518b02b4902f0cfb36070a2f206 URL: http://source.winehq.org/git/website.git/?a=commit;h=62b1e4530cccc518b02b49… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed May 3 13:51:27 2017 +0200 Fix typo in German about page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/about.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index a70cc54..4ddbe41 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -4,12 +4,12 @@ Wine (ursprünglich ein Akronym für "Wine Is Not an Emulator") ist eine Kompatibilitätsschicht, die es ermöglicht, Windows-Anwendungen unter -einigen POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, +POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, macOS und BSD. Statt interne Windows-Logik zu simulieren, wie eine virtuelle Maschine oder ein Emulator, übersetzt Wine die Windows-API-Aufrufe in Echtzeit zu entsprechenden POSIX-Aufrufen und eliminiert somit die Performance- und Speichereinbußen, die andere Methoden nach sich ziehen. -Wine erlaubt es auf diese Weise, Windows-Anwendung sauber in Ihre +Wine erlaubt es auf diese Weise, Windows-Anwendungen sauber in Ihre Desktopumgebung zu integrieren. Das Projekt begann 1993, unter der anfänglichen Koordinierung durch Bob Amstadt,

1 0