Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[akhaldi] 73936: [DPLAYX] Sync with Wine Staging 2.2. CORE-12823 7603e85 dplayx: Don't print an error when no Lobby Providers are found. 7ae50b2 dplayx: Fix multiple assigments to the same lvalue (...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:41:39 2017 New Revision: 73936 URL: http://svn.reactos.org/svn/reactos?rev=73936&view=rev Log: [DPLAYX] Sync with Wine Staging 2.2. CORE-12823 7603e85 dplayx: Don't print an error when no Lobby Providers are found. 7ae50b2 dplayx: Fix multiple assigments to the same lvalue (coccinellery). Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Sun Feb 26 16:41:39 2017 @@ -4355,8 +4355,7 @@ if( RegOpenKeyExA( HKEY_LOCAL_MACHINE, searchSubKey, 0, KEY_READ, &hkResult ) != ERROR_SUCCESS ) { - /* Hmmm. Does this mean that there are no service providers? */ - ERR(": no service providers?\n"); + TRACE("No Lobby Providers have been registered.\n"); return DP_OK; } Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] Sun Feb 26 16:41:39 2017 @@ -287,10 +287,10 @@ lpMsgBody->dpidAppServer2 = dpidServer; lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x20; - lpMsgBody->unknown3[0] = 0x0; - lpMsgBody->unknown3[0] = 0x0; + lpMsgBody->unknown3[1] = 0x0; + lpMsgBody->unknown3[2] = 0x20; + lpMsgBody->unknown3[3] = 0x0; + lpMsgBody->unknown3[4] = 0x0; lpMsgBody->dpidAppServer3 = dpidServer; lpMsgBody->unknown4[0] = 0x30; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 16:41:39 2017 @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.2 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23

7 years, 10 months

[akhaldi] 73935: [DINPUT_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:37:17 2017 New Revision: 73935 URL: http://svn.reactos.org/svn/reactos?rev=73935&view=rev Log: [DINPUT_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/dinput/joystick.c Modified: trunk/rostests/winetests/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/joystick… ============================================================================== --- trunk/rostests/winetests/dinput/joystick.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/joystick.c [iso-8859-1] Sun Feb 26 16:37:17 2017 @@ -744,6 +744,46 @@ ok(hr==DI_OK, "IDirectInputDevice_GetProperty() failed: %08x\n", hr); ok(dip_gain_get.dwData==dip_gain_set.dwData, "Gain not updated: %i\n", dip_gain_get.dwData); + /* Test SendForceFeedbackCommand + * DISFFC_STOPALL - Should stop effects only + * DISFFC_RESET - Should stop effects and unload them (NOT release them) + * Tests for game Odallus (bug 41623) */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, 0); + ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, 0xFF); + ok(hr==DIERR_INVALIDPARAM, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + + /* Send STOPALL and prove that the effect can still be started */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, DISFFC_STOPALL); + ok(hr==DI_OK, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&effect_data.guid, &guid), "Wrong guid returned\n"); + + /* Send RESET and prove that we can still manipulate the effect, thus not released */ + hr = IDirectInputDevice2_SendForceFeedbackCommand((IDirectInputDevice2A*)pJoystick, DISFFC_RESET); + ok(hr==DI_OK, "IDirectInputDevice_SendForceFeedbackCommand() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DIERR_NOTDOWNLOADED,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + hr = IDirectInputEffect_Download(effect); + ok(hr==DI_OK,"IDirectInputEffect_Download() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); + ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n"); + hr = IDirectInputEffect_Start(effect, 1, 0); + ok(hr==DI_OK,"IDirectInputEffect_Start() failed: %08x\n", hr); + hr = IDirectInputEffect_GetEffectGuid(effect, &guid); + ok(hr==DI_OK,"IDirectInputEffect_GetEffectGuid() failed: %08x\n", hr); + ok(IsEqualGUID(&effect_data.guid, &guid), "Wrong guid returned\n"); + ref = IUnknown_Release(effect); ok(ref == 0, "IDirectInputDevice_Release() reference count = %d\n", ref); }

7 years, 10 months

[akhaldi] 73934: [DINPUT] Sync with Wine Staging 2.2. CORE-12823 f921b63 dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. f9b4be5 dinput: Allocate correct amount of memory ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:36:28 2017 New Revision: 73934 URL: http://svn.reactos.org/svn/reactos?rev=73934&view=rev Log: [DINPUT] Sync with Wine Staging 2.2. CORE-12823 f921b63 dinput: Do not wait for hook thread startup in IDirectInput8::Initialize. f9b4be5 dinput: Allocate correct amount of memory in IDirectInput8AImpl_EnumDevicesBySemantics. 04bddb6 dinput: Give correct count of devices still to be enumerated. 8339de0 dinput: Simplify JoystickWImpl_Unacquire for Linux. 27f4568 dinput: DISFFC_RESET will not release the effects. 2d2d833 dinput: Downgrade a FIXME to WARN in JoystickWImpl_SendForceFeedbackCommand. cc37322 dinput: Fix GetEffectStatus for Linux when effect was not downloaded. 6bb2c4c dinput: Skip events that are not useful currently. 49d4261 dinput: Spelling and case fixes in comments. Modified: trunk/reactos/dll/directx/wine/dinput/dinput.rc trunk/reactos/dll/directx/wine/dinput/dinput_main.c trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/dinput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput.rc [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -32,6 +32,8 @@ #include <wine/wine_common_ver.rc> +#pragma makedep po + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -911,7 +911,9 @@ LPDIRECTINPUTDEVICE8A lpdid; DWORD callbackFlags; int i, j; - + int device_count = 0; + int remain; + DIDEVICEINSTANCEA *didevis = 0; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -939,18 +941,36 @@ { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess == S_OK) { - IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); - - if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) - return DI_OK; + if (device_count++) + didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEA)*device_count); + else + didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEA)*device_count); + didevis[device_count-1] = didevi; } } } + + remain = device_count; + if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) + remain += sizeof(guids)/sizeof(guids[0]); + + for (i = 0; i < device_count; i++) + { + callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); + IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL); + + if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + HeapFree(GetProcessHeap(), 0, didevis); + return DI_OK; + } + } + + HeapFree(GetProcessHeap(), 0, didevis); if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; @@ -982,6 +1002,9 @@ LPDIRECTINPUTDEVICE8W lpdid; DWORD callbackFlags; int i, j; + int device_count = 0; + int remain; + DIDEVICEINSTANCEW *didevis = 0; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); @@ -999,18 +1022,36 @@ { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess == S_OK) { - IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); - - if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) - return DI_OK; + if (device_count++) + didevis = HeapReAlloc(GetProcessHeap(), 0, didevis, sizeof(DIDEVICEINSTANCEW)*device_count); + else + didevis = HeapAlloc(GetProcessHeap(), 0, sizeof(DIDEVICEINSTANCEW)*device_count); + didevis[device_count-1] = didevi; } } } + + remain = device_count; + if (!(dwFlags & DIEDBSFL_FORCEFEEDBACK)) + remain += sizeof(guids)/sizeof(guids[0]); + + for (i = 0; i < device_count; i++) + { + callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); + IDirectInput_CreateDevice(iface, &didevis[i].guidInstance, &lpdid, NULL); + + if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) + { + HeapFree(GetProcessHeap(), 0, didevis); + return DI_OK; + } + } + + HeapFree(GetProcessHeap(), 0, didevis); if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; Modified: trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/ef… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/effect_linuxinput.c [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -234,10 +234,15 @@ LPDIRECTINPUTEFFECT iface, LPDWORD pdwFlags) { - TRACE("(this=%p,%p)\n", iface, pdwFlags); + LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); + + TRACE("(this=%p,%p)\n", This, pdwFlags); if (!pdwFlags) return E_POINTER; + + if (This->effect.id == -1) + return DIERR_NOTDOWNLOADED; /* linux sends the effect status through an event. * that event is trapped by our parent joystick driver @@ -633,9 +638,9 @@ This->effect.u.periodic.magnitude = (tsp->dwMagnitude / 10) * 32; This->effect.u.periodic.offset = (tsp->lOffset / 10) * 32; - /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on linux */ + /* phase ranges from 0 - 35999 in dinput and 0 - 65535 on Linux */ This->effect.u.periodic.phase = (tsp->dwPhase / 36) * 65; - /* dinput uses microseconds, linux uses miliseconds */ + /* dinput uses microseconds, Linux uses milliseconds */ if (tsp->dwPeriod <= 1000) This->effect.u.periodic.period = 1; else Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -69,6 +69,8 @@ HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info); HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info); +static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags); + typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; static const IDirectInputDevice8WVtbl JoystickWvt; @@ -726,18 +728,10 @@ TRACE("(this=%p)\n",This); res = IDirectInputDevice2WImpl_Unacquire(iface); if (res==DI_OK && This->joyfd!=-1) { - effect_list_item *itr; struct input_event event; - /* For each known effect: - * - stop it - * - unload it - * But, unlike DISFFC_RESET, do not release the effect. - */ - LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) { - IDirectInputEffect_Stop(itr->ref); - IDirectInputEffect_Unload(itr->ref); - } + /* Stop and unload all effects */ + JoystickWImpl_SendForceFeedbackCommand(iface, DISFFC_RESET); /* Enable autocenter. */ event.type = EV_FF; @@ -883,7 +877,7 @@ break; #endif default: - FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); + TRACE("skipping event\n"); break; } if (inst_id >= 0) @@ -1312,9 +1306,9 @@ { case DISFFC_STOPALL: { - /* Stop all effects */ effect_list_item *itr; + /* Stop all effects */ LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) IDirectInputEffect_Stop(itr->ref); break; @@ -1322,17 +1316,19 @@ case DISFFC_RESET: { - effect_list_item *itr, *ptr; - - /* Stop, unload, release and free all effects */ - /* This returns the device to its "bare" state */ - LIST_FOR_EACH_ENTRY_SAFE(itr, ptr, &This->ff_effects, effect_list_item, entry) - IDirectInputEffect_Release(itr->ref); + effect_list_item *itr; + + /* Stop and unload all effects. It is not true that effects are released */ + LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) + { + IDirectInputEffect_Stop(itr->ref); + IDirectInputEffect_Unload(itr->ref); + } break; } case DISFFC_PAUSE: case DISFFC_CONTINUE: - FIXME("No support for Pause or Continue in linux\n"); + FIXME("No support for Pause or Continue in linux\n"); break; case DISFFC_SETACTUATORSOFF: @@ -1341,8 +1337,8 @@ break; default: - FIXME("Unknown Force Feedback Command!\n"); - return DIERR_INVALIDPARAM; + WARN("Unknown Force Feedback Command %u!\n", dwFlags); + return DIERR_INVALIDPARAM; } return DI_OK; #else Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 16:36:28 2017 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dinput # Synced to WineStaging-2.2 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.9.23 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23

7 years, 10 months

[akhaldi] 73933: [WMIC] Sync with Wine Staging 2.2. Dedicated to Hermès. CORE-12823 b21f4d0 wmic: Improve cmd line parser and add support for path command.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:29:54 2017 New Revision: 73933 URL: http://svn.reactos.org/svn/reactos?rev=73933&view=rev Log: [WMIC] Sync with Wine Staging 2.2. Dedicated to Hermès. CORE-12823 b21f4d0 wmic: Improve cmd line parser and add support for path command. Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc trunk/reactos/base/applications/cmdutils/wmic/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -5,5 +5,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Fehler: Befehlszeile nicht unterstÃ¼tzt\n" STRING_ALIAS_NOT_FOUND, "Fehler: Alias nicht gefunden\n" STRING_INVALID_QUERY, "Fehler: UngÃ¼ltige Abfrage\n" - STRING_INVALID_PATH, "Invalid syntax for PATH\n" + STRING_INVALID_PATH, "Error: Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/en-US.rc [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -5,5 +5,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Error: Command line not supported\n" STRING_ALIAS_NOT_FOUND, "Error: Alias not found\n" STRING_INVALID_QUERY, "Error: Invalid query\n" - STRING_INVALID_PATH, "Invalid syntax for PATH\n" + STRING_INVALID_PATH, "Error: Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -7,5 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Eroare: ComandÄ nerecunoscutÄ.\n" STRING_ALIAS_NOT_FOUND, "Eroare: Alias necunoscut.\n" STRING_INVALID_QUERY, "Eroare: Cerere nevalidÄ.\n" - STRING_INVALID_PATH, "ConÈinutul din Â«PATHÂ» este sintactic nevalid.\n" + STRING_INVALID_PATH, "Eroare: ConÈinutul din Â«PATHÂ» este sintactic nevalid.\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -5,5 +5,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ ÑÑÑÐ¾ÐºÐ° Ð½Ðµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑÑÑ\n" STRING_ALIAS_NOT_FOUND, "ÐÑÐ¸Ð±ÐºÐ°: ÐÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½\n" STRING_INVALID_QUERY, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð·Ð°Ð¿ÑÐ¾Ñ\n" - STRING_INVALID_PATH, "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ PATH\n" + STRING_INVALID_PATH, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ¸Ð½ÑÐ°ÐºÑÐ¸Ñ PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -9,5 +9,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "Gabim: Linja e komandave jo e mbÃ«shtetur\n" STRING_ALIAS_NOT_FOUND, "Gabim: Pseudonimi nuk u gjend\n" STRING_INVALID_QUERY, "Gabim: KÃ«rkim pa vlere\n" - STRING_INVALID_PATH, "Invalid syntax for PATH\n" + STRING_INVALID_PATH, "Error: Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -7,5 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "éè¯¯: ä¸æ¯æçå½ä»¤è¡\n" STRING_ALIAS_NOT_FOUND, "éè¯¯: å«åæªæ¾å°\n" STRING_INVALID_QUERY, "éè¯¯: æ æçæ¥è¯¢\n" - STRING_INVALID_PATH, "Invalid syntax for PATH\n" + STRING_INVALID_PATH, "Error: Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -7,5 +7,5 @@ STRING_CMDLINE_NOT_SUPPORTED, "é¯èª¤: ä¸æ¯æ´çå½ä»¤å\n" STRING_ALIAS_NOT_FOUND, "é¯èª¤: å¥åæªæ¾å°\n" STRING_INVALID_QUERY, "é¯èª¤: ç¡æçæ¥è©¢\n" - STRING_INVALID_PATH, "Invalid syntax for PATH\n" + STRING_INVALID_PATH, "Error: Invalid syntax for PATH\n" } Modified: trunk/reactos/base/applications/cmdutils/wmic/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wmic/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/wmic/main.c [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -252,16 +252,11 @@ static const WCHAR pathW[] = {'p','a','t','h',0}; static const WCHAR classW[] = {'c','l','a','s','s',0}; static const WCHAR contextW[] = {'c','o','n','t','e','x','t',0}; - - const WCHAR *class; - const WCHAR *value; + const WCHAR *class, *value; int i; - if (argc == 1) - goto not_supported; - for (i = 1; i < argc && argv[i][0] == '/'; i++) - WINE_FIXME("command line switch %s not supported\n", debugstr_w(argv[i])); + WINE_FIXME( "command line switch %s not supported\n", debugstr_w(argv[i]) ); if (i >= argc) goto not_supported; @@ -271,13 +266,15 @@ { return 0; } - else if (!strcmpiW( argv[i], classW) || - !strcmpiW( argv[i], contextW)) - { - WINE_FIXME("command %s not supported\n", debugstr_w(argv[i])); + + if (!strcmpiW( argv[i], classW) || + !strcmpiW( argv[i], contextW )) + { + WINE_FIXME( "command %s not supported\n", debugstr_w(argv[i]) ); goto not_supported; } - else if (!strcmpiW( argv[i], pathW)) + + if (!strcmpiW( argv[i], pathW )) { if (++i >= argc) { @@ -299,7 +296,7 @@ if (++i >= argc) goto not_supported; - if (!strcmpiW( argv[i], getW)) + if (!strcmpiW( argv[i], getW )) { if (++i >= argc) goto not_supported; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 16:29:54 2017 @@ -230,7 +230,7 @@ reactos/base/applications/cmdutils/reg # Synced to WineStaging-2.2 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.2 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.9.16 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.9.11 reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources.

7 years, 10 months

[akhaldi] 73932: [REG_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:17:32 2017 New Revision: 73932 URL: http://svn.reactos.org/svn/reactos?rev=73932&view=rev Log: [REG_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/reg/reg.c Modified: trunk/rostests/winetests/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/reg/reg.c?rev=7… ============================================================================== --- trunk/rostests/winetests/reg/reg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/reg/reg.c [iso-8859-1] Sun Feb 26 16:17:32 2017 @@ -19,6 +19,7 @@ #include <stdio.h> #include <wine/test.h> +#include <winnls.h> #include <winreg.h> #define lok ok_(__FILE__,line) @@ -82,6 +83,16 @@ lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); } +#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v) +static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) +{ + LONG err; + + err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL); + lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", + value, err); +} + static void test_add(void) { HKEY hkey, subkey; @@ -115,19 +126,19 @@ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest0"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); run_reg_exe("reg add \\\\HKCU\\" KEY_BASE "\\keytest1 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest1"); - ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); + ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2"); ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), - "got exit code %d\n", r); + "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -135,7 +146,7 @@ ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); - ok(err == ERROR_SUCCESS, "got exit code %d\n", r); + ok(err == ERROR_SUCCESS, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -143,7 +154,7 @@ ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); RegCloseKey(subkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); - ok(err == ERROR_SUCCESS, "got exit code %d\n", r); + ok(err == ERROR_SUCCESS, "got exit code %d\n", err); /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); @@ -500,18 +511,15 @@ run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "bar", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_reg_nonexist(hkey, "bar"); run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + verify_reg_nonexist(hkey, ""); run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegQueryValueExA(hkey, "foo", NULL, NULL, NULL, NULL); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_reg_nonexist(hkey, "foo"); err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); ok(err == ERROR_SUCCESS, "got %d\n", err); RegCloseKey(hsubkey); @@ -700,13 +708,75 @@ return ret; } +#define test_import_str(c,r) test_import_str_(__LINE__,c,r) +static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) +{ + HANDLE regfile; + DWORD written; + BOOL ret; + + regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); + if(regfile == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); + lok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(regfile); + + run_reg_exe("reg import test.reg", rc); + + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + + return ret; +} + +#define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) +static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) +{ + int lenA, len, memsize; + WCHAR *wstr; + HANDLE regfile; + DWORD written; + BOOL ret; + + lenA = strlen(file_contents); + + len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); + memsize = len * sizeof(WCHAR); + wstr = HeapAlloc(GetProcessHeap(), 0, memsize); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, memsize); + + regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); + if(regfile == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(regfile, wstr, memsize, &written, NULL); + lok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(regfile); + + HeapFree(GetProcessHeap(), 0, wstr); + + run_reg_exe("reg import test.reg", rc); + + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); + + return ret; +} + static void test_import(void) { DWORD r, dword = 0x123; char test1_reg[MAX_PATH], test2_reg[MAX_PATH]; char cmdline[MAX_PATH]; char test_string[] = "Test string"; - HKEY hkey; + HKEY hkey, subkey; LONG err; run_reg_exe("reg import", &r); @@ -748,6 +818,619 @@ DeleteFileA(test1_reg); DeleteFileA(test2_reg); + + /* Test file contents */ + test_import_str("regedit\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("regedit4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("REGEDIT", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str(" REGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("\tREGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("\nREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("AREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("1REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("REGEDIT3\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT5\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT9\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT 4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT4 FOO\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test1\"=\"Value1\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); + + test_import_str("REGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test2\"=\"Value2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test2", REG_SZ, "Value2", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test3\"=\"Value3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test3", REG_SZ, "Value3", 7, 0); + + test_import_str("Windows Registry Editor Version 4.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_str("Windows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test4\"=\"Value4\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test4", REG_SZ, "Value4", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test5\"=\"Value5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test5", REG_SZ, "Value5", 7, 0); + + test_import_str("Windows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test6\"=\"Value6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Test6", REG_SZ, "Value6", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Line1\"=\"Value1\"\n\n" + "\"Line2\"=\"Value2\"\n\n\n" + "\"Line3\"=\"Value3\"\n\n\n\n" + "\"Line4\"=\"Value4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1\"=dword:00000782\n\n" + "\"Wine2\"=\"Test Value\"\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "#comment\n" + "@=\"Test\"\n" + ";comment\n\n" + "\"Wine4\"=dword:12345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x782; + todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + dword = 0x12345678; + todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine5\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine5", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine6\"=dword:00000050\n\n" + "\"Wine7\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x50; + todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + err = RegQueryValueExA(hkey, "Wine7", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment\\\n" + "\"Wine9\"=\"Line 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,69,6e,65,20,\\\n" + " #comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,69,6e,65,20,\\\n" + " ;comment\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" + "\"single'quote\"=dword:00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); + dword = 0x00000008; + todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" + "\"Wine\\\\31\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" + "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + /* Test file contents - Unicode */ + test_import_wstr("REGEDIT\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT4", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbf REGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbf\tREGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbf\nREGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode1\"=\"Value1\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode1", REG_SZ, "Value1", 7, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode2\"=\"Value2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode2", REG_SZ, "Value2", 7, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode3\"=\"Value3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode3", REG_SZ, "Value3", 7, 0); + + test_import_wstr("Windows Registry Editor Version 4.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("Windows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfWINDOWS Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbf\tWindows Registry Editor Version 5.00\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbf\nWindows Registry Editor Version 5.00\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode4\"=\"Value4\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode4", REG_SZ, "Value4", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode5\"=\"Value5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode5", REG_SZ, "Value5", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode6\"=\"Value6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode6", REG_SZ, "Value6", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Line1\"=\"Value1\"\n\n" + "\"Line2\"=\"Value2\"\n\n\n" + "\"Line3\"=\"Value3\"\n\n\n\n" + "\"Line4\"=\"Value4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1\"=dword:00000782\n\n" + "\"Wine2\"=\"Test Value\"\n" + "\"Wine3\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "#comment\n" + "@=\"Test\"\n" + ";comment\n\n" + "\"Wine4\"=dword:12345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x782; + todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + dword = 0x12345678; + todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine5\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine5", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine6\"=dword:00000050\n\n" + "\"Wine7\"=\"No newline\"", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x50; + todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + err = RegQueryValueExA(hkey, "Wine7", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + "got %d, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment\\\n" + "\"Wine9\"=\"Line 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine10\"=\"Value 1\"#comment\n" + "\"Wine11\"=\"Value 2\";comment\n" + "\"Wine12\"=dword:01020304 #comment\n" + "\"Wine13\"=dword:02040608 ;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine10"); + todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + todo_wine verify_reg_nonexist(hkey, "Wine12"); + dword = 0x2040608; + todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " #comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine15\"=\"A valid line\"\n" + "\"Wine16\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,63,00,6f,00,6e,00,63,00,\\\n" + " ;comment\n" + " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine17\"=\"Another valid line\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine14"); + todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#\"Comment1\"=\"Value 1\"\n" + ";\"Comment2\"=\"Value 2\"\n" + " #\"Comment3\"=\"Value 3\"\n" + " ;\"Comment4\"=\"Value 4\"\n" + "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" + "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Comment1"); + todo_wine verify_reg_nonexist(hkey, "Comment2"); + todo_wine verify_reg_nonexist(hkey, "Comment3"); + todo_wine verify_reg_nonexist(hkey, "Comment4"); + todo_wine verify_reg_nonexist(hkey, "Wine18"); + todo_wine verify_reg_nonexist(hkey, "Comment5"); + todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg_nonexist(hkey, "Comment6"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20\"=#\"Value 8\"\n" + "\"Wine21\"=;\"Value 9\"\n" + "\"Wine22\"=\"#comment1\"\n" + "\"Wine23\"=\";comment2\"\n" + "\"Wine24\"=\"Value#comment3\"\n" + "\"Wine25\"=\"Value;comment4\"\n" + "\"Wine26\"=\"Value #comment5\"\n" + "\"Wine27\"=\"Value ;comment6\"\n" + "\"Wine28\"=#dword:00000001\n" + "\"Wine29\"=;dword:00000002\n" + "\"Wine30\"=dword:00000003#comment\n" + "\"Wine31\"=dword:00000004;comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine20"); + todo_wine verify_reg_nonexist(hkey, "Wine21"); + todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + todo_wine verify_reg_nonexist(hkey, "Wine28"); + todo_wine verify_reg_nonexist(hkey, "Wine29"); + todo_wine verify_reg_nonexist(hkey, "Wine30"); + dword = 0x00000004; + todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,\\;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line2\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" + "\"single'quote\"=dword:00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); + dword = 0x00000008; + todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" + "\"Wine\\\\31\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" + "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + todo_wine verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); + err = RegCloseKey(subkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); } START_TEST(reg)

7 years, 10 months

[akhaldi] 73931: [REG] Sync with Wine Staging 2.2. CORE-12823 68c1765 reg: Simplify help handling by removing an if-else if-else block. 8a8a753 reg: Fix dword conversion on 64-bit operating systems.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:16:31 2017 New Revision: 73931 URL: http://svn.reactos.org/svn/reactos?rev=73931&view=rev Log: [REG] Sync with Wine Staging 2.2. CORE-12823 68c1765 reg: Simplify help handling by removing an if-else if-else block. 8a8a753 reg: Fix dword conversion on 64-bit operating systems. Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.c [iso-8859-1] Sun Feb 26 16:16:31 2017 @@ -255,9 +255,9 @@ case REG_DWORD_BIG_ENDIAN: /* Yes, this is correct! */ { LPWSTR rest; - DWORD val; + unsigned long val; val = strtoulW(data, &rest, (tolowerW(data[1]) == 'x') ? 16 : 10); - if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { + if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE) || val > ~0u) { output_message(STRING_MISSING_INTEGER); break; } @@ -908,23 +908,32 @@ static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR queryW[] = {'q','u','e','r','y',0}; -static enum operations get_operation(const WCHAR *str) +static enum operations get_operation(const WCHAR *str, int *op_help) { if (!lstrcmpiW(str, addW)) + { + *op_help = STRING_ADD_USAGE; return REG_ADD; + } if (!lstrcmpiW(str, deleteW)) + { + *op_help = STRING_DELETE_USAGE; return REG_DELETE; + } if (!lstrcmpiW(str, queryW)) + { + *op_help = STRING_QUERY_USAGE; return REG_QUERY; + } return REG_INVALID; } int wmain(int argc, WCHAR *argvW[]) { - int i, op, ret; + int i, op, op_help, ret; BOOL show_op_help = FALSE; static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; @@ -945,7 +954,7 @@ return 0; } - op = get_operation(argvW[1]); + op = get_operation(argvW[1], &op_help); if (op == REG_INVALID) { @@ -965,12 +974,7 @@ } else if (show_op_help) { - if (op == REG_ADD) - output_message(STRING_ADD_USAGE); - else if (op == REG_DELETE) - output_message(STRING_DELETE_USAGE); - else - output_message(STRING_QUERY_USAGE); + output_message(op_help); return 0; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 16:16:31 2017 @@ -227,7 +227,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.9.11 -reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.16 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-2.2 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73930: [CABINET_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:03:33 2017 New Revision: 73930 URL: http://svn.reactos.org/svn/reactos?rev=73930&view=rev Log: [CABINET_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/cabinet/extract.c Modified: trunk/rostests/winetests/cabinet/extract.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cabinet/extract… ============================================================================== --- trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cabinet/extract.c [iso-8859-1] Sun Feb 26 16:03:33 2017 @@ -80,6 +80,18 @@ CloseHandle(file); } +static int getFileSize(const CHAR *name) +{ + HANDLE file; + int size; + file = CreateFileA(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) + return -1; + size = GetFileSize(file, NULL); + CloseHandle(file); + return size; +} + static void create_test_files(void) { int len; @@ -621,49 +633,46 @@ ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); free_file_list(&session); - /* first file exists */ + /* first file exists but is read-only */ createTestFile("dest\\a.txt"); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY); + ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n"); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "extract.cab"); node = session.FileList; - todo_wine - { - ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, - "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); - ok(session.FileSize == 6, "Expected 6, got %d\n", session.FileSize); - ok(session.Error.erfOper == FDIERROR_USER_ABORT, - "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); - ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); - ok(session.FileCount == 1, "Expected 1, got %d\n", session.FileCount); - ok(!lstrcmpA(session.CurrentFile, "dest\\a.txt"), - "Expected dest\\a.txt, got %s\n", session.CurrentFile); - } + ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, + "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); + ok(session.FileSize == 6, "Expected 6, got %d\n", session.FileSize); + ok(session.Error.erfOper == FDIERROR_USER_ABORT, + "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); + ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); + ok(session.FileCount == 1, "Expected 1, got %d\n", session.FileCount); + ok(!lstrcmpA(session.CurrentFile, "dest\\a.txt"), + "Expected dest\\a.txt, got %s\n", session.CurrentFile); ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType); ok(session.Operation == (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES), "Expected EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES, got %d\n", session.Operation); ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); - ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); - todo_wine - { - ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); - ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); - ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); - ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); - ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry should not exist\n"); - ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); - } + ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n"); + ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to be read-only\n"); + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); + ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry should not exist\n"); + ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); free_file_list(&session); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\a.txt"); - /* third file exists */ + /* first file exists and is writable, third file exists but is read-only */ + createTestFile("dest\\a.txt"); createTestFile("dest\\testdir\\c.txt"); SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); @@ -671,32 +680,27 @@ session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "extract.cab"); node = session.FileList; - todo_wine - { - ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, - "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); - ok(session.FileSize == 26, "Expected 26, got %d\n", session.FileSize); - ok(session.Error.erfOper == FDIERROR_USER_ABORT, - "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); - ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); - ok(session.FileCount == 3, "Expected 3, got %d\n", session.FileCount); - ok(!lstrcmpA(session.CurrentFile, "dest\\testdir\\c.txt"), - "Expected dest\\c.txt, got %s\n", session.CurrentFile); - } + ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, + "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); + ok(session.FileSize == 26, "Expected 26, got %d\n", session.FileSize); + ok(session.Error.erfOper == FDIERROR_USER_ABORT, + "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); + ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); + ok(session.FileCount == 3, "Expected 3, got %d\n", session.FileCount); + ok(!lstrcmpA(session.CurrentFile, "dest\\testdir\\c.txt"), + "Expected dest\\c.txt, got %s\n", session.CurrentFile); ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType); ok(session.Operation == (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES), "Expected EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES, got %d\n", session.Operation); ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); + ok(getFileSize("dest\\a.txt") == 6, "Expected dest\\a.txt to be 6 bytes\n"); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); - ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); - todo_wine - { - ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); - ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); - } + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to be read-only\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n");

7 years, 10 months

[akhaldi] 73929: [CABINET] Sync with Wine Staging 2.2. CORE-12823 a663fe94 cabinet: Set index of folder in FDICopy callback. 1f7d144 cabinet: Make Extract fail on read-only files. af86bdc cabinet: ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 16:00:58 2017 New Revision: 73929 URL: http://svn.reactos.org/svn/reactos?rev=73929&view=rev Log: [CABINET] Sync with Wine Staging 2.2. CORE-12823 a663fe94 cabinet: Set index of folder in FDICopy callback. 1f7d144 cabinet: Make Extract fail on read-only files. af86bdc cabinet: Make Extract overwrite existing files. 3273dff cabinet: Properly initialize internal fci structure (Valgrind). Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cabinet/cabinet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_main.c [iso-8859-1] Sun Feb 26 16:00:58 2017 @@ -237,11 +237,9 @@ } hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hFile == INVALID_HANDLE_VALUE) - hFile = 0; - else if (node) + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (hFile != INVALID_HANDLE_VALUE && node) node->DoExtract = FALSE; } Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] Sun Feb 26 16:00:58 2017 @@ -1024,6 +1024,7 @@ return NULL; } + memset(p_fci_internal, 0, sizeof(FCI_Int)); p_fci_internal->magic = FCI_INT_MAGIC; p_fci_internal->perf = perf; p_fci_internal->fileplaced = pfnfiledest; @@ -1038,26 +1039,8 @@ p_fci_internal->gettemp = pfnfcigtf; p_fci_internal->ccab = *pccab; p_fci_internal->pccab = pccab; - p_fci_internal->fPrevCab = FALSE; - p_fci_internal->fNextCab = FALSE; - p_fci_internal->fSplitFolder = FALSE; - p_fci_internal->fGetNextCabInVain = FALSE; p_fci_internal->pv = pv; - p_fci_internal->cdata_in = 0; - p_fci_internal->cCompressedBytesInFolder = 0; - p_fci_internal->cFolders = 0; - p_fci_internal->cFiles = 0; - p_fci_internal->cDataBlocks = 0; p_fci_internal->data.handle = -1; - p_fci_internal->fNewPrevious = FALSE; - p_fci_internal->estimatedCabinetSize = 0; - p_fci_internal->statusFolderTotal = 0; - p_fci_internal->folders_size = 0; - p_fci_internal->files_size = 0; - p_fci_internal->placed_files_size = 0; - p_fci_internal->pending_data_size = 0; - p_fci_internal->folders_data_size = 0; - p_fci_internal->compression = tcompTYPE_NONE; p_fci_internal->compress = compress_NONE; list_init( &p_fci_internal->folders_list ); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 16:00:58 2017 @@ -51,7 +51,7 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-1.9.23 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.9.23 +reactos/dll/win32/cabinet # Synced to WineStaging-2.2 reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 reactos/dll/win32/comctl32 # Synced to WineStaging-1.9.23

7 years, 10 months

[tfaber] 73928: [MBEDTLS] - Update to version 2.4.0 CORE-12834 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 26 15:53:13 2017 New Revision: 73928 URL: http://svn.reactos.org/svn/reactos?rev=73928&view=rev Log: [MBEDTLS] - Update to version 2.4.0 CORE-12834 #resolve Added: trunk/reactos/dll/3rdparty/mbedtls/cmac.c (with props) trunk/reactos/dll/3rdparty/mbedtls/net_sockets.c - copied, changed from r73927, trunk/reactos/dll/3rdparty/mbedtls/net.c trunk/reactos/sdk/include/reactos/libs/mbedtls/cmac.h (with props) trunk/reactos/sdk/include/reactos/libs/mbedtls/net_sockets.h (with props) trunk/reactos/sdk/include/reactos/libs/mbedtls/platform_time.h (with props) Removed: trunk/reactos/dll/3rdparty/mbedtls/net.c Modified: trunk/reactos/dll/3rdparty/mbedtls/CMakeLists.txt trunk/reactos/dll/3rdparty/mbedtls/asn1parse.c trunk/reactos/dll/3rdparty/mbedtls/asn1write.c trunk/reactos/dll/3rdparty/mbedtls/cipher.c trunk/reactos/dll/3rdparty/mbedtls/entropy.c trunk/reactos/dll/3rdparty/mbedtls/error.c trunk/reactos/dll/3rdparty/mbedtls/gcm.c trunk/reactos/dll/3rdparty/mbedtls/oid.c trunk/reactos/dll/3rdparty/mbedtls/pkcs5.c trunk/reactos/dll/3rdparty/mbedtls/platform.c trunk/reactos/dll/3rdparty/mbedtls/ripemd160.c trunk/reactos/dll/3rdparty/mbedtls/rsa.c trunk/reactos/dll/3rdparty/mbedtls/sha256.c trunk/reactos/dll/3rdparty/mbedtls/sha512.c trunk/reactos/dll/3rdparty/mbedtls/ssl_cache.c trunk/reactos/dll/3rdparty/mbedtls/ssl_ciphersuites.c trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c trunk/reactos/dll/3rdparty/mbedtls/ssl_cookie.c trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c trunk/reactos/dll/3rdparty/mbedtls/ssl_ticket.c trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c trunk/reactos/dll/3rdparty/mbedtls/threading.c trunk/reactos/dll/3rdparty/mbedtls/version_features.c trunk/reactos/dll/3rdparty/mbedtls/x509.c trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c trunk/reactos/dll/3rdparty/mbedtls/x509write_crt.c trunk/reactos/dll/3rdparty/mbedtls/x509write_csr.c trunk/reactos/dll/win32/schannel/schannel_mbedtls.c trunk/reactos/sdk/include/reactos/libs/mbedtls/check_config.h trunk/reactos/sdk/include/reactos/libs/mbedtls/cipher.h trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h trunk/reactos/sdk/include/reactos/libs/mbedtls/entropy.h trunk/reactos/sdk/include/reactos/libs/mbedtls/entropy_poll.h trunk/reactos/sdk/include/reactos/libs/mbedtls/gcm.h trunk/reactos/sdk/include/reactos/libs/mbedtls/md.h trunk/reactos/sdk/include/reactos/libs/mbedtls/net.h trunk/reactos/sdk/include/reactos/libs/mbedtls/platform.h trunk/reactos/sdk/include/reactos/libs/mbedtls/rsa.h trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl.h trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl_internal.h trunk/reactos/sdk/include/reactos/libs/mbedtls/version.h trunk/reactos/sdk/include/reactos/libs/mbedtls/x509_crt.h trunk/reactos/sdk/include/reactos/libs/mbedtls/x509_csr.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/mbedtls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/CMake… Modified: trunk/reactos/dll/3rdparty/mbedtls/asn1parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/asn1p… Modified: trunk/reactos/dll/3rdparty/mbedtls/asn1write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/asn1w… Modified: trunk/reactos/dll/3rdparty/mbedtls/cipher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ciphe… Added: trunk/reactos/dll/3rdparty/mbedtls/cmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/cmac.… Modified: trunk/reactos/dll/3rdparty/mbedtls/entropy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/entro… Modified: trunk/reactos/dll/3rdparty/mbedtls/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/error… Modified: trunk/reactos/dll/3rdparty/mbedtls/gcm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/gcm.c… Removed: trunk/reactos/dll/3rdparty/mbedtls/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/net.c… Copied: trunk/reactos/dll/3rdparty/mbedtls/net_sockets.c (from r73927, trunk/reactos/dll/3rdparty/mbedtls/net.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/net_s… Modified: trunk/reactos/dll/3rdparty/mbedtls/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/oid.c… Modified: trunk/reactos/dll/3rdparty/mbedtls/pkcs5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/pkcs5… Modified: trunk/reactos/dll/3rdparty/mbedtls/platform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/platf… Modified: trunk/reactos/dll/3rdparty/mbedtls/ripemd160.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ripem… Modified: trunk/reactos/dll/3rdparty/mbedtls/rsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/rsa.c… Modified: trunk/reactos/dll/3rdparty/mbedtls/sha256.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/sha25… Modified: trunk/reactos/dll/3rdparty/mbedtls/sha512.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/sha51… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_ciphersuites.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_c… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_srv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_s… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_ticket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_t… Modified: trunk/reactos/dll/3rdparty/mbedtls/ssl_tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/ssl_t… Modified: trunk/reactos/dll/3rdparty/mbedtls/threading.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/threa… Modified: trunk/reactos/dll/3rdparty/mbedtls/version_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/versi… Modified: trunk/reactos/dll/3rdparty/mbedtls/x509.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509.… Modified: trunk/reactos/dll/3rdparty/mbedtls/x509_crt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509_… Modified: trunk/reactos/dll/3rdparty/mbedtls/x509write_crt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509w… Modified: trunk/reactos/dll/3rdparty/mbedtls/x509write_csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/x509w… Modified: trunk/reactos/dll/win32/schannel/schannel_mbedtls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/check_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/cipher.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Added: trunk/reactos/sdk/include/reactos/libs/mbedtls/cmac.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/entropy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/entropy_poll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/gcm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/md.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Added: trunk/reactos/sdk/include/reactos/libs/mbedtls/net_sockets.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/platform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Added: trunk/reactos/sdk/include/reactos/libs/mbedtls/platform_time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/rsa.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/ssl_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/x509_crt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m… Modified: trunk/reactos/sdk/include/reactos/libs/mbedtls/x509_csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/m…

7 years, 10 months

[pschweitzer] 73927: [FASTFAT] Remove an useless check

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 26 14:43:01 2017 New Revision: 73927 URL: http://svn.reactos.org/svn/reactos?rev=73927&view=rev Log: [FASTFAT] Remove an useless check Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Feb 26 14:43:01 2017 @@ -744,10 +744,7 @@ } else { - if (ParentFcb) - { - vfatReleaseFCB(DeviceExt, ParentFcb); - } + vfatReleaseFCB(DeviceExt, ParentFcb); return Status; } }

7 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
36
Older →

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 February 2017