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

Daniel Lehman : msvcp140: Remove forwards for some _Thrd functions.
by Alexandre Julliard 03 May '17

03 May '17

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

Piotr Caban : msvcrt: Fix '%z' format handling in strftime.
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 5823e5b9140dc3b6c82c16912f552e7625caf08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5823e5b9140dc3b6c82c16912… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 3 12:37:26 2017 +0200 msvcrt: Fix '%z' format handling in strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 480d533..57657ca 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1204,7 +1204,7 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f MSVCRT__tzset(); if(MSVCRT__get_tzname(&tmp, str+ret, max-ret, mstm->tm_isdst ? 1 : 0)) return 0; - ret += tmp; + ret += tmp-1; break; case 'U': case 'W':

1 0

Nikolay Sivov : comctl32/listview: Remove internal autoarrange flag, it breaks positioning.
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 791924a2e11b3b3ce71374126bca655d72247939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791924a2e11b3b3ce71374126… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 3 14:09:27 2017 +0300 comctl32/listview: Remove internal autoarrange flag, it breaks positioning. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c01d816..acafbd3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -249,7 +249,6 @@ typedef struct tagLISTVIEW_INFO RANGES selectionRanges; INT nSelectionMark; /* item to start next multiselection from */ INT nHotItem; - BOOL bAutoarrange; /* Autoarrange flag when NOT in LVS_AUTOARRANGE */ /* columns */ HDPA hdpaColumns; /* array of COLUMN_INFO pointers */ @@ -1584,8 +1583,8 @@ static inline LRESULT CallWindowProcT(WNDPROC proc, HWND hwnd, UINT uMsg, static inline BOOL is_autoarrange(const LISTVIEW_INFO *infoPtr) { - return ((infoPtr->dwStyle & LVS_AUTOARRANGE) || infoPtr->bAutoarrange) && - (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON); + return (infoPtr->dwStyle & LVS_AUTOARRANGE) && + (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON); } static void toggle_checkbox_state(LISTVIEW_INFO *infoPtr, INT nItem) @@ -2782,7 +2781,6 @@ static BOOL LISTVIEW_Arrange(LISTVIEW_INFO *infoPtr, INT nAlignCode) default: return FALSE; } - infoPtr->bAutoarrange = TRUE; infoPtr->currIconPos.x = infoPtr->currIconPos.y = 0; for (i = 0; i < infoPtr->nItemCount; i++) { @@ -8936,8 +8934,6 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO Pt.x -= Origin.x; Pt.y -= Origin.y; - infoPtr->bAutoarrange = FALSE; - return LISTVIEW_MoveIconTo(infoPtr, nItem, &Pt, FALSE); }

1 0

Paul Gofman : d3dx9/tests: Add test for D3DXFX_LARGEADDRESSAWARE effect creation flag.
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 0a5e85d0718f05b9908f5c950863297d5936b7be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5e85d0718f05b9908f5c950… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 21:24:11 2017 +0300 d3dx9/tests: Add test for D3DXFX_LARGEADDRESSAWARE effect creation flag. 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/tests/effect.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 997c1fc..3e9d255 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -6150,6 +6150,39 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) ok(!refcount, "Effect pool was not properly freed, refcount %u.\n", refcount); } +static void test_effect_large_address_aware_flag(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect; + D3DXHANDLE param; + static int expected_ivect[4] = {28, 29, 30, 31}; + int ivect[4]; + HRESULT hr; + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, D3DXFX_LARGEADDRESSAWARE, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_iVect"); + ok(!!param, "GetParameterByName failed.\n"); + + hr = effect->lpVtbl->SetValue(effect, param, expected_ivect, sizeof(expected_ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->GetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ok(!memcmp(ivect, expected_ivect, sizeof(expected_ivect)), "Vector value mismatch.\n"); + + if (0) + { + /* Native d3dx crashes in GetValue(). */ + hr = effect->lpVtbl->GetValue(effect, "g_iVect", ivect, sizeof(ivect)); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + } + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -6199,6 +6232,7 @@ START_TEST(effect) test_effect_state_manager(device); test_cross_effect_handle(device); test_effect_shared_parameters(device); + test_effect_large_address_aware_flag(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXQuaternionTest().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: b4dca91a537ffb5b322392d2db53c08305a4033d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4dca91a537ffb5b322392d2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:10 2017 +0200 d3dx9/tests: Use compare_float() in D3DXQuaternionTest(). 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 | 47 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2098e0f..5b25e91 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -738,10 +738,10 @@ static void D3DXQuaternionTest(void) { D3DXMATRIX mat; D3DXQUATERNION expectedquat, gotquat, Nq, Nq1, nul, smallq, smallr, q, r, s, t, u; + BOOL expectedbool, gotbool, equal; + float angle, got, scale, scale2; LPD3DXQUATERNION funcpointer; D3DXVECTOR3 axis, expectedvec; - FLOAT angle, expected, got, scale, scale2; - BOOL expectedbool, gotbool; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; @@ -770,16 +770,16 @@ static void D3DXQuaternionTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXQuaternionDot______________________*/ - expected = 55.0f; got = D3DXQuaternionDot(&q,&r); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 55.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; got = D3DXQuaternionDot(NULL,&r); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); got = D3DXQuaternionDot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXQuaternionExp______________________________*/ expectedquat.x = -0.216382f; expectedquat.y = -0.432764f; expectedquat.z = -0.8655270f; expectedquat.w = -0.129449f; @@ -827,22 +827,22 @@ static void D3DXQuaternionTest(void) ok(gotbool == FALSE, "Expected boolean: %d, Got boolean: %d\n", FALSE, gotbool); /*_______________D3DXQuaternionLength__________________________*/ - expected = 11.0f; - got = D3DXQuaternionLength(&q); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXQuaternionLength(&q); + equal = compare_float(got, 11.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXQuaternionLength(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXQuaternionLengthSq________________________*/ - expected = 121.0f; got = D3DXQuaternionLengthSq(&q); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 121.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; got = D3DXQuaternionLengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXQuaternionLn______________________________*/ expectedquat.x = 1.0f; expectedquat.y = 2.0f; expectedquat.z = 4.0f; expectedquat.w = 0.0f; @@ -1101,25 +1101,26 @@ static void D3DXQuaternionTest(void) /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; - expected = 2.197869f; D3DXQuaternionToAxisAngle(&Nq,&axis,&angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 2.197869f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); /* Test if |w|>1.0f */ expectedvec.x = 1.0f; expectedvec.y = 2.0f; expectedvec.z = 4.0f; D3DXQuaternionToAxisAngle(&q,&axis,&angle); expect_vec3(&expectedvec, &axis, 0); /* Test the null quaternion */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; - expected = 3.141593f; D3DXQuaternionToAxisAngle(&nul, &axis, &angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 3.14159274e+00f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); D3DXQuaternionToAxisAngle(&nul, &axis, NULL); D3DXQuaternionToAxisAngle(&nul, NULL, &angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 3.14159274e+00f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); } static void D3DXVector2Test(void)

1 0

Alexandre Julliard : mountmgr: Create the DEVICEMAP registry keys in their respective driver.
by Alexandre Julliard 03 May '17

03 May '17

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

Alexandre Julliard : mountmgr: Create symbolic links in DosDevices for serial and parallel ports.
by Alexandre Julliard 03 May '17

03 May '17

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 : kernel32: Rely solely on the DosDevices symbolic links in QueryDosDevice.
by Alexandre Julliard 03 May '17

03 May '17

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

Julian Rüger : Fix typo in German about page
by Jeremy Newman 03 May '17

03 May '17

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 @@ <p>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.</p> <p>Das Projekt begann 1993, unter der anfänglichen Koordinierung durch Bob Amstadt,

1 0

Julian Rüger : Update German translation of the Help page
by Jeremy Newman 03 May '17

03 May '17

Module: website Branch: master Commit: 953d383276b2b0bb27a6f26a6e79064ff5459c11 URL: http://source.winehq.org/git/website.git/?a=commit;h=953d383276b2b0bb27a6f2… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed May 3 14:48:27 2017 +0200 Update German translation of the Help page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/help.template | 174 ++++++++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 89 deletions(-) diff --git a/templates/de/help.template b/templates/de/help.template index 41a9e76..2242be5 100644 --- a/templates/de/help.template +++ b/templates/de/help.template @@ -1,105 +1,101 @@ - - + -<h1 class="title">Unterstützung</h1> +<h1 class="title">Unterstützung</h1> -<p>Es gibt viele Möglichkeiten, Unterstützung für Wine zu erhalten.</p> +<p>Es gibt viele Möglichkeiten, Hilfe zur Benutzung von Wine zu erhalten.</p> -<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> +<div class="black inverse bold cornerround padding-sm"> + <div class="row"> + <div class="col-xs-2 col-md-1">Option</div> + <div class="col-xs-10 col-md-11">Mehr zu dieser Option</div> + </div> +</div> - <tr> - <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Option</b></td> - <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Mehr zu dieser Option</b></td> - </tr> +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> + <a href="http://www.codeweavers.com"><img src="{$root}/images/paid.png"><br>Paid</a> + </div> + <div class="col-xs-10 col-md-11"> + <a href="http://www.codeweavers.com">CodeWeavers</a> bietet bezahlte Unterstützung für Wine an. + </div> +</div> - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="http://www.codeweavers.com"><img src="{$root}/images/paid.png"><br>Bezahlt</a> - </td> - <td valign="top"> - <a href="http://www.codeweavers.com">CodeWeavers</a> bietet bezahlte Unterstützung für Wine an. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center" class="small"> +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> <a href="https://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png"><br>FAQ</a> - </td> - <td valign="top"> - Die meisten Fragen können schnell beantwortet werden, wenn Du unsere - <a href="https://wiki.winehq.org/FAQ">FAQ (en)</a> durchsiehst. Dort solltest Du als - allererstes nachschauen, ob Deine Frage schon beantwortet wurde. - </td> - </tr> + </div> + <div class="col-xs-10 col-md-11"> + Die häufigsten Fragen sind schnell beantwortet, nach dem Überfliegen unserer + <a href="https://wiki.winehq.org/FAQ">FAQ</a>. + Dies ist die erste Anlaufstelle, die Sie aufsuchen sollten, um zu sehen, ob Ihre Frage bereits + beantwortet wurde. + </div> +</div> - <tr bgcolor="#ffffff"> - <td align="center" class="small"> +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> <a href="{$root}/documentation"><img src="{$root}/images/docs.png"><br>Docs</a> - </td> - <td valign="top"> - Wir empfehlen, dass Du unsere online verfügbare - <a href="{$root}/documentation">Dokumentation</a> liest, um die Antwort auf deine - Frage zu finden. Von weiterem Interesse ist unser - <a href="https://wiki.winehq.org/HowTo">HowTo (en)</a>, das nützliche - Informationen für den noch am Anfang stehenden Benutzer bereithält. - </td> - </tr> + </div> + <div class="col-xs-10 col-md-11"> + Wir empfehlen, unsere online verfügbare <a href="{$root}/documentation">Dokumentation</a> zu lesen, + um Antowrten auf Ihre Fragen zu finden. Ebenfalls von Interesse dürfte unsere + <a href="https://wiki.winehq.org/Wine_Installation_and_Configuration">Installations- und Konfigurationsanleitung</a> + sein, die nützliche Informationen besonders für neue Benutzer bereit hält. + </div> +</div> - <tr bgcolor="#ffffff"> - <td align="center" class="small"> +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> <a href="https://wiki.winehq.org/"><img src="{$root}/images/mediawiki.png"><br>Wiki</a> - </td> - <td valign="top"> - Du kannst auch in unserem <a href="https://wiki.winehq.org/">Wiki</a> nachschauen, ob du - eine Antwort auf Deine Frage findest. - </td> - </tr> - -<tr bgcolor="#ffffff"> - <td align="center" class="small"> + </div> + <div class="col-xs-10 col-md-11"> + Auch unser <a href="https://wiki.winehq.org/">Wiki</a> enthält viele Hinweise, die Sie + auf Ihrer Suche nach Antworten keinesfalls auslassen sollten. + </div> +</div> + +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> <a href="//forums.winehq.org/"><img src="{$root}/images/forum.png"><br>Forum</a> - </td> - <td valign="top"> - Wir haben eine <a href="//forums.winehq.org/">web</a>/<a href="{$root}/forums">email-basierte (en)</a> - Gemeinschaft von Wine-Anwendern, in der Anwender Fragen stellen und miteinander netzwerken können. - Des weiteren gibt es die <a href="{$root}/forums">Mailing Lists</a>, die - Teil der gleichen Gemeinschaft sind. - </td> - </tr> + </div> + <div class="col-xs-10 col-md-11"> + Wir haben eine <a href="//forums.winehq.org/">web</a>/<a href="{$root}/forums">email</a>-basierte + Gemeinschaft von Wine-Benutzern, die Sie besuchen können, um Fragen zu stellen und Erfahrungen + mit anderen Anwendern auszutauschen. + Erkunden Sie auch die <a href="{$root}/forums">Mailinglisten</a>, die ebenfalls diese + Gemeinschaft ausmachen. + </div> +</div> - <tr bgcolor="#ffffff"> - <td align="center" class="small"> +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> <a href="{$root}/irc"><img src="{$root}/images/irc.png"><br>IRC</a> - </td> - <td valign="top"> - Du kannst mit der Wine Gemeinschaft via Live Chat auf unserem <a href="{$root}/irc">IRC Kanal</a> in Verbindung - treten. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center" class="small"> + </div> + <div class="col-xs-10 col-md-11"> + Verbinden Sie sich mit der Wine-Community via Live-Chat auf unserem + <a href="{$root}/irc">IRC-Kanal</a>. + </div> +</div> + +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> <a href="//appdb.winehq.org/"><img src="{$root}/images/appdb.png"><br>AppDB</a> - </td> - <td valign="top"> - Falls Du Unterstützung für eine bestimmte Anwendung suchst, ist unsere Anwendungsdatenbank - <a href="//appdb.winehq.org/">AppDB (en)</a> ein guter Anlaufpunkt. - </td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center" class="small"> - <a href="//bugs.winehq.org/"><img src="{$root}/images/bugs.png"><br>Bugzilla</a> - </td> - <td valign="top"> - Unser Bug Tracking-System <a href="//bugs.winehq.org/">Bugzilla (en)</a> enthält Informationen - zu allen Problemen, an denen wir jemals gearbeitet haben oder gerade arbeiten. - </td> - </tr> - -</table> + </div> + <div class="col-xs-10 col-md-11"> + Falls Sie Hilfe mit einer bestimmten Anwendung benötigen, ist unsere + <a href="//appdb.winehq.org/">Applikations-Datenbank</a> ein guter Anlaufpunkt. + </div> +</div> -<p>Gibt es Probleme mit unserer Website oder hast Du einen Tippfehler gefunden? Benachrichtige unser -<a href="mailto:web-admin(a)winehq.org">Web Team</a>.</p> +<div class="row padding-md"> + <div class="col-xs-2 col-md-1 center"> + <a href="//bugs.winehq.org/"><img src="{$root}/images/bugs.png"><br>Bugzilla</a> + </div> + <div class="col-xs-10 col-md-11"> + In unserem <a href="//bugs.winehq.org/">Bugzilla Bug-Tracker</a> sind alle Probleme dokumentiert, + an denen wir bereits gearbeitet haben oder momentan arbeiten. + </div> +</div> -<p> </p> +<p>Bei Problemen mit unserer Webseite, oder wenn Sie einen Tippfehler entdeckt haben, + kontaktieren Sie unser <a href="mailto:web-admin(a)winehq.org">Web-Team</a>.</p>

1 0