Ros-diffs September 2018

ros-diffs@reactos.org

24 participants
223 discussions

01/01: [DINPUT] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad21be5e5fe9bcba71af1… commit ad21be5e5fe9bcba71af159a70dc481e7031b862 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:20:57 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:20:57 2018 +0100 [DINPUT] Sync with Wine Staging 3.17. CORE-15127 --- dll/directx/wine/dinput/data_formats.c | 12 ++-- dll/directx/wine/dinput/device.c | 4 ++ dll/directx/wine/dinput/dinput_main.c | 75 +++++++++++++++++--- dll/directx/wine/dinput/joystick_osx.c | 26 ++++++- dll/directx/wine/dinput/keyboard.c | 122 +++++++++++++++++++++++++++------ media/doc/README.WINE | 2 +- 6 files changed, 202 insertions(+), 39 deletions(-) diff --git a/dll/directx/wine/dinput/data_formats.c b/dll/directx/wine/dinput/data_formats.c index 5fac7b7a08..9c9f00f8f6 100644 --- a/dll/directx/wine/dinput/data_formats.c +++ b/dll/directx/wine/dinput/data_formats.c @@ -25,8 +25,6 @@ #include "windef.h" #include "dinput.h" -#define numObjects(x) (sizeof(x) / sizeof(x[0])) - static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -79,7 +77,7 @@ const DIDATAFORMAT c_dfDIJoystick = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE), - numObjects(dfDIJoystick), + ARRAY_SIZE(dfDIJoystick), (LPDIOBJECTDATAFORMAT)dfDIJoystick }; @@ -255,7 +253,7 @@ const DIDATAFORMAT c_dfDIJoystick2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE2), - numObjects(dfDIJoystick2), + ARRAY_SIZE(dfDIJoystick2), (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; @@ -274,7 +272,7 @@ const DIDATAFORMAT c_dfDIMouse = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE), - numObjects(dfDIMouse), + ARRAY_SIZE(dfDIMouse), (LPDIOBJECTDATAFORMAT)dfDIMouse }; @@ -297,7 +295,7 @@ const DIDATAFORMAT c_dfDIMouse2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE2), - numObjects(dfDIMouse2), + ARRAY_SIZE(dfDIMouse2), (LPDIOBJECTDATAFORMAT)dfDIMouse2 }; @@ -565,6 +563,6 @@ const DIDATAFORMAT c_dfDIKeyboard = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, 256, - numObjects(dfDIKeyboard), + ARRAY_SIZE(dfDIKeyboard), (LPDIOBJECTDATAFORMAT)dfDIKeyboard }; diff --git a/dll/directx/wine/dinput/device.c b/dll/directx/wine/dinput/device.c index bb2a641719..50ad76f861 100644 --- a/dll/directx/wine/dinput/device.c +++ b/dll/directx/wine/dinput/device.c @@ -39,6 +39,8 @@ #include "device_private.h" #include "dinput_private.h" +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + WINE_DEFAULT_DEBUG_CHANNEL(dinput); static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -935,6 +937,8 @@ void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD tim /* Event is being set regardless of the queue state */ if (This->hEvent) SetEvent(This->hEvent); + PostMessageW(GetDesktopWindow(), WM_WINE_NOTIFY_ACTIVITY, 0, 0); + if (!This->queue_len || This->overflow || ofs < 0) return; next_pos = (This->queue_head + 1) % This->queue_len; diff --git a/dll/directx/wine/dinput/dinput_main.c b/dll/directx/wine/dinput/dinput_main.c index 69b9ff0a44..82c0d14c18 100644 --- a/dll/directx/wine/dinput/dinput_main.c +++ b/dll/directx/wine/dinput/dinput_main.c @@ -92,7 +92,6 @@ static const struct dinput_device *dinput_devices[] = &joystick_linux_device, &joystick_osx_device }; -#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) static HINSTANCE DINPUT_instance = NULL; @@ -165,6 +164,63 @@ HRESULT WINAPI DirectInputCreateEx( return DI_OK; } +/****************************************************************************** + * DirectInput8Create (DINPUT8.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create(HINSTANCE hinst, + DWORD version, REFIID iid, void **out, IUnknown *outer) +{ + IDirectInputImpl *This; + HRESULT hr; + + TRACE("hinst %p, version %#x, iid %s, out %p, outer %p.\n", + hinst, version, debugstr_guid(iid), out, outer); + + if (!out) + return E_POINTER; + + if (!IsEqualGUID(&IID_IDirectInput8A, iid) && + !IsEqualGUID(&IID_IDirectInput8W, iid) && + !IsEqualGUID(&IID_IUnknown, iid)) + { + *out = NULL; + return DIERR_NOINTERFACE; + } + + hr = create_directinput_instance(iid, out, &This); + + if (FAILED(hr)) + { + ERR("Failed to create DirectInput, hr %#x.\n", hr); + return hr; + } + + /* When aggregation is used, the application needs to manually call Initialize(). */ + if (!outer && IsEqualGUID(&IID_IDirectInput8A, iid)) + { + hr = IDirectInput8_Initialize(&This->IDirectInput8A_iface, hinst, version); + if (FAILED(hr)) + { + IDirectInput8_Release(&This->IDirectInput8A_iface); + *out = NULL; + return hr; + } + } + + if (!outer && IsEqualGUID(&IID_IDirectInput8W, iid)) + { + hr = IDirectInput8_Initialize(&This->IDirectInput8W_iface, hinst, version); + if (FAILED(hr)) + { + IDirectInput8_Release(&This->IDirectInput8W_iface); + *out = NULL; + return hr; + } + } + + return S_OK; +} + /****************************************************************************** * DirectInputCreateA (DINPUT.@) */ @@ -409,7 +465,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -449,7 +505,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -750,7 +806,7 @@ static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, return DIERR_NOTINITIALIZED; /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT ret; @@ -1006,7 +1062,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( } /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1107,7 +1163,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1330,7 +1386,7 @@ static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UI #undef X /* Enumerate all joysticks in order */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; @@ -1520,7 +1576,10 @@ static HRESULT WINAPI DICF_CreateInstance( IsEqualGUID( &IID_IDirectInput2A, riid ) || IsEqualGUID( &IID_IDirectInput2W, riid ) || IsEqualGUID( &IID_IDirectInput7A, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid ) ) { + IsEqualGUID( &IID_IDirectInput7W, riid ) || + IsEqualGUID( &IID_IDirectInput8A, riid ) || + IsEqualGUID( &IID_IDirectInput8W, riid ) ) + { return create_directinput_instance(riid, ppobj, NULL); } diff --git a/dll/directx/wine/dinput/joystick_osx.c b/dll/directx/wine/dinput/joystick_osx.c index b0dcdd99d5..2b2aade813 100644 --- a/dll/directx/wine/dinput/joystick_osx.c +++ b/dll/directx/wine/dinput/joystick_osx.c @@ -932,18 +932,31 @@ static INT find_joystick_devices(void) return joystick_devices_count; } +static DWORD make_vid_pid(IOHIDDeviceRef device) +{ + long vendID, prodID; + + vendID = get_device_property_long(device, CFSTR(kIOHIDVendorIDKey)); + prodID = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); + + return MAKELONG(vendID, prodID); +} + static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { + IOHIDDeviceRef device; + TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); if (id >= find_joystick_devices()) return E_FAIL; + device = get_device_ref(id); + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { - IOHIDDeviceRef device = get_device_ref(id); if(!device) return S_FALSE; if(get_ff(device, NULL) != S_OK) @@ -953,6 +966,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -974,16 +988,19 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS { char name[MAX_PATH]; char friendly[32]; + IOHIDDeviceRef device; TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); if (id >= find_joystick_devices()) return E_FAIL; + device = get_device_ref(id); + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { + if (dwFlags & DIEDFL_FORCEFEEDBACK) { - IOHIDDeviceRef device = get_device_ref(id); if(!device) return S_FALSE; if(get_ff(device, NULL) != S_OK) @@ -993,6 +1010,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -1060,9 +1078,12 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->id = index; + device = get_device_ref(index); + newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; newDevice->generic.guidProduct = DInput_Wine_OsX_Joystick_GUID; + newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state; /* get the device name */ @@ -1074,7 +1095,6 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, strcpy(newDevice->generic.name, name); list_init(&newDevice->effects); - device = get_device_ref(index); if(get_ff(device, &newDevice->ff) == S_OK){ newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; diff --git a/dll/directx/wine/dinput/keyboard.c b/dll/directx/wine/dinput/keyboard.c index 8a59ce01bc..6c7b535ea4 100644 --- a/dll/directx/wine/dinput/keyboard.c +++ b/dll/directx/wine/dinput/keyboard.c @@ -48,6 +48,7 @@ struct SysKeyboardImpl { struct IDirectInputDeviceImpl base; BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; + DWORD subtype; }; static inline SysKeyboardImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -67,11 +68,38 @@ static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysKeyboardIm return &This->base.IDirectInputDevice8W_iface; } -static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) +static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType) { if (!scanCode) scanCode = MapVirtualKeyW(vkCode, MAPVK_VK_TO_VSC); + if (subType == DIDEVTYPEKEYBOARD_JAPAN106) + { + switch (scanCode) + { + case 0x0d: /* ^ */ + scanCode = DIK_CIRCUMFLEX; + break; + case 0x1a: /* @ */ + scanCode = DIK_AT; + break; + case 0x1b: /* [ */ + scanCode = DIK_LBRACKET; + break; + case 0x28: /* : */ + scanCode = DIK_COLON; + break; + case 0x29: /* Hankaku/Zenkaku */ + scanCode = DIK_KANJI; + break; + case 0x2b: /* ] */ + scanCode = DIK_RBRACKET; + break; + case 0x73: /* \ */ + scanCode = DIK_BACKSLASH; + break; + } + } return scanCode; } @@ -97,7 +125,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode); + dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode, This->subtype); if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; @@ -121,7 +149,24 @@ const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 0x0ab8648a, 0x7735, 0x11d2, {0x8c, 0x73, 0x71, 0xdf, 0x54, 0xa9, 0x64, 0x41} }; -static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version) { +static DWORD get_keyboard_subtype(void) +{ + DWORD kbd_type, kbd_subtype, dev_subtype; + kbd_type = GetKeyboardType(0); + kbd_subtype = GetKeyboardType(1); + + if (kbd_type == 4 || (kbd_type == 7 && kbd_subtype == 0)) + dev_subtype = DIDEVTYPEKEYBOARD_PCENH; + else if (kbd_type == 7 && kbd_subtype == 2) + dev_subtype = DIDEVTYPEKEYBOARD_JAPAN106; + else { + FIXME("Unknown keyboard type=%u, subtype=%u\n", kbd_type, kbd_subtype); + dev_subtype = DIDEVTYPEKEYBOARD_PCENH; + } + return dev_subtype; +} + +static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD version, DWORD subtype) { DWORD dwSize; DIDEVICEINSTANCEA ddi; @@ -136,16 +181,16 @@ static void fill_keyboard_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); strcpy(ddi.tszInstanceName, "Keyboard"); strcpy(ddi.tszProductName, "Wine Keyboard"); memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version) { +static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD version, DWORD subtype) { DWORD dwSize; DIDEVICEINSTANCEW ddi; @@ -160,9 +205,9 @@ static void fill_keyboard_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver ddi.guidInstance = GUID_SysKeyboard;/* DInput's GUID */ ddi.guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */ if (version >= 0x0800) - ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - ddi.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_UNKNOWN << 8); + ddi.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); MultiByteToWideChar(CP_ACP, 0, "Keyboard", -1, ddi.tszInstanceName, MAX_PATH); MultiByteToWideChar(CP_ACP, 0, "Wine Keyboard", -1, ddi.tszProductName, MAX_PATH); @@ -179,7 +224,7 @@ static HRESULT keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVI (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { TRACE("Enumerating the Keyboard device\n"); - fill_keyboard_dideviceinstanceA(lpddi, version); + fill_keyboard_dideviceinstanceA(lpddi, version, get_keyboard_subtype()); return S_OK; } @@ -197,7 +242,7 @@ static HRESULT keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVI (((dwDevType == DI8DEVCLASS_KEYBOARD) || (dwDevType == DI8DEVTYPE_KEYBOARD)) && (version >= 0x0800))) { TRACE("Enumerating the Keyboard device\n"); - fill_keyboard_dideviceinstanceW(lpddi, version); + fill_keyboard_dideviceinstanceW(lpddi, version, get_keyboard_subtype()); return S_OK; } @@ -220,6 +265,7 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) newDevice->base.event_proc = KeyboardCallback; InitializeCriticalSection(&newDevice->base.crit); newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); + newDevice->subtype = get_keyboard_subtype(); /* Create copy of default data format */ if (!(df = HeapAlloc(GetProcessHeap(), 0, c_dfDIKeyboard.dwSize))) goto failed; @@ -229,12 +275,14 @@ static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) for (i = 0; i < df->dwNumObjs; i++) { char buf[MAX_PATH]; + BYTE dik_code; if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), buf, sizeof(buf))) continue; - memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[i], df->dwObjSize); - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; + dik_code = map_dik_code(i, 0, newDevice->subtype); + memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[dik_code], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON; } df->dwNumObjs = idx; @@ -362,9 +410,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) - devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_PCENH << 8); + devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (This->subtype << 8); else - devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (DIDEVTYPEKEYBOARD_PCENH << 8); + devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (This->subtype << 8); devcaps.dwAxes = 0; devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; @@ -385,6 +433,40 @@ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A ifa return SysKeyboardWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); } +static DWORD map_dik_to_scan(DWORD dik_code, DWORD subtype) +{ + if (dik_code == DIK_PAUSE || dik_code == DIK_NUMLOCK) dik_code ^= 0x80; + if (subtype == DIDEVTYPEKEYBOARD_JAPAN106) + { + switch (dik_code) + { + case DIK_CIRCUMFLEX: + dik_code = 0x0d; + break; + case DIK_AT: + dik_code = 0x1a; + break; + case DIK_LBRACKET: + dik_code = 0x1b; + break; + case DIK_COLON: + dik_code = 0x28; + break; + case DIK_KANJI: + dik_code = 0x29; + break; + case DIK_RBRACKET: + dik_code = 0x2b; + break; + case DIK_BACKSLASH: + dik_code = 0x73; + break; + } + } + + return dik_code; +} + /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -396,14 +478,14 @@ SysKeyboardAImpl_GetObjectInfo( DWORD dwObj, DWORD dwHow) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; LONG scan; res = IDirectInputDevice2AImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = DIDFT_GETINSTANCE(pdidoi->dwType); - if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextA((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; @@ -417,14 +499,14 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface DWORD dwObj, DWORD dwHow) { + SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); HRESULT res; LONG scan; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = DIDFT_GETINSTANCE(pdidoi->dwType); - if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; + scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND; @@ -448,7 +530,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo( return DI_OK; } - fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion); + fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; } @@ -463,7 +545,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface return DI_OK; } - fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion); + fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d017ab97c2..df4d66c340 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.17 reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.9 reactos/dll/directx/wine/devenum # Synced to WineStaging-3.9 -reactos/dll/directx/wine/dinput # Synced to WineStaging-3.9 +reactos/dll/directx/wine/dinput # Synced to WineStaging-3.17 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-3.3 reactos/dll/directx/wine/dmusic # Synced to WineStaging-3.9 reactos/dll/directx/wine/dplay # Synced to WineStaging-3.3

6 years, 2 months

01/01: [D3DXOF] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db2b3364c65aa5044df61… commit db2b3364c65aa5044df613b9f2e1b4f8a0a875c8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:20:18 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:20:18 2018 +0100 [D3DXOF] Sync with Wine Staging 3.17. CORE-15127 --- dll/directx/wine/d3dxof/main.c | 4 ++-- media/doc/README.WINE | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/directx/wine/d3dxof/main.c b/dll/directx/wine/d3dxof/main.c index 572f38831f..385609ace0 100644 --- a/dll/directx/wine/d3dxof/main.c +++ b/dll/directx/wine/d3dxof/main.c @@ -195,13 +195,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) && ! IsEqualGUID( &IID_IUnknown, riid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0fa0aa7abf..d017ab97c2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -27,7 +27,7 @@ reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3drm # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.17 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.3 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.17 reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.9 reactos/dll/directx/wine/devenum # Synced to WineStaging-3.9 reactos/dll/directx/wine/dinput # Synced to WineStaging-3.9

6 years, 2 months

01/01: [D3DX9_36] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcb816619abf78ab467a6… commit bcb816619abf78ab467a6491fe1e68d9d9d9fda8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:19:39 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:19:39 2018 +0100 [D3DX9_36] Sync with Wine Staging 3.17. CORE-15127 --- dll/directx/wine/d3dx9_36/mesh.c | 2 +- dll/directx/wine/d3dx9_36/surface.c | 3 --- media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index 204e0b5e86..b1d9f68ade 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -5169,7 +5169,7 @@ HRESULT WINAPI D3DXCreateCylinder(struct IDirect3DDevice9 *device, float radius1 HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency) { - FIXME("(%p, %p, %p): stub\n", device, mesh, adjacency); + FIXME("device %p, mesh %p, adjacency %p semi-stub.\n", device, mesh, adjacency); return D3DXCreateSphere(device, 1.0f, 4, 4, mesh, adjacency); } diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c index a1e56bda6d..73a1cbde1a 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -1827,13 +1827,10 @@ static dxtn_conversion_func get_dxtn_conversion_func(D3DFORMAT format, BOOL enco switch (format) { case D3DFMT_DXT1: - if (!wined3d_dxtn_supported()) return NULL; return encode ? wined3d_dxt1_encode : wined3d_dxt1_decode; case D3DFMT_DXT3: - if (!wined3d_dxtn_supported()) return NULL; return encode ? wined3d_dxt3_encode : wined3d_dxt3_decode; case D3DFMT_DXT5: - if (!wined3d_dxtn_supported()) return NULL; return encode ? wined3d_dxt5_encode : wined3d_dxt5_decode; default: return NULL; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d1e9eaa12b..0fa0aa7abf 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -26,7 +26,7 @@ reactos/dll/directx/wine/d3d8 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3drm # Synced to WineStaging-3.9 -reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.9 +reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.3 reactos/dll/directx/wine/ddraw # Synced to WineStaging-3.9 reactos/dll/directx/wine/devenum # Synced to WineStaging-3.9

6 years, 2 months

01/01: [D3DCOMPILER_43] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c003509323faee50695d7… commit c003509323faee50695d761420a36a6d0d198d7d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:19:01 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:19:01 2018 +0100 [D3DCOMPILER_43] Sync with Wine Staging 3.17. CORE-15127 --- dll/directx/wine/d3dcompiler_43/compiler.c | 2 +- dll/directx/wine/d3dcompiler_43/utils.c | 8 ++++---- media/doc/README.WINE | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/directx/wine/d3dcompiler_43/compiler.c b/dll/directx/wine/d3dcompiler_43/compiler.c index cf75cd516c..53d2a430a5 100644 --- a/dll/directx/wine/d3dcompiler_43/compiler.c +++ b/dll/directx/wine/d3dcompiler_43/compiler.c @@ -570,7 +570,7 @@ static const struct target_info targets_info[] = { static const struct target_info * get_target_info(const char *target) { LONG min = 0; - LONG max = sizeof(targets_info) / sizeof(targets_info[0]) - 1; + LONG max = ARRAY_SIZE(targets_info) - 1; LONG cur; int res; diff --git a/dll/directx/wine/d3dcompiler_43/utils.c b/dll/directx/wine/d3dcompiler_43/utils.c index 9d32677a81..748501f207 100644 --- a/dll/directx/wine/d3dcompiler_43/utils.c +++ b/dll/directx/wine/d3dcompiler_43/utils.c @@ -557,7 +557,7 @@ HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD d return S_OK; } -HRESULT dxbc_init(struct dxbc *dxbc, DWORD size) +HRESULT dxbc_init(struct dxbc *dxbc, UINT size) { TRACE("dxbc %p, size %u.\n", dxbc, size); @@ -1154,7 +1154,7 @@ static BOOL expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - enum hlsl_base_type types[] = + static const enum hlsl_base_type types[] = { HLSL_TYPE_BOOL, HLSL_TYPE_INT, @@ -1165,7 +1165,7 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl }; int t1_idx = -1, t2_idx = -1, i; - for (i = 0; i < sizeof(types) / sizeof(types[0]); ++i) + for (i = 0; i < ARRAY_SIZE(types); ++i) { /* Always convert away from HLSL_TYPE_HALF */ if (t1 == types[i]) @@ -1943,7 +1943,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_SWIZZLE", }; - if (type >= sizeof(names) / sizeof(names[0])) + if (type >= ARRAY_SIZE(names)) return "Unexpected node type"; return names[type]; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index f277dc5e53..d1e9eaa12b 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -24,7 +24,7 @@ The following libraries are shared with Wine. reactos/dll/directx/wine/amstream # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-3.9 -reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.3 +reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-3.17 reactos/dll/directx/wine/d3drm # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-3.9 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-3.3

6 years, 2 months

01/01: [INETCPL] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d02c72252cfdb712d3efd… commit d02c72252cfdb712d3efd2d54ae3877488010a96 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:18:08 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:18:08 2018 +0100 [INETCPL] Sync with Wine Staging 3.17. CORE-15127 --- dll/cpl/inetcpl/CMakeLists.txt | 4 +- dll/cpl/inetcpl/connections.c | 363 +++++++++++++++++++++++++++++++++++++++++ dll/cpl/inetcpl/general.c | 4 +- dll/cpl/inetcpl/inetcpl.c | 6 + dll/cpl/inetcpl/inetcpl.h | 9 + dll/cpl/inetcpl/lang/He.rc | 19 +++ dll/cpl/inetcpl/lang/Sr.rc | 38 +++++ dll/cpl/inetcpl/lang/cs-CZ.rc | 19 +++ dll/cpl/inetcpl/lang/de-DE.rc | 19 +++ dll/cpl/inetcpl/lang/en-US.rc | 19 +++ dll/cpl/inetcpl/lang/es-ES.rc | 19 +++ dll/cpl/inetcpl/lang/fr-FR.rc | 19 +++ dll/cpl/inetcpl/lang/it-IT.rc | 19 +++ dll/cpl/inetcpl/lang/ja-JP.rc | 19 +++ dll/cpl/inetcpl/lang/ko-KR.rc | 19 +++ dll/cpl/inetcpl/lang/lt-LT.rc | 19 +++ dll/cpl/inetcpl/lang/nl-NL.rc | 19 +++ dll/cpl/inetcpl/lang/pl-PL.rc | 19 +++ dll/cpl/inetcpl/lang/pt-BR.rc | 19 +++ dll/cpl/inetcpl/lang/ro-RO.rc | 19 +++ dll/cpl/inetcpl/lang/ru-RU.rc | 19 +++ dll/cpl/inetcpl/lang/sq-AL.rc | 19 +++ dll/cpl/inetcpl/lang/sv-SE.rc | 19 +++ dll/cpl/inetcpl/lang/tr-TR.rc | 19 +++ dll/cpl/inetcpl/lang/uk-UA.rc | 19 +++ dll/cpl/inetcpl/lang/zh-CN.rc | 19 +++ dll/cpl/inetcpl/lang/zh-TW.rc | 18 ++ dll/cpl/inetcpl/precomp.h | 1 + dll/cpl/inetcpl/security.c | 10 +- media/doc/README.WINE | 2 +- 30 files changed, 826 insertions(+), 9 deletions(-) diff --git a/dll/cpl/inetcpl/CMakeLists.txt b/dll/cpl/inetcpl/CMakeLists.txt index dfdd6b8638..28acde0a4f 100644 --- a/dll/cpl/inetcpl/CMakeLists.txt +++ b/dll/cpl/inetcpl/CMakeLists.txt @@ -1,11 +1,13 @@ +add_definitions(-D__WINESRC__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(inetcpl.cpl inetcpl.spec) list(APPEND SOURCE - inetcpl.c + connections.c content.c general.c + inetcpl.c security.c precomp.h) diff --git a/dll/cpl/inetcpl/connections.c b/dll/cpl/inetcpl/connections.c new file mode 100644 index 0000000000..648cd3d002 --- /dev/null +++ b/dll/cpl/inetcpl/connections.c @@ -0,0 +1,363 @@ +/* + * Copyright 2018 Piotr cabna for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <wininet.h> +#include <winuser.h> +#include <winreg.h> + +#include "inetcpl.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + +static const WCHAR auto_config_url[] = {'A','u','t','o','C','o','n','f','i','g','U','R','L',0}; +static const WCHAR internet_settings[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; +static const WCHAR proxy_enable[] = {'P','r','o','x','y','E','n','a','b','l','e',0}; +static const WCHAR proxy_server[] = {'P','r','o','x','y','S','e','r','v','e','r',0}; +static const WCHAR connections[] = {'C','o','n','n','e','c','t','i','o','n','s',0}; +static const WCHAR default_connection_settings[] = {'D','e','f','a','u','l','t', + 'C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; + +static BOOL initdialog_done; + +#define CONNECTION_SETTINGS_VERSION 0x46 +#define CONNECTION_SETTINGS_MANUAL_PROXY 0x2 +#define CONNECTION_SETTINGS_PAC_SCRIPT 0x4 +#define CONNECTION_SETTINGS_WPAD 0x8 + +typedef struct { + DWORD version; + DWORD id; + DWORD flags; + BYTE data[1]; + /* DWORD proxy_server_len; */ + /* UTF8 proxy_server[proxy_server_len]; */ + /* DWORD bypass_list_len; */ + /* UTF8 bypass_list[bypass_list_len]; */ + /* DWORD configuration_script_len; */ + /* UTF8 configuration_script[configuration_script_len]; */ + /* DWORD unk[8]; set to 0 */ +} connection_settings; + +static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_server, + BOOL use_wpad, BOOL use_pac_script, const WCHAR *pac_url, connection_settings **ret) +{ + DWORD size = FIELD_OFFSET(connection_settings, data), pos; + DWORD proxy_server_len; + DWORD pac_url_len; + + size += sizeof(DWORD); + if(proxy_server) + { + proxy_server_len = WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, + NULL, 0, NULL, NULL); + if(!proxy_server_len) return 0; + proxy_server_len--; + } + else + proxy_server_len = 0; + size += proxy_server_len; + if(pac_url) + { + pac_url_len = WideCharToMultiByte(CP_UTF8, 0, pac_url, -1, + NULL, 0, NULL, NULL); + if(!pac_url_len) return 0; + pac_url_len--; + } + else + pac_url_len = 0; + size += sizeof(DWORD)*10; + + *ret = heap_alloc_zero(size); + if(!*ret) return 0; + + (*ret)->version = CONNECTION_SETTINGS_VERSION; + (*ret)->flags = 1; + if(manual_proxy) (*ret)->flags |= CONNECTION_SETTINGS_MANUAL_PROXY; + if(use_pac_script) (*ret)->flags |= CONNECTION_SETTINGS_PAC_SCRIPT; + if(use_wpad) (*ret)->flags |= CONNECTION_SETTINGS_WPAD; + ((DWORD*)(*ret)->data)[0] = proxy_server_len; + pos = sizeof(DWORD); + if(proxy_server_len) + { + WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, + (char*)(*ret)->data+pos, proxy_server_len, NULL, NULL); + pos += proxy_server_len; + } + pos += sizeof(DWORD); /* skip proxy bypass list */ + ((DWORD*)((*ret)->data+pos))[0] = pac_url_len; + pos += sizeof(DWORD); + if(pac_url_len) + { + WideCharToMultiByte(CP_UTF8, 0, pac_url, -1, + (char*)(*ret)->data+pos, pac_url_len, NULL, NULL); + pos += pac_url_len; + } + return size; +} + +static void connections_on_initdialog(HWND hwnd) +{ + DWORD type, size, enabled; + WCHAR address[INTERNET_MAX_URL_LENGTH], *port; + WCHAR pac_url[INTERNET_MAX_URL_LENGTH]; + HKEY hkey, con; + LONG res; + + SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), + EM_LIMITTEXT, INTERNET_MAX_URL_LENGTH, 0); + SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER), + EM_LIMITTEXT, INTERNET_MAX_URL_LENGTH-10, 0); + SendMessageW(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), EM_LIMITTEXT, 8, 0); + + res = RegOpenKeyW(HKEY_CURRENT_USER, internet_settings, &hkey); + if(res) + return; + + size = sizeof(enabled); + res = RegQueryValueExW(hkey, proxy_enable, NULL, &type, (BYTE*)&enabled, &size); + if(res || type != REG_DWORD) + enabled = 0; + size = sizeof(address); + res = RegQueryValueExW(hkey, proxy_server, NULL, &type, (BYTE*)address, &size); + if(res || type != REG_SZ) + address[0] = 0; + size = sizeof(pac_url); + res = RegQueryValueExW(hkey, auto_config_url, NULL, &type, (BYTE*)pac_url, &size); + if(res || type != REG_SZ) + pac_url[0] = 0; + + res = RegOpenKeyW(hkey, connections, &con); + RegCloseKey(hkey); + if(!res) + { + connection_settings *settings = NULL; + size = 0; + + while((res = RegQueryValueExW(con, default_connection_settings, NULL, &type, + (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings) + { + connection_settings *new_settings = heap_realloc(settings, size); + if(!new_settings) + { + RegCloseKey(con); + heap_free(settings); + return; + } + settings = new_settings; + } + RegCloseKey(con); + + if(!res && type == REG_BINARY) + { + if(settings->version != CONNECTION_SETTINGS_VERSION) + FIXME("unexpected structure version (%x)\n", settings->version); + else if(settings->flags & CONNECTION_SETTINGS_WPAD) + CheckDlgButton(hwnd, IDC_USE_WPAD, BST_CHECKED); + } + heap_free(settings); + } + + TRACE("ProxyEnable = %x\n", enabled); + TRACE("ProxyServer = %s\n", wine_dbgstr_w(address)); + TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(auto_config_url)); + + if(enabled) + { + CheckDlgButton(hwnd, IDC_USE_PROXY_SERVER, BST_CHECKED); + EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER), TRUE); + EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), TRUE); + } + + port = strchrW(address, ':'); + if(port) + { + *port = 0; + port++; + } + SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, address); + if(port) + SetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, port); + + if(pac_url[0]) + { + CheckDlgButton(hwnd, IDC_USE_PAC_SCRIPT, BST_CHECKED); + EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), TRUE); + SetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, pac_url); + } + + return; +} + +static INT_PTR connections_on_command(HWND hwnd, WPARAM wparam) +{ + BOOL checked; + + switch (wparam) + { + case IDC_USE_PAC_SCRIPT: + checked = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT); + EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PAC_SCRIPT), checked); + break; + case IDC_USE_PROXY_SERVER: + checked = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER); + EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_SERVER), checked); + EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), checked); + } + + switch (wparam) + { + case IDC_USE_WPAD: + case IDC_USE_PAC_SCRIPT: + case IDC_USE_PROXY_SERVER: + case MAKEWPARAM(IDC_EDIT_PAC_SCRIPT, EN_CHANGE): + case MAKEWPARAM(IDC_EDIT_PROXY_SERVER, EN_CHANGE): + case MAKEWPARAM(IDC_EDIT_PROXY_PORT, EN_CHANGE): + if(initdialog_done) + SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); + return TRUE; + } + + return FALSE; +} + +static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + connection_settings *default_connection; + WCHAR proxy[INTERNET_MAX_URL_LENGTH]; + WCHAR pac_script[INTERNET_MAX_URL_LENGTH]; + PSHNOTIFY *psn = (PSHNOTIFY*)lparam; + DWORD proxy_len, port_len, pac_script_len; + DWORD use_proxy, use_pac_script, use_wpad, size; + LRESULT res; + HKEY hkey, con; + + if(psn->hdr.code != PSN_APPLY) + return FALSE; + + res = RegOpenKeyW(HKEY_CURRENT_USER, internet_settings, &hkey); + if(res) + return FALSE; + + use_proxy = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER); + res = RegSetValueExW(hkey, proxy_enable, 0, REG_DWORD, + (BYTE*)&use_proxy, sizeof(use_proxy)); + if(res) + { + RegCloseKey(hkey); + return FALSE; + } + TRACE("ProxyEnable set to %x\n", use_proxy); + + proxy_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_SERVER, proxy, ARRAY_SIZE(proxy)); + if(proxy_len) + { + proxy[proxy_len++] = ':'; + port_len = GetDlgItemTextW(hwnd, IDC_EDIT_PROXY_PORT, proxy+proxy_len, + ARRAY_SIZE(proxy)-proxy_len); + if(!port_len) + { + proxy[proxy_len++] = '8'; + proxy[proxy_len++] = '0'; + proxy[proxy_len] = 0; + } + + res = RegSetValueExW(hkey, proxy_server, 0, REG_SZ, + (BYTE*)proxy, (proxy_len+port_len)*sizeof(WCHAR)); + } + else + { + res = RegDeleteValueW(hkey, proxy_server); + if(res == ERROR_FILE_NOT_FOUND) + res = ERROR_SUCCESS; + } + if(res) + { + RegCloseKey(hkey); + return FALSE; + } + TRACE("ProxtServer set to %s\n", wine_dbgstr_w(proxy)); + + use_pac_script = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT); + pac_script_len = GetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT, + pac_script, ARRAY_SIZE(pac_script)); + if(!pac_script_len) use_pac_script = FALSE; + if(use_pac_script) + { + res = RegSetValueExW(hkey, auto_config_url, 0, REG_SZ, + (BYTE*)pac_script, pac_script_len*sizeof(WCHAR)); + } + else + { + res = RegDeleteValueW(hkey, auto_config_url); + if(res == ERROR_FILE_NOT_FOUND) + res = ERROR_SUCCESS; + } + if(res) + { + RegCloseKey(hkey); + return FALSE; + } + TRACE("AutoConfigURL set to %s\n", wine_dbgstr_w(use_pac_script ? pac_script : NULL)); + + use_wpad = IsDlgButtonChecked(hwnd, IDC_USE_WPAD); + + res = RegCreateKeyExW(hkey, connections, 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); + RegCloseKey(hkey); + if(res) + return FALSE; + + size = create_connection_settings(use_proxy, proxy, use_wpad, + use_pac_script, pac_script, &default_connection); + if(!size) + { + RegCloseKey(con); + return FALSE; + } + + res = RegSetValueExW(con, default_connection_settings, 0, REG_BINARY, + (BYTE*)default_connection, size); + heap_free(default_connection); + RegCloseKey(con); + return !res; +} + +INT_PTR CALLBACK connections_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + connections_on_initdialog(hwnd); + initdialog_done = TRUE; + break; + case WM_COMMAND: + return connections_on_command(hwnd, wparam); + case WM_NOTIFY: + return connections_on_notify(hwnd, wparam, lparam); + } + return FALSE; +} diff --git a/dll/cpl/inetcpl/general.c b/dll/cpl/inetcpl/general.c index e0f473caf7..b9fbf1eb0a 100644 --- a/dll/cpl/inetcpl/general.c +++ b/dll/cpl/inetcpl/general.c @@ -263,10 +263,10 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) if (psn->hdr.code == PSN_APPLY) { *buffer = 0; - GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, sizeof(buffer)/sizeof(WCHAR)); + GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, ARRAY_SIZE(buffer)); TRACE("EDITTEXT has %s\n", debugstr_w(buffer)); - res = parse_url_from_outside(buffer, parsed, sizeof(parsed)/sizeof(WCHAR)); + res = parse_url_from_outside(buffer, parsed, ARRAY_SIZE(parsed)); TRACE("got %d with %s\n", res, debugstr_w(parsed)); if (res) diff --git a/dll/cpl/inetcpl/inetcpl.c b/dll/cpl/inetcpl/inetcpl.c index 578867a892..9f220164db 100644 --- a/dll/cpl/inetcpl/inetcpl.c +++ b/dll/cpl/inetcpl/inetcpl.c @@ -129,6 +129,12 @@ static void display_cpl_sheets(HWND parent) psp[id].pfnDlgProc = content_dlgproc; id++; + psp[id].dwSize = sizeof (PROPSHEETPAGEW); + psp[id].hInstance = hcpl; + psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTIONS); + psp[id].pfnDlgProc = connections_dlgproc; + id++; + /* Fill out the PROPSHEETHEADER */ psh.dwSize = sizeof (PROPSHEETHEADERW); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID | PSH_USECALLBACK; diff --git a/dll/cpl/inetcpl/inetcpl.h b/dll/cpl/inetcpl/inetcpl.h index b01362bdc6..b8b09218f0 100644 --- a/dll/cpl/inetcpl/inetcpl.h +++ b/dll/cpl/inetcpl/inetcpl.h @@ -27,6 +27,7 @@ #include <commctrl.h> extern HMODULE hcpl; +INT_PTR CALLBACK connections_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; @@ -89,4 +90,12 @@ INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; #define IDC_CERT 4100 #define IDC_CERT_PUBLISHER 4101 +#define IDD_CONNECTIONS 5000 +#define IDC_USE_WPAD 5100 +#define IDC_USE_PAC_SCRIPT 5101 +#define IDC_EDIT_PAC_SCRIPT 5102 +#define IDC_USE_PROXY_SERVER 5200 +#define IDC_EDIT_PROXY_SERVER 5201 +#define IDC_EDIT_PROXY_PORT 5202 + #endif diff --git a/dll/cpl/inetcpl/lang/He.rc b/dll/cpl/inetcpl/lang/He.rc index c992668019..1ca433008c 100644 --- a/dll/cpl/inetcpl/lang/He.rc +++ b/dll/cpl/inetcpl/lang/He.rc @@ -120,3 +120,22 @@ BEGIN PUSHBUTTON "מפיצים...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/Sr.rc b/dll/cpl/inetcpl/lang/Sr.rc index 5a5913e88a..9dc6c97cc2 100644 --- a/dll/cpl/inetcpl/lang/Sr.rc +++ b/dll/cpl/inetcpl/lang/Sr.rc @@ -116,6 +116,25 @@ BEGIN END +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END + LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN STRINGTABLE @@ -208,3 +227,22 @@ BEGIN PUSHBUTTON "Izdavači...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/cs-CZ.rc b/dll/cpl/inetcpl/lang/cs-CZ.rc index 14ccdb53ae..f4d848e3f2 100644 --- a/dll/cpl/inetcpl/lang/cs-CZ.rc +++ b/dll/cpl/inetcpl/lang/cs-CZ.rc @@ -100,3 +100,22 @@ BEGIN PUSHBUTTON "Vydavatelé...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/de-DE.rc b/dll/cpl/inetcpl/lang/de-DE.rc index 4907388450..5ac600f83c 100644 --- a/dll/cpl/inetcpl/lang/de-DE.rc +++ b/dll/cpl/inetcpl/lang/de-DE.rc @@ -115,3 +115,22 @@ BEGIN PUSHBUTTON "Herausgeber...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/en-US.rc b/dll/cpl/inetcpl/lang/en-US.rc index 591e5c425b..d1b2777b06 100644 --- a/dll/cpl/inetcpl/lang/en-US.rc +++ b/dll/cpl/inetcpl/lang/en-US.rc @@ -113,3 +113,22 @@ BEGIN PUSHBUTTON "Pu&blishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/es-ES.rc b/dll/cpl/inetcpl/lang/es-ES.rc index 3f612f909c..9f1c2ac917 100644 --- a/dll/cpl/inetcpl/lang/es-ES.rc +++ b/dll/cpl/inetcpl/lang/es-ES.rc @@ -93,3 +93,22 @@ BEGIN PUSHBUTTON "Autoridades...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/fr-FR.rc b/dll/cpl/inetcpl/lang/fr-FR.rc index f07bb92f11..89f7b94676 100644 --- a/dll/cpl/inetcpl/lang/fr-FR.rc +++ b/dll/cpl/inetcpl/lang/fr-FR.rc @@ -117,3 +117,22 @@ BEGIN PUSHBUTTON "Éditeurs...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/it-IT.rc b/dll/cpl/inetcpl/lang/it-IT.rc index 462116c3ab..982a5a0fe5 100644 --- a/dll/cpl/inetcpl/lang/it-IT.rc +++ b/dll/cpl/inetcpl/lang/it-IT.rc @@ -116,3 +116,22 @@ BEGIN PUSHBUTTON "Editori...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/ja-JP.rc b/dll/cpl/inetcpl/lang/ja-JP.rc index 9dd12c983c..66ad1981da 100644 --- a/dll/cpl/inetcpl/lang/ja-JP.rc +++ b/dll/cpl/inetcpl/lang/ja-JP.rc @@ -117,3 +117,22 @@ BEGIN PUSHBUTTON "発行元...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/ko-KR.rc b/dll/cpl/inetcpl/lang/ko-KR.rc index 11b52c59b3..1782bdb668 100644 --- a/dll/cpl/inetcpl/lang/ko-KR.rc +++ b/dll/cpl/inetcpl/lang/ko-KR.rc @@ -116,3 +116,22 @@ BEGIN PUSHBUTTON "발행자...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/lt-LT.rc b/dll/cpl/inetcpl/lang/lt-LT.rc index 7cf82e9b1e..f550fd8413 100644 --- a/dll/cpl/inetcpl/lang/lt-LT.rc +++ b/dll/cpl/inetcpl/lang/lt-LT.rc @@ -116,3 +116,22 @@ BEGIN PUSHBUTTON "Publikuotojai...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/nl-NL.rc b/dll/cpl/inetcpl/lang/nl-NL.rc index a13c59bdcb..8065123a4d 100644 --- a/dll/cpl/inetcpl/lang/nl-NL.rc +++ b/dll/cpl/inetcpl/lang/nl-NL.rc @@ -113,3 +113,22 @@ BEGIN PUSHBUTTON "Uitgevers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/pl-PL.rc b/dll/cpl/inetcpl/lang/pl-PL.rc index adf3311b1c..d6c18bb840 100644 --- a/dll/cpl/inetcpl/lang/pl-PL.rc +++ b/dll/cpl/inetcpl/lang/pl-PL.rc @@ -116,3 +116,22 @@ BEGIN PUSHBUTTON "Wydawcy...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/pt-BR.rc b/dll/cpl/inetcpl/lang/pt-BR.rc index b102102949..6d67707f8f 100644 --- a/dll/cpl/inetcpl/lang/pt-BR.rc +++ b/dll/cpl/inetcpl/lang/pt-BR.rc @@ -115,3 +115,22 @@ BEGIN PUSHBUTTON "Editores...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/ro-RO.rc b/dll/cpl/inetcpl/lang/ro-RO.rc index ecf7146f57..6fcb556c23 100644 --- a/dll/cpl/inetcpl/lang/ro-RO.rc +++ b/dll/cpl/inetcpl/lang/ro-RO.rc @@ -114,3 +114,22 @@ BEGIN PUSHBUTTON "Agenți pu&blici…", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/ru-RU.rc b/dll/cpl/inetcpl/lang/ru-RU.rc index a6848579a2..4380367c6d 100644 --- a/dll/cpl/inetcpl/lang/ru-RU.rc +++ b/dll/cpl/inetcpl/lang/ru-RU.rc @@ -116,3 +116,22 @@ BEGIN PUSHBUTTON "Издатели...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/sq-AL.rc b/dll/cpl/inetcpl/lang/sq-AL.rc index 6f65595449..a57ad50866 100644 --- a/dll/cpl/inetcpl/lang/sq-AL.rc +++ b/dll/cpl/inetcpl/lang/sq-AL.rc @@ -115,3 +115,22 @@ BEGIN PUSHBUTTON "Botuesit...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/sv-SE.rc b/dll/cpl/inetcpl/lang/sv-SE.rc index 63ccf4e603..f78f8e7bee 100644 --- a/dll/cpl/inetcpl/lang/sv-SE.rc +++ b/dll/cpl/inetcpl/lang/sv-SE.rc @@ -115,3 +115,22 @@ BEGIN PUSHBUTTON "Utgivare...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/tr-TR.rc b/dll/cpl/inetcpl/lang/tr-TR.rc index 4cb462b563..1b20210c0e 100644 --- a/dll/cpl/inetcpl/lang/tr-TR.rc +++ b/dll/cpl/inetcpl/lang/tr-TR.rc @@ -116,3 +116,22 @@ BEGIN PUSHBUTTON "&Yayımcılar...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/uk-UA.rc b/dll/cpl/inetcpl/lang/uk-UA.rc index 89880fddbd..83a850e85e 100644 --- a/dll/cpl/inetcpl/lang/uk-UA.rc +++ b/dll/cpl/inetcpl/lang/uk-UA.rc @@ -117,3 +117,22 @@ BEGIN PUSHBUTTON "Видавці...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/zh-CN.rc b/dll/cpl/inetcpl/lang/zh-CN.rc index b272da8c80..af61320d0f 100644 --- a/dll/cpl/inetcpl/lang/zh-CN.rc +++ b/dll/cpl/inetcpl/lang/zh-CN.rc @@ -112,3 +112,22 @@ BEGIN PUSHBUTTON "发行商(&B)...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END + +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/lang/zh-TW.rc b/dll/cpl/inetcpl/lang/zh-TW.rc index 223253cf8e..780dcc7641 100644 --- a/dll/cpl/inetcpl/lang/zh-TW.rc +++ b/dll/cpl/inetcpl/lang/zh-TW.rc @@ -113,3 +113,21 @@ BEGIN END +/* "Connections" propsheet */ +IDD_CONNECTIONS DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Connections" +BEGIN + GROUPBOX "Automatic configuration", IDC_STATIC, 4, 4, 312, 56 + AUTOCHECKBOX "Use Web Proxy Auto-Discovery (WPAD)", IDC_USE_WPAD, 10, 14, 200, 14, BS_TOP + AUTOCHECKBOX "Use Proxy Auto-Config (PAC) script", IDC_USE_PAC_SCRIPT, 10, 28, 200, 14, BS_TOP + LTEXT "Address:", IDC_STATIC, 10, 42, 40, 14 + EDITTEXT IDC_EDIT_PAC_SCRIPT, 50, 42, 160, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + GROUPBOX "Proxy server", IDC_STATIC, 4, 66, 312, 42 + AUTOCHECKBOX "Use a proxy server", IDC_USE_PROXY_SERVER, 10, 76, 200, 14, BS_TOP | BS_MULTILINE + LTEXT "Address:", IDC_STATIC, 10, 90, 40, 14 + EDITTEXT IDC_EDIT_PROXY_SERVER, 50, 90, 80, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Port:", IDC_STATIC, 140, 90, 30, 14 + EDITTEXT IDC_EDIT_PROXY_PORT, 170, 90, 40, 14, WS_VISIBLE | ES_AUTOHSCROLL | WS_DISABLED | ES_NUMBER +END diff --git a/dll/cpl/inetcpl/precomp.h b/dll/cpl/inetcpl/precomp.h index 8faa56fac9..6ec441e6b1 100644 --- a/dll/cpl/inetcpl/precomp.h +++ b/dll/cpl/inetcpl/precomp.h @@ -21,6 +21,7 @@ #include <shlwapi.h> #include <wine/debug.h> +#include <wine/heap.h> #include "inetcpl.h" diff --git a/dll/cpl/inetcpl/security.c b/dll/cpl/inetcpl/security.c index 543ada433d..e11caf1fc3 100644 --- a/dll/cpl/inetcpl/security.c +++ b/dll/cpl/inetcpl/security.c @@ -73,7 +73,7 @@ static DWORD url_templates[] = {URLTEMPLATE_CUSTOM, static DWORD index_from_urltemplate(URLTEMPLATE value) { - DWORD index = sizeof(url_templates) / sizeof(url_templates[0]); + DWORD index = ARRAY_SIZE(url_templates); while((index > 0) && (url_templates[index-1] != value)) index--; @@ -105,12 +105,12 @@ static void update_security_level(secdlg_data *sd, DWORD lv_index, DWORD tb_inde current_index = (tb_index > 0) ? tb_index : index_from_urltemplate(sd->levels[lv_index]); name[0] = 0; - LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, sizeof(name)/sizeof(name[0])); + LoadStringW(hcpl, IDS_SEC_LEVEL0 + current_index, name, ARRAY_SIZE(name)); TRACE("new level #%d: %s\n", current_index, debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL), name); name[0] = 0; - LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, sizeof(name)/sizeof(name[0])); + LoadStringW(hcpl, IDS_SEC_LEVEL0_INFO + (current_index * 0x10), name, ARRAY_SIZE(name)); TRACE("new level info: %s\n", debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_LEVEL_INFO), name); @@ -134,8 +134,8 @@ static void update_zone_info(secdlg_data *sd, DWORD lv_index) SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_ZONE_INFO), za->szDescription); - len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, sizeof(name)/sizeof(*name)); - lstrcpynW(&name[len], za->szDisplayName, sizeof(name)/sizeof(*name) - len - 1); + len = LoadStringW(hcpl, IDS_SEC_SETTINGS, name, ARRAY_SIZE(name)); + lstrcpynW(&name[len], za->szDisplayName, ARRAY_SIZE(name) - len - 1); TRACE("new title: %s\n", debugstr_w(name)); SetWindowTextW(GetDlgItem(sd->hsec, IDC_SEC_GROUP), name); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3cc9cffedf..f277dc5e53 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -220,7 +220,7 @@ reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-2.9 reactos/dll/win32/xmllite # Synced to WineStaging-3.3 -reactos/dll/cpl/inetcpl # Synced to WineStaging-3.3 +reactos/dll/cpl/inetcpl # Synced to WineStaging-3.17 reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (known there as /dll/win32/localui)

6 years, 2 months

01/01: [XCOPY_WINETEST] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21c5ece5da9a60783448e… commit 21c5ece5da9a60783448e86fb75c448099f24237 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:17:02 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:17:02 2018 +0100 [XCOPY_WINETEST] Sync with Wine Staging 3.17. CORE-15127 --- modules/rostests/winetests/xcopy/xcopy.c | 61 ++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/modules/rostests/winetests/xcopy/xcopy.c b/modules/rostests/winetests/xcopy/xcopy.c index ec7683aecc..17b4406b74 100644 --- a/modules/rostests/winetests/xcopy/xcopy.c +++ b/modules/rostests/winetests/xcopy/xcopy.c @@ -73,6 +73,65 @@ static void test_date_format(void) DeleteFileA("xcopytest\\xcopy1"); } +static void test_parms_syntax(void) +{ + DWORD rc; + + rc = runcmd("xcopy /H/D:20-01-2000 xcopy1 xcopytest"); + ok(rc == 4, "xcopy /H/D:d-m-y test returned rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") == INVALID_FILE_ATTRIBUTES, + "xcopy should not have created xcopytest\\xcopy1\n"); + + rc = runcmd("xcopy /D:01-20-2000/H xcopy1 xcopytest"); + ok(rc == 0, "xcopy /H/D:m-d-y test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); + + /* The following test is commented out as under wine it generates + a recursively deep directory tree (todo_wine) + rc = runcmd("xcopy /D:1-20-2000/E xcopy1 xcopytest"); + ok(rc == 0, "xcopy /D:m-d-y/E test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest\\xcopy1") != INVALID_FILE_ATTRIBUTES, + "xcopy did not create xcopytest\\xcopy1\n"); + DeleteFileA("xcopytest\\xcopy1"); */ + + rc = runcmd("xcopy /D/S xcopytest xcopytest2\\"); + ok(rc == 0, "xcopy /D/S test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest2") == INVALID_FILE_ATTRIBUTES, + "xcopy copied empty directory incorrectly\n"); + + rc = runcmd("xcopy /D/S/E xcopytest xcopytest2\\"); + ok(rc == 0, "xcopy /D/S/E test failed rc=%u\n", rc); + ok(GetFileAttributesA("xcopytest2") != INVALID_FILE_ATTRIBUTES, + "xcopy failed to copy empty directory\n"); + RemoveDirectoryA("xcopytest2"); +} + +static void test_keep_attributes(void) +{ + DWORD rc; + + SetFileAttributesA("xcopy1", FILE_ATTRIBUTE_READONLY); + + rc = runcmd("xcopy xcopy1 xcopytest"); + ok(rc == 0, "xcopy failed to copy read only file\n"); + ok((GetFileAttributesA("xcopytest\\xcopy1") & FILE_ATTRIBUTE_READONLY) != FILE_ATTRIBUTE_READONLY, + "xcopy should not have copied file permissions\n"); + SetFileAttributesA("xcopytest\\xcopy1", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("xcopytest\\xcopy1"); + + rc = runcmd("xcopy /K xcopy1 xcopytest"); + ok(rc == 0, "xcopy failed to copy read only file with /k\n"); + ok((GetFileAttributesA("xcopytest\\xcopy1") & FILE_ATTRIBUTE_READONLY) == FILE_ATTRIBUTE_READONLY, + "xcopy did not keep file permissions\n"); + SetFileAttributesA("xcopytest\\xcopy1", FILE_ATTRIBUTE_NORMAL); + DeleteFileA("xcopytest\\xcopy1"); + + SetFileAttributesA("xcopy1", FILE_ATTRIBUTE_NORMAL); + + } + START_TEST(xcopy) { char tmpdir[MAX_PATH]; @@ -94,6 +153,8 @@ START_TEST(xcopy) CloseHandle(hfile); test_date_format(); + test_parms_syntax(); + test_keep_attributes(); DeleteFileA("xcopy1"); RemoveDirectoryA("xcopytest");

6 years, 2 months

01/01: [XCOPY] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19eb7a62f98ec5aac53a2… commit 19eb7a62f98ec5aac53a28c472bf7947f5e50cde Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:16:20 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:16:20 2018 +0100 [XCOPY] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/xcopy/CMakeLists.txt | 1 + base/applications/cmdutils/xcopy/lang/da-DK.rc | 1 + base/applications/cmdutils/xcopy/lang/de-DE.rc | 1 + base/applications/cmdutils/xcopy/lang/en-US.rc | 1 + base/applications/cmdutils/xcopy/lang/es-ES.rc | 1 + base/applications/cmdutils/xcopy/lang/fr-FR.rc | 1 + base/applications/cmdutils/xcopy/lang/it-IT.rc | 1 + base/applications/cmdutils/xcopy/lang/ja-JP.rc | 1 + base/applications/cmdutils/xcopy/lang/ko-KR.rc | 1 + base/applications/cmdutils/xcopy/lang/lt-LT.rc | 1 + base/applications/cmdutils/xcopy/lang/nl-NL.rc | 1 + base/applications/cmdutils/xcopy/lang/no-NO.rc | 1 + base/applications/cmdutils/xcopy/lang/pl-PL.rc | 1 + base/applications/cmdutils/xcopy/lang/pt-BR.rc | 1 + base/applications/cmdutils/xcopy/lang/pt-PT.rc | 1 + base/applications/cmdutils/xcopy/lang/ro-RO.rc | 1 + base/applications/cmdutils/xcopy/lang/ru-RU.rc | 1 + base/applications/cmdutils/xcopy/lang/sl-SI.rc | 1 + base/applications/cmdutils/xcopy/lang/sq-AL.rc | 1 + base/applications/cmdutils/xcopy/lang/sr-SP.rc | 2 + base/applications/cmdutils/xcopy/lang/sv-SE.rc | 1 + base/applications/cmdutils/xcopy/lang/tr-TR.rc | 1 + base/applications/cmdutils/xcopy/lang/uk-UA.rc | 1 + base/applications/cmdutils/xcopy/lang/zh-CN.rc | 1 + base/applications/cmdutils/xcopy/lang/zh-TW.rc | 1 + base/applications/cmdutils/xcopy/xcopy.c | 259 ++++++++++++++---------- base/applications/cmdutils/xcopy/xcopy.h | 1 + media/doc/README.WINE | 2 +- 28 files changed, 180 insertions(+), 108 deletions(-) diff --git a/base/applications/cmdutils/xcopy/CMakeLists.txt b/base/applications/cmdutils/xcopy/CMakeLists.txt index 5cc5e81ce2..f2fa0cf0ad 100644 --- a/base/applications/cmdutils/xcopy/CMakeLists.txt +++ b/base/applications/cmdutils/xcopy/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-D__WINESRC__) add_executable(xcopy xcopy.c xcopy.rc) target_link_libraries(xcopy wine) set_module_type(xcopy win32cui UNICODE) diff --git a/base/applications/cmdutils/xcopy/lang/da-DK.rc b/base/applications/cmdutils/xcopy/lang/da-DK.rc index 8918785163..6fda70a96a 100644 --- a/base/applications/cmdutils/xcopy/lang/da-DK.rc +++ b/base/applications/cmdutils/xcopy/lang/da-DK.rc @@ -49,6 +49,7 @@ hvor:\n\ [/C] Fortsæt selv om det opstår fejl under kopieringen\n\ [/A] Kopier ikke filer som er markeret som arkiv\n\ [/M] Kopier kun filer som er markeret som akriv; fjerner denne markering\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\ \t\tden opgivne dato.\n\ \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ diff --git a/base/applications/cmdutils/xcopy/lang/de-DE.rc b/base/applications/cmdutils/xcopy/lang/de-DE.rc index b149d8b746..4e4e711eae 100644 --- a/base/applications/cmdutils/xcopy/lang/de-DE.rc +++ b/base/applications/cmdutils/xcopy/lang/de-DE.rc @@ -49,6 +49,7 @@ Mit:\n\ [/C] Nach Fehlern den Kopiervorgang fortsetzen\n\ [/A] Nur Dateien mit Archivbit kopieren\n\ [/M] Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:M-T-J] Kopiere neue Dateien und Dateien, die neuer als das\n\ \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\ \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/en-US.rc b/base/applications/cmdutils/xcopy/lang/en-US.rc index 615a244f0c..a63c83829c 100644 --- a/base/applications/cmdutils/xcopy/lang/en-US.rc +++ b/base/applications/cmdutils/xcopy/lang/en-US.rc @@ -50,6 +50,7 @@ Where:\n\ [/A] Only copy files with archive attribute set.\n\ [/M] Only copy files with archive attribute set, removes the\n\ \tarchive attribute.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source.\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/es-ES.rc b/base/applications/cmdutils/xcopy/lang/es-ES.rc index e0997c2503..1a1358e2e3 100644 --- a/base/applications/cmdutils/xcopy/lang/es-ES.rc +++ b/base/applications/cmdutils/xcopy/lang/es-ES.rc @@ -50,6 +50,7 @@ En la cual:\n\ [/A] Copia solamente archivos con el attributo de archivo definido\n\ [/M] Copia solamente archivos con el attributo de archivo definido, supprime\n\ \tl'attributo de archivo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copia los nuevos archivos or los que fueront modificado despues la fecha especificada.\n\ \t\tSi la fecha no esta especificada, copia unicamente cuando el archivo de destino est mas viejo\n\ \t\tque el archivo fuente\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/fr-FR.rc b/base/applications/cmdutils/xcopy/lang/fr-FR.rc index eccb0a65ef..de5ee1f9f9 100644 --- a/base/applications/cmdutils/xcopy/lang/fr-FR.rc +++ b/base/applications/cmdutils/xcopy/lang/fr-FR.rc @@ -50,6 +50,7 @@ où :\n\ [/A] Copie uniquement les fichiers qui ont l'attribut archive défini\n\ [/M] Copie uniquement les fichiers qui ont l'attribut archive défini ; supprime\n\ \tensuite l'attribut\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copie uniquement les nouveaux fichiers, ou ceux modifiés après la date spécifiée.\n\ \t\tSi aucune date n'est spécifiée, copie uniquement lorsque le fichier de destination est plus ancien\n\ \t\tque le fichier source\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/it-IT.rc b/base/applications/cmdutils/xcopy/lang/it-IT.rc index 3b518ba39c..4ffdf5444b 100644 --- a/base/applications/cmdutils/xcopy/lang/it-IT.rc +++ b/base/applications/cmdutils/xcopy/lang/it-IT.rc @@ -50,6 +50,7 @@ Dove:\n\ [/A] Copia solo i file che abbiano l'attributo Archivio\n\ [/M] Copia solo i file che abbiano l'attributo Archivio, rimuovendo\n\ \tl'attributo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-g-a] Copia i nuovi file o quelli modificati dopo la data fornita.\n\ \t\tSe nessuna data è stata fornita, copia solo se la destinazione è più vecchia\n\ \t\tdella sorgente\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/ja-JP.rc b/base/applications/cmdutils/xcopy/lang/ja-JP.rc index 7ead13b86a..2eec6791e0 100644 --- a/base/applications/cmdutils/xcopy/lang/ja-JP.rc +++ b/base/applications/cmdutils/xcopy/lang/ja-JP.rc @@ -50,6 +50,7 @@ XCOPY 送り元 [送り先] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] アーカイブ属性のファイルだけコピーします。\n\ [/M] アーカイブ属性のファイルだけコピーし、アーカイブ属性を\n\ \t取り除きます。\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:月-日-年] 新しいファイルや指定された日付以降に変更された\n\ \t\tファイルをコピーします。日付が指定されない場合は、\n\ \t\tコピー先がコピー元より古いファイルだけコピーします。\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/ko-KR.rc b/base/applications/cmdutils/xcopy/lang/ko-KR.rc index f18c6030bb..7b7f506665 100644 --- a/base/applications/cmdutils/xcopy/lang/ko-KR.rc +++ b/base/applications/cmdutils/xcopy/lang/ko-KR.rc @@ -50,6 +50,7 @@ Where:\n\ [/A] 오직 압축 속성이 설정되어있는 파일만 복사\n\ [/M] 오직 압축 속성을 제거하면서 압축 속성이 설정되어있는\n\ \t파일만 복사\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] 지정된 날짜 후에 수정되거나 새로운 파일 복사.\n\ \t\tI만약 어떠한 날짜도 지정되지 않으면,오직 원본보다\n\ \t\t대상이 오래된 것만 복사\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/lt-LT.rc b/base/applications/cmdutils/xcopy/lang/lt-LT.rc index 96c9a386dd..0be2b44860 100644 --- a/base/applications/cmdutils/xcopy/lang/lt-LT.rc +++ b/base/applications/cmdutils/xcopy/lang/lt-LT.rc @@ -50,6 +50,7 @@ Kur:\n\ [/A] Kopijuoti tik failus su nustatytu archyvavimo požymiu\n\ [/M] Kopijuoti tik failus su nustatytu archyvavimo požymiu, pašalinti\n\ \tarchyvavimo požymį\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopijuoti naujus failus arba modifikuotos po nurodytos datos.\n\ \t\tJei data nenurodyta, kopijuoti tik jei paskirties failas yra\n\ \t\tsenesnis už šaltinio failą\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/nl-NL.rc b/base/applications/cmdutils/xcopy/lang/nl-NL.rc index 4c1620efc1..db714d14b3 100644 --- a/base/applications/cmdutils/xcopy/lang/nl-NL.rc +++ b/base/applications/cmdutils/xcopy/lang/nl-NL.rc @@ -50,6 +50,7 @@ Parameters:\n\ [/A] Kopieer alleen bestanden met archiveringsattribuut aan\n\ [/M] Kopieer alleen bestanden met archiveringsattribuut aan, verwijdert\n\ \tdit archiveringsattribuut\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopieer bestanden die nieuw zijn of gewijzigd zijn na de opgegeven\n\ \t\tdatum. Als geen datum wordt gegeven, kopieer alleen als bron nieuwer is.\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/no-NO.rc b/base/applications/cmdutils/xcopy/lang/no-NO.rc index e85c45bde9..e051212d89 100644 --- a/base/applications/cmdutils/xcopy/lang/no-NO.rc +++ b/base/applications/cmdutils/xcopy/lang/no-NO.rc @@ -49,6 +49,7 @@ Where:\n\ [/C] Fortsett selv om det oppstår feil under kopieringen\n\ [/A] Ikke kopier filer som er markert som arkiv\n\ [/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\ \t\tden oppgitte datoen.\n\ \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ diff --git a/base/applications/cmdutils/xcopy/lang/pl-PL.rc b/base/applications/cmdutils/xcopy/lang/pl-PL.rc index aec972924f..f6f30597b4 100644 --- a/base/applications/cmdutils/xcopy/lang/pl-PL.rc +++ b/base/applications/cmdutils/xcopy/lang/pl-PL.rc @@ -49,6 +49,7 @@ Gdzie:\n\ [/C] Kontynuuje nawet jeżeli podczas kopiowania wystąpiły błędy\n\ [/A] Kopiuje tylko pliki z atrybutem archiwalny\n\ [/M] Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\ \t\tJeżeli nie podano żadnej daty, to kopiowane są pliki, które są\n\ \t\tnowsze niż w katalogu docelowym\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/pt-BR.rc b/base/applications/cmdutils/xcopy/lang/pt-BR.rc index e02e0f35cb..3ed93b06c9 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-BR.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-BR.rc @@ -50,6 +50,7 @@ Onde:\n\ [/A] Copiar apenas arquivos com atributo de arquivo\n\ [/M] Copiar apenas arquivos com atributo de arquivo, removendo\n\ \to atributo de arquivo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copiar novos arquivos ou os alterados após a data fornecida\n\ \t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ \t\tfor mais antigo que a fonte\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/pt-PT.rc b/base/applications/cmdutils/xcopy/lang/pt-PT.rc index 4a47ee2a8b..db3fd7eb9a 100644 --- a/base/applications/cmdutils/xcopy/lang/pt-PT.rc +++ b/base/applications/cmdutils/xcopy/lang/pt-PT.rc @@ -50,6 +50,7 @@ Onde:\n\ [/A] Copiar apenas ficheiros com atributo de arquivo\n\ [/M] Copiar apenas ficheiros com atributo de arquivo, removendo\n\ \to atributo de arquivo\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copiar novos ficheiros ou os alterados após a data fornecida\n\ \t\tSe nenhuma data for fornecida, apenas copiar se o destino\n\ \t\tfor mais antigo que a fonte\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/ro-RO.rc b/base/applications/cmdutils/xcopy/lang/ro-RO.rc index 5dfe61d061..777e09f385 100644 --- a/base/applications/cmdutils/xcopy/lang/ro-RO.rc +++ b/base/applications/cmdutils/xcopy/lang/ro-RO.rc @@ -49,6 +49,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] Copiază numai fișierele cu atributul de arhivă activat.\n\ [/M] Copiază numai fișierele cu atributul de arhivă activat, dezactivează\n\ \tapoi atributul.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Copiază fișierele noi sau pe cele modificate după data\n\ \t\tspecificată. Dacă nu este specificată nici o dată, copiază\n\ \t\tnumai dacă fișierul destinație este mai vechi decât fișierul\n\ diff --git a/base/applications/cmdutils/xcopy/lang/ru-RU.rc b/base/applications/cmdutils/xcopy/lang/ru-RU.rc index 9e18b8a49c..72e5965135 100644 --- a/base/applications/cmdutils/xcopy/lang/ru-RU.rc +++ b/base/applications/cmdutils/xcopy/lang/ru-RU.rc @@ -52,6 +52,7 @@ XCOPY источник [целевой_объект] [/I] [/S] [/Q] [/F] [/L] [/ /A Копирует только те файлы, для которых установлен атрибут ""архивный"".\n\ /M Копирует только те файлы, для которых установлен атрибут ""архивный"",\n\ при этом атрибут удаляется.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ /D | /D:m-d-y Копирование файлов, измененных не ранее указанной даты.\n\ Если дата не указана, заменяются только конечные файлы,\n\ более старые, чем исходные.\n" diff --git a/base/applications/cmdutils/xcopy/lang/sl-SI.rc b/base/applications/cmdutils/xcopy/lang/sl-SI.rc index 4673100b28..4759f1d6bf 100644 --- a/base/applications/cmdutils/xcopy/lang/sl-SI.rc +++ b/base/applications/cmdutils/xcopy/lang/sl-SI.rc @@ -50,6 +50,7 @@ Where:\n\ [/A] Kopiraj samo datoteke, ki imajo atribut arhiva\n\ [/M] Kopiraj samo datoteke, ki imajo atribut arhiva ter odstrani atribut\n\ \tarhiva\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopiraj datoteke, ustvarjene ali spremenjene po navedenem datumu.\n\ \t\tČe datum ni podan, gre za kopiranje datotek, katerih obstoječi cilj je\n\ \t\tod izvora\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/sq-AL.rc b/base/applications/cmdutils/xcopy/lang/sq-AL.rc index 57bef2bf69..ce020c199d 100644 --- a/base/applications/cmdutils/xcopy/lang/sq-AL.rc +++ b/base/applications/cmdutils/xcopy/lang/sq-AL.rc @@ -54,6 +54,7 @@ Where:\n\ [/A] Kopjo vetëm dokumenta me arkiva me atribjute te përcaktuar\n\ [/M] Kopjo vetëm dokumente me arkiva dhe atribjute te caktuar, hiqnt\n\ \tarkivat te atribuara\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopjo dokumentët e ri ose modifiko ato pas datës së furnizuar.\n\ \t\tNëse asnjë datë është paraqitur, vetëm kopjoni nëse destinacioni është i vjetër\n\ \t\tse burimi\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/sr-SP.rc b/base/applications/cmdutils/xcopy/lang/sr-SP.rc index e8116bf588..0ba72eedc9 100644 --- a/base/applications/cmdutils/xcopy/lang/sr-SP.rc +++ b/base/applications/cmdutils/xcopy/lang/sr-SP.rc @@ -50,6 +50,7 @@ XCOPY извор [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] Умножи само архивиране датотеке\n\ [/M] Умножи само архивиране датотеке и уклони\n\ \tособине архиве\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Умножи нове или измењене датотеке након одређеног датума.\n\ \t\tАко датум није унесен, умножи само ако је одредиште старије\n\ \t\tод извора\n\n" @@ -108,6 +109,7 @@ Gde:\n\ [/A] Umnoži samo arhivirane datoteke\n\ [/M] Umnoži samo arhivirane datoteke i ukloni\n\ \tosobine arhive\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Umnoži nove ili izmenjene datoteke nakon određenog datuma.\n\ \t\tAko datum nije unesen, umnoži samo ako je odredište starije\n\ \t\tod izvora\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/sv-SE.rc b/base/applications/cmdutils/xcopy/lang/sv-SE.rc index ee929d52cd..015a6a0a6f 100644 --- a/base/applications/cmdutils/xcopy/lang/sv-SE.rc +++ b/base/applications/cmdutils/xcopy/lang/sv-SE.rc @@ -48,6 +48,7 @@ Där:\n\ [/A] Kopiera enbart filer markerade som arkiv\n\ [/M] Kopiera enbart filer markerade som arkiv, ta bort\n\ markeringen\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Kopiera nya filer eller de ändrade efter angivet datum.\n\ \t\tOm inget datum angivits utförs endast kopiering om målet är\n\ \t\täldre än källan\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/tr-TR.rc b/base/applications/cmdutils/xcopy/lang/tr-TR.rc index 132e9d8751..2f5be379b6 100644 --- a/base/applications/cmdutils/xcopy/lang/tr-TR.rc +++ b/base/applications/cmdutils/xcopy/lang/tr-TR.rc @@ -52,6 +52,7 @@ Nereye:\n\ [/A] Yalnızca belgelik öz niteliği ayarlı kütükleri çoğalt.\n\ [/M] Yalnızca belgelik öz niteliği ayarlı kütükleri çoğalt,\n\ \tbelgelik öz niteliğini siler.\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Yeni kütükleri veyâ onların verilen târihten sonra değiştirilmişlerini çoğalt.\n\ \t\tBir târih verilmemişse yalnızca varış kaynaktan eskiyse çoğalt.\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/uk-UA.rc b/base/applications/cmdutils/xcopy/lang/uk-UA.rc index 22403e4416..fed492272d 100644 --- a/base/applications/cmdutils/xcopy/lang/uk-UA.rc +++ b/base/applications/cmdutils/xcopy/lang/uk-UA.rc @@ -49,6 +49,7 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] Копіює лише файли з властивістю АРХІВНИЙ\n\ [/M] Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\ \tвластивість АРХІВНИЙ\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної\n\ дати. Якщо дата не вказана, копіює лише ті файли, які новіші\n\ в початковій папці\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/zh-CN.rc b/base/applications/cmdutils/xcopy/lang/zh-CN.rc index a3c4d702f6..e779337165 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-CN.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-CN.rc @@ -52,6 +52,7 @@ XCOPY 源 [目标] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] 仅复制具有存档属性设置的文件。\n\ [/M] 仅复制具有存档属性设置的文件，并删除\n\ \t存档属性。\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] 复制指定日期后的新文件或新修改的文件。\n\ \t\t如果指定没有日期，则只复制目标中比源中旧的文件。\n\n" diff --git a/base/applications/cmdutils/xcopy/lang/zh-TW.rc b/base/applications/cmdutils/xcopy/lang/zh-TW.rc index f86f6692b9..c7f44937ed 100644 --- a/base/applications/cmdutils/xcopy/lang/zh-TW.rc +++ b/base/applications/cmdutils/xcopy/lang/zh-TW.rc @@ -52,6 +52,7 @@ XCOPY 源 [目標] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ [/A] 僅複製具有存檔屬性設定的檔案。\n\ [/M] 僅複製檔案的存檔屬性設定，刪除\n\ \t存檔屬性。\n\ +[/K] Copy file attributes, without this attributes are not preserved.\n\ [/D | /D:m-d-y] 複製新檔案或那些修改後所提供的日期。\n\ \t\t如果提供沒有日期，則只複製如果目的地\n\ \t\t比源。\n\n" diff --git a/base/applications/cmdutils/xcopy/xcopy.c b/base/applications/cmdutils/xcopy/xcopy.c index a173cc14c7..eb8c3f04ef 100644 --- a/base/applications/cmdutils/xcopy/xcopy.c +++ b/base/applications/cmdutils/xcopy/xcopy.c @@ -31,12 +31,14 @@ /* * Notes: - * Apparently, valid return codes are: + * Documented valid return codes are: * 0 - OK - * 1 - No files found to copy + * 1 - No files found to copy (*1) * 2 - CTRL+C during copy * 4 - Initialization error, or invalid source specification * 5 - Disk write error + * + * (*1) Testing shows return code 1 is never returned */ @@ -82,7 +84,7 @@ static WCHAR *XCOPY_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); lstrcpyW(msg, failedMsg); } @@ -267,7 +269,7 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { } /* Process line by line */ - while (fgetws(buffer, sizeof(buffer)/sizeof(WCHAR), inFile) != NULL) { + while (fgetws(buffer, ARRAY_SIZE(buffer), inFile) != NULL) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); @@ -568,15 +570,25 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, ret = RC_WRITEERROR; goto cleanup; } - } + } else { - /* If /M supplied, remove the archive bit after successful copy */ - if (!skipFile) { - if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && - (flags & OPT_REMOVEARCH)) { - SetFileAttributesW(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); + if (!skipFile) { + /* If keeping attributes, update the destination attributes + otherwise remove the read only attribute */ + if (flags & OPT_KEEPATTRS) { + SetFileAttributesW(copyTo, srcAttribs | FILE_ATTRIBUTE_ARCHIVE); + } else { + SetFileAttributesW(copyTo, + (GetFileAttributesW(copyTo) & ~FILE_ATTRIBUTE_READONLY)); + } + + /* If /M supplied, remove the archive bit after successful copy */ + if ((srcAttribs & FILE_ATTRIBUTE_ARCHIVE) && + (flags & OPT_REMOVEARCH)) { + SetFileAttributesW(copyFrom, (srcAttribs & ~FILE_ATTRIBUTE_ARCHIVE)); + } + filesCopied++; } - filesCopied++; } } } @@ -588,6 +600,13 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, /* Search 2 - do subdirs */ if (flags & OPT_RECURSIVE) { + + /* If /E is supplied, create the directory now */ + if ((flags & OPT_EMPTYDIR) && + !(flags & OPT_SIMULATE)) { + XCOPY_CreateDirectory(deststem); + } + lstrcpyW(inputpath, srcstem); lstrcatW(inputpath, wchr_star); findres = TRUE; @@ -611,12 +630,6 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, lstrcpyW(outputpath, deststem); if (*destspec == 0x00) { lstrcatW(outputpath, finddata->cFileName); - - /* If /E is supplied, create the directory now */ - if ((flags & OPT_EMPTYDIR) && - !(flags & OPT_SIMULATE)) - XCOPY_CreateDirectory(outputpath); - lstrcatW(outputpath, wchr_slash); } @@ -743,101 +756,134 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, Note: Windows docs say /P prompts when dest is created but tests show it is done for each src file regardless of the destination */ - switch (toupper(word[1])) { - case 'I': flags |= OPT_ASSUMEDIR; break; - case 'S': flags |= OPT_RECURSIVE; break; - case 'Q': flags |= OPT_QUIET; break; - case 'F': flags |= OPT_FULL; break; - case 'L': flags |= OPT_SIMULATE; break; - case 'W': flags |= OPT_PAUSE; break; - case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; - case 'Y': flags |= OPT_NOPROMPT; break; - case 'N': flags |= OPT_SHORTNAME; break; - case 'U': flags |= OPT_MUSTEXIST; break; - case 'R': flags |= OPT_REPLACEREAD; break; - case 'H': flags |= OPT_COPYHIDSYS; break; - case 'C': flags |= OPT_IGNOREERRORS; break; - case 'P': flags |= OPT_SRCPROMPT; break; - case 'A': flags |= OPT_ARCHIVEONLY; break; - case 'M': flags |= OPT_ARCHIVEONLY | - OPT_REMOVEARCH; break; - - /* E can be /E or /EXCLUDE */ - case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - &word[1], 8, - EXCLUDE, -1) == CSTR_EQUAL) { - if (XCOPY_ProcessExcludeList(&word[9])) { - XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - goto out; - } else flags |= OPT_EXCLUDELIST; - } else flags |= OPT_EMPTYDIR | OPT_RECURSIVE; - break; - - /* D can be /D or /D: */ - case 'D': if (word[2]==':' && is_digit(word[3])) { - SYSTEMTIME st; - WCHAR *pos = &word[3]; - BOOL isError = FALSE; - memset(&st, 0x00, sizeof(st)); - - /* Microsoft xcopy's usage message implies that the date - * format depends on the locale, but that is false. - * It is hardcoded to month-day-year. - */ - st.wMonth = _wtol(pos); - while (*pos && is_digit(*pos)) pos++; - if (*pos++ != '-') isError = TRUE; - - if (!isError) { - st.wDay = _wtol(pos); - while (*pos && is_digit(*pos)) pos++; - if (*pos++ != '-') isError = TRUE; - } + int skip=0; + WCHAR *rest; + + while (word[0]) { + rest = NULL; + + switch (toupper(word[1])) { + case 'I': flags |= OPT_ASSUMEDIR; break; + case 'S': flags |= OPT_RECURSIVE; break; + case 'Q': flags |= OPT_QUIET; break; + case 'F': flags |= OPT_FULL; break; + case 'L': flags |= OPT_SIMULATE; break; + case 'W': flags |= OPT_PAUSE; break; + case 'T': flags |= OPT_NOCOPY | OPT_RECURSIVE; break; + case 'Y': flags |= OPT_NOPROMPT; break; + case 'N': flags |= OPT_SHORTNAME; break; + case 'U': flags |= OPT_MUSTEXIST; break; + case 'R': flags |= OPT_REPLACEREAD; break; + case 'K': flags |= OPT_KEEPATTRS; break; + case 'H': flags |= OPT_COPYHIDSYS; break; + case 'C': flags |= OPT_IGNOREERRORS; break; + case 'P': flags |= OPT_SRCPROMPT; break; + case 'A': flags |= OPT_ARCHIVEONLY; break; + case 'M': flags |= OPT_ARCHIVEONLY | + OPT_REMOVEARCH; break; + + /* E can be /E or /EXCLUDE */ + case 'E': if (CompareStringW(LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + &word[1], 8, + EXCLUDE, -1) == CSTR_EQUAL) { + if (XCOPY_ProcessExcludeList(&word[9])) { + XCOPY_FailMessage(ERROR_INVALID_PARAMETER); + goto out; + } else { + flags |= OPT_EXCLUDELIST; - if (!isError) { - st.wYear = _wtol(pos); - while (*pos && is_digit(*pos)) pos++; - if (st.wYear < 100) st.wYear+=2000; + /* Do not support concatenated switches onto exclude lists yet */ + rest = end; + } + } else { + flags |= OPT_EMPTYDIR | OPT_RECURSIVE; } + break; - if (!isError && SystemTimeToFileTime(&st, &dateRange)) { + /* D can be /D or /D: */ + case 'D': if (word[2]==':' && is_digit(word[3])) { SYSTEMTIME st; - WCHAR datestring[32], timestring[32]; - - flags |= OPT_DATERANGE; - - /* Debug info: */ - FileTimeToSystemTime (&dateRange, &st); - GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, - sizeof(datestring)/sizeof(WCHAR)); - GetTimeFormatW(0, TIME_NOSECONDS, &st, - NULL, timestring, sizeof(timestring)/sizeof(WCHAR)); + WCHAR *pos = &word[3]; + BOOL isError = FALSE; + memset(&st, 0x00, sizeof(st)); + + /* Microsoft xcopy's usage message implies that the date + * format depends on the locale, but that is false. + * It is hardcoded to month-day-year. + */ + st.wMonth = _wtol(pos); + while (*pos && is_digit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; - WINE_TRACE("Date being used is: %s %s\n", - wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); + if (!isError) { + st.wDay = _wtol(pos); + while (*pos && is_digit(*pos)) pos++; + if (*pos++ != '-') isError = TRUE; + } + + if (!isError) { + st.wYear = _wtol(pos); + while (*pos && is_digit(*pos)) pos++; + if (st.wYear < 100) st.wYear+=2000; + } + + /* Handle switches straight after the supplied date */ + rest = pos; + + if (!isError && SystemTimeToFileTime(&st, &dateRange)) { + SYSTEMTIME st; + WCHAR datestring[32], timestring[32]; + + flags |= OPT_DATERANGE; + + /* Debug info: */ + FileTimeToSystemTime (&dateRange, &st); + GetDateFormatW(0, DATE_SHORTDATE, &st, NULL, datestring, + ARRAY_SIZE(datestring)); + GetTimeFormatW(0, TIME_NOSECONDS, &st, + NULL, timestring, ARRAY_SIZE(timestring)); + + WINE_TRACE("Date being used is: %s %s\n", + wine_dbgstr_w(datestring), wine_dbgstr_w(timestring)); + } else { + XCOPY_FailMessage(ERROR_INVALID_PARAMETER); + goto out; + } } else { - XCOPY_FailMessage(ERROR_INVALID_PARAMETER); - goto out; + flags |= OPT_DATENEWER; } - } else { - flags |= OPT_DATENEWER; - } - break; - - case '-': if (toupper(word[2])=='Y') - flags &= ~OPT_NOPROMPT; - break; - case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); - rc = RC_HELP; - goto out; - case 'V': - WINE_FIXME("ignoring /V\n"); - break; - default: - WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); - XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word); - goto out; + break; + + case '-': if (toupper(word[2])=='Y') { + flags &= ~OPT_NOPROMPT; + rest = &word[3]; /* Skip over 3 characters */ + } + break; + case '?': XCOPY_wprintf(XCOPY_LoadMessage(STRING_HELP)); + rc = RC_HELP; + goto out; + case 'V': + WINE_FIXME("ignoring /V\n"); + break; + default: + WINE_TRACE("Unhandled parameter '%s'\n", wine_dbgstr_w(word)); + XCOPY_wprintf(XCOPY_LoadMessage(STRING_INVPARM), word); + goto out; + } + + /* Unless overridden above, skip over the '/' and the first character */ + if (rest == NULL) rest = &word[2]; + + /* By now, rest should point either to the null after the + switch, or the beginning of the next switch if there + was no whitespace between them */ + if (!skip && *rest && *rest != '/') { + WINE_FIXME("Unexpected characters found and ignored '%s'\n", wine_dbgstr_w(rest)); + skip=1; + } else { + word = rest; + } } } word = next; @@ -941,7 +987,7 @@ static int XCOPY_ProcessSourceParm(WCHAR *suppliedsource, WCHAR *stem, lstrcpyW(spec, suppliedsource+2); } else { WCHAR curdir[MAXSTRING]; - GetCurrentDirectoryW(sizeof(curdir)/sizeof(WCHAR), curdir); + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); stem[0] = curdir[0]; stem[1] = curdir[1]; stem[2] = 0x00; @@ -1133,7 +1179,6 @@ int wmain (int argc, WCHAR *argvW[]) } else if (!(flags & OPT_NOCOPY)) { XCOPY_wprintf(XCOPY_LoadMessage(STRING_COPY), filesCopied); } - if (rc == RC_OK && filesCopied == 0) rc = RC_NOFILES; return rc; } diff --git a/base/applications/cmdutils/xcopy/xcopy.h b/base/applications/cmdutils/xcopy/xcopy.h index d18f52ca66..8e41bb7ae4 100644 --- a/base/applications/cmdutils/xcopy/xcopy.h +++ b/base/applications/cmdutils/xcopy/xcopy.h @@ -50,6 +50,7 @@ #define OPT_EXCLUDELIST 0x00020000 #define OPT_DATERANGE 0x00040000 #define OPT_DATENEWER 0x00080000 +#define OPT_KEEPATTRS 0x00100000 #define MAXSTRING 8192 diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 487a21882a..3cc9cffedf 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -232,7 +232,7 @@ reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.17 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-3.3 reactos/base/applications/iexplore # Synced to WineStaging-3.3

6 years, 2 months

01/01: [WMIC] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a217e3a6fc26be54ea2d… commit 5a217e3a6fc26be54ea2dc087cf293be1f87ac10 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:15:34 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:15:34 2018 +0100 [WMIC] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/wmic/CMakeLists.txt | 1 + base/applications/cmdutils/wmic/main.c | 6 +++--- media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/base/applications/cmdutils/wmic/CMakeLists.txt b/base/applications/cmdutils/wmic/CMakeLists.txt index 8da30f4ec1..0add8850c2 100644 --- a/base/applications/cmdutils/wmic/CMakeLists.txt +++ b/base/applications/cmdutils/wmic/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-D__WINESRC__) add_executable(wmic main.c wmic.rc) target_link_libraries(wmic wine) set_module_type(wmic win32cui UNICODE) diff --git a/base/applications/cmdutils/wmic/main.c b/base/applications/cmdutils/wmic/main.c index ddd2aecd53..f4a5bc74f1 100644 --- a/base/applications/cmdutils/wmic/main.c +++ b/base/applications/cmdutils/wmic/main.c @@ -82,7 +82,7 @@ static const WCHAR *find_class( const WCHAR *alias ) { unsigned int i; - for (i = 0; i < sizeof(alias_map)/sizeof(alias_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(alias_map); i++) { if (!strcmpiW( alias, alias_map[i].alias )) return alias_map[i].class; } @@ -158,7 +158,7 @@ static int output_message( int msg ) static const WCHAR fmtW[] = {'%','s',0}; WCHAR buffer[8192]; - LoadStringW( GetModuleHandleW(NULL), msg, buffer, sizeof(buffer)/sizeof(WCHAR) ); + LoadStringW( GetModuleHandleW(NULL), msg, buffer, ARRAY_SIZE(buffer)); return output_string( fmtW, buffer ); } @@ -193,7 +193,7 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = strlenW( class ) + sizeof(select_allW) / sizeof(select_allW[0]); + len = strlenW( class ) + ARRAY_SIZE(select_allW); if (!(query = SysAllocStringLen( NULL, len ))) goto done; strcpyW( query, select_allW ); strcatW( query, class ); diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d5c5983ad4..487a21882a 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -230,7 +230,7 @@ reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3 reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources.

6 years, 2 months

01/01: [TASKKILL] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb0f46bddf30b568b3123… commit cb0f46bddf30b568b3123e405c12d40b91d5f663 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:14:52 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:14:52 2018 +0100 [TASKKILL] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/taskkill/CMakeLists.txt | 1 + base/applications/cmdutils/taskkill/taskkill.c | 8 +++----- media/doc/README.WINE | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/base/applications/cmdutils/taskkill/CMakeLists.txt b/base/applications/cmdutils/taskkill/CMakeLists.txt index 4b5e3498c8..5006fb3b6f 100644 --- a/base/applications/cmdutils/taskkill/CMakeLists.txt +++ b/base/applications/cmdutils/taskkill/CMakeLists.txt @@ -1,4 +1,5 @@ +add_definitions(-D__WINESRC__) add_executable(taskkill taskkill.c taskkill.rc) target_link_libraries(taskkill wine) set_module_type(taskkill win32cui UNICODE) diff --git a/base/applications/cmdutils/taskkill/taskkill.c b/base/applications/cmdutils/taskkill/taskkill.c index 6e4e1eb55a..59ce98dc6d 100644 --- a/base/applications/cmdutils/taskkill/taskkill.c +++ b/base/applications/cmdutils/taskkill/taskkill.c @@ -47,7 +47,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args) WCHAR msg_buffer[8192]; wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, - sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args); + ARRAY_SIZE(msg_buffer), &va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -92,8 +92,7 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) WCHAR msg_buffer[8192]; int len; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); __ms_va_start(va_args, msg); len = taskkill_vprintfW(msg_buffer, va_args); @@ -107,8 +106,7 @@ static int taskkill_message(int msg) static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); return taskkill_printfW(formatW, msg_buffer); } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 518cef18c2..d5c5983ad4 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -229,7 +229,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-3.3

6 years, 2 months

01/01: [REG] Sync with Wine Staging 3.17. CORE-15127

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5260a37425b39a1b6eb8d… commit 5260a37425b39a1b6eb8dbeab9774d15be259dbc Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 1 00:13:56 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Oct 1 00:13:56 2018 +0100 [REG] Sync with Wine Staging 3.17. CORE-15127 --- base/applications/cmdutils/reg/CMakeLists.txt | 1 + base/applications/cmdutils/reg/reg.h | 1 - media/doc/README.WINE | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt index 53d1fa4c2f..ef04aaf9df 100644 --- a/base/applications/cmdutils/reg/CMakeLists.txt +++ b/base/applications/cmdutils/reg/CMakeLists.txt @@ -2,6 +2,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) add_executable(reg export.c import.c reg.c reg.rc) set_module_type(reg win32cui UNICODE) target_link_libraries(reg wine) diff --git a/base/applications/cmdutils/reg/reg.h b/base/applications/cmdutils/reg/reg.h index dbce738ecd..a27399d06a 100644 --- a/base/applications/cmdutils/reg/reg.h +++ b/base/applications/cmdutils/reg/reg.h @@ -21,7 +21,6 @@ #include "resource.h" -#define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) #define MAX_SUBKEY_LEN 257 /* reg.c */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 63027239d4..518cef18c2 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -227,7 +227,7 @@ reactos/win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (kno ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-3.17 -reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.9 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-3.17 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-3.3 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-3.3

6 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2018