Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70812: [DINPUT] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 29 Feb '16

29 Feb '16

Author: akhaldi Date: Mon Feb 29 00:08:18 2016 New Revision: 70812 URL: http://svn.reactos.org/svn/reactos?rev=70812&view=rev Log: [DINPUT] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/dinput/device.c trunk/reactos/dll/directx/wine/dinput/device_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] Mon Feb 29 00:08:18 2016 @@ -764,11 +764,13 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, LPCDIDATAFORMAT df) { + static const WCHAR emptyW[] = { 0 }; IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); DIDATAFORMAT data_format; DIOBJECTDATAFORMAT *obj_df = NULL; DIPROPDWORD dp; DIPROPRANGE dpr; + DIPROPSTRING dps; WCHAR username[MAX_PATH]; DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; @@ -848,6 +850,13 @@ GetUserNameW(username, &username_size); else lstrcpynW(username, lpszUserName, MAX_PATH); + + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + lstrcpynW(dps.wsz, (dwFlags & DIDSAM_NOUSER) ? emptyW : username, sizeof(dps.wsz)/sizeof(WCHAR)); + IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); /* Save the settings to disk */ save_mapping_settings(iface, lpdiaf, username); @@ -1014,10 +1023,10 @@ if (hwnd && GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return E_HANDLE; - if (dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) + if (!hwnd && dwflags == (DISCL_NONEXCLUSIVE | DISCL_BACKGROUND)) hwnd = GetDesktopWindow(); - if (!hwnd) return E_HANDLE; + if (!IsWindow(hwnd)) return E_HANDLE; /* For security reasons native does not allow exclusive background level for mouse and keyboard only */ @@ -1086,6 +1095,9 @@ /* Free action mapping */ HeapFree(GetProcessHeap(), 0, This->action_map); + /* Free username */ + HeapFree(GetProcessHeap(), 0, This->username); + EnterCriticalSection( &This->dinput->crit ); list_remove( &This->entry ); LeaveCriticalSection( &This->dinput->crit ); @@ -1235,6 +1247,17 @@ pd->dwData = This->queue_len; TRACE("buffersize = %d\n", pd->dwData); + break; + } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + ps->wsz[0] = 0; + if (This->username) + lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); break; } case (DWORD_PTR) DIPROP_VIDPID: @@ -1308,6 +1331,22 @@ This->queue_len = pd->dwData; LeaveCriticalSection(&This->crit); + break; + } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + if (!This->username) + This->username = HeapAlloc(GetProcessHeap(), 0, sizeof(ps->wsz)); + if (!This->username) + return DIERR_OUTOFMEMORY; + + This->username[0] = 0; + if (ps->wsz) + lstrcpynW(This->username, ps->wsz, sizeof(ps->wsz)/sizeof(WCHAR)); break; } default: Modified: trunk/reactos/dll/directx/wine/dinput/device_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device_private.h [iso-8859-1] Mon Feb 29 00:08:18 2016 @@ -73,6 +73,7 @@ /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ + WCHAR *username; /* set by 'SetActionMap' */ }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; 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] Mon Feb 29 00:08:18 2016 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dinput # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70811: [D3DRM_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 29 Feb '16

29 Feb '16

Author: akhaldi Date: Mon Feb 29 00:05:39 2016 New Revision: 70811 URL: http://svn.reactos.org/svn/reactos?rev=70811&view=rev Log: [D3DRM_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/d3drm/d3drm.c Modified: trunk/rostests/winetests/d3drm/d3drm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/d3drm/d3drm.c?r… ============================================================================== --- trunk/rostests/winetests/d3drm/d3drm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/d3drm/d3drm.c [iso-8859-1] Mon Feb 29 00:05:39 2016 @@ -2,6 +2,7 @@ * Copyright 2010, 2012 Christian Costa * Copyright 2012 AndrÃ© Hentschel * Copyright 2011-2014 Henri Verbeet for CodeWeavers + * Copyright 2014-2015 Aaryaman Vasishta * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3693,6 +3694,404 @@ DestroyWindow(window); } +static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) +{ + unsigned int bpp = palettized ? 8 : 24; + BITMAPFILEHEADER file_header; + DWORD written, size, ret; + unsigned char *buffer; + char path[MAX_PATH]; + unsigned int i, j; + BITMAPINFO *info; + char *filename; + HANDLE file; + + ret = GetTempPathA(MAX_PATH, path); + ok(ret, "Failed to get temporary file path.\n"); + filename = HeapAlloc(GetProcessHeap(), 0, MAX_PATH); + ret = GetTempFileNameA(path, "d3d", 0, filename); + ok(ret, "Failed to get filename.\n"); + file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to open temporary file \"%s\".\n", filename); + + size = FIELD_OFFSET(BITMAPINFO, bmiColors[palettized ? 256 : 0]); + + memset(&file_header, 0, sizeof(file_header)); + file_header.bfType = 0x4d42; /* BM */ + file_header.bfOffBits = sizeof(file_header) + size; + file_header.bfSize = file_header.bfOffBits + w * h * (bpp / 8); + ret = WriteFile(file, &file_header, sizeof(file_header), &written, NULL); + ok(ret && written == sizeof(file_header), "Failed to write file header.\n"); + + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biBitCount = bpp; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biWidth = w; + info->bmiHeader.biHeight = h; + info->bmiHeader.biCompression = BI_RGB; + if (palettized) + { + for (i = 0; i < 256; ++i) + { + info->bmiColors[i].rgbBlue = i; + info->bmiColors[i].rgbGreen = i; + info->bmiColors[i].rgbRed = i; + } + } + ret = WriteFile(file, info, size, &written, NULL); + ok(ret && written == size, "Failed to write bitmap info.\n"); + HeapFree(GetProcessHeap(), 0, info); + + size = w * h * (bpp / 8); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + for (i = 0, j = 0; i < size;) + { + if (palettized) + { + buffer[i++] = j++; + j %= 256; + } + else + { + buffer[i++] = j % 251; + buffer[i++] = j % 239; + buffer[i++] = j++ % 247; + } + } + ret = WriteFile(file, buffer, size, &written, NULL); + ok(ret && written == size, "Failed to write bitmap data.\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + CloseHandle(file); + + return filename; +} + +static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, + BOOL upside_down, unsigned int w, unsigned int h, BOOL palettized) +{ + const unsigned char *data = img->buffer1; + unsigned int i, j; + + ok(img->width == w, "Test %u: Got unexpected image width %u, expected %u.\n", test_idx, img->width, w); + ok(img->height == h, "Test %u: Got unexpected image height %u, expected %u.\n", test_idx, img->height, h); + ok(img->aspectx == 1, "Test %u: Got unexpected image aspectx %u.\n", test_idx, img->aspectx); + ok(img->aspecty == 1, "Test %u: Got unexpected image aspecty %u.\n", test_idx, img->aspecty); + ok(!img->buffer2, "Test %u: Got unexpected image buffer2 %p.\n", test_idx, img->buffer2); + + /* The image is palettized if the total number of colors used is <= 256. */ + if (w * h > 256 && !palettized) + { + /* D3drm aligns the 24bpp texture to 4 bytes in the buffer, with one + * byte padding from 24bpp texture. */ + ok(img->depth == 32, "Test %u: Got unexpected image depth %u.\n", test_idx, img->depth); + ok(img->rgb == TRUE, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb); + ok(img->bytes_per_line == w * 4, "Test %u: Got unexpected image bytes per line %u, expected %u.\n", + test_idx, img->bytes_per_line, w * 4); + ok(img->red_mask == 0xff0000, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask); + ok(img->green_mask == 0x00ff00, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask); + ok(img->blue_mask == 0x0000ff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask); + ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask); + ok(!img->palette_size, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size); + ok(!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette); + for (i = 0; i < h; ++i) + { + for (j = 0; j < w; ++j) + { + const unsigned char *ptr = &data[i * img->bytes_per_line + j * 4]; + unsigned int idx = upside_down ? (h - 1 - i) * w + j : i * w + j; + + if (ptr[0] != idx % 251 || ptr[1] != idx % 239 || ptr[2] != idx % 247 || ptr[3] != 0xff) + { + ok(0, "Test %u: Got unexpected color 0x%02x%02x%02x%02x at position %u, %u, " + "expected 0x%02x%02x%02x%02x.\n", test_idx, ptr[0], ptr[1], ptr[2], ptr[3], + j, i, idx % 251, idx % 239, idx % 247, 0xff); + return; + } + } + } + return; + } + + ok(img->depth == 8, "Test %u: Got unexpected image depth %u.\n", test_idx, img->depth); + ok(!img->rgb, "Test %u: Got unexpected image rgb %#x.\n", test_idx, img->rgb); + ok(img->red_mask == 0xff, "Test %u: Got unexpected image red mask %#x.\n", test_idx, img->red_mask); + ok(img->green_mask == 0xff, "Test %u: Got unexpected image green mask %#x.\n", test_idx, img->green_mask); + ok(img->blue_mask == 0xff, "Test %u: Got unexpected image blue mask %#x.\n", test_idx, img->blue_mask); + ok(!img->alpha_mask, "Test %u: Got unexpected image alpha mask %#x.\n", test_idx, img->alpha_mask); + ok(!!img->palette, "Test %u: Got unexpected image palette %p.\n", test_idx, img->palette); + if (!palettized) + { + /* In this case, bytes_per_line is aligned to the next multiple of + * 4 from width. */ + ok(img->bytes_per_line == ((w + 3) & ~3), "Test %u: Got unexpected image bytes per line %u, expected %u.\n", + test_idx, img->bytes_per_line, (w + 3) & ~3); + ok(img->palette_size == w * h, "Test %u: Got unexpected palette size %u, expected %u.\n", + test_idx, img->palette_size, w * h); + for (i = 0; i < img->palette_size; ++i) + { + unsigned int idx = upside_down ? (h - 1) * w - i + (i % w) * 2 : i; + ok(img->palette[i].red == idx % 251 + && img->palette[i].green == idx % 239 && img->palette[i].blue == idx % 247, + "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", + test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); + ok(img->palette[i].flags == D3DRMPALETTE_READONLY, + "Test %u: Got unexpected palette entry (%u) flags %#x.\n", + test_idx, i, img->palette[i].flags); + } + for (i = 0; i < h; ++i) + { + for (j = 0; j < w; ++j) + { + if (data[i * img->bytes_per_line + j] != i * w + j) + { + ok(0, "Test %u: Got unexpected color 0x%02x at position %u, %u, expected 0x%02x.\n", + test_idx, data[i * img->bytes_per_line + j], j, i, i * w + j); + return; + } + } + } + return; + } + + /* bytes_per_line is not always aligned by d3drm depending on the + * format. */ + ok(img->bytes_per_line == w, "Test %u: Got unexpected image bytes per line %u, expected %u.\n", + test_idx, img->bytes_per_line, w); + ok(img->palette_size == 256, "Test %u: Got unexpected palette size %u.\n", test_idx, img->palette_size); + for (i = 0; i < 256; ++i) + { + ok(img->palette[i].red == i && img->palette[i].green == i && img->palette[i].blue == i, + "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", + test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); + ok(img->palette[i].flags == D3DRMPALETTE_READONLY, + "Test %u: Got unexpected palette entry (%u) flags %#x.\n", + test_idx, i, img->palette[i].flags); + } + for (i = 0; i < h; ++i) + { + for (j = 0; j < w; ++j) + { + unsigned int idx = upside_down ? (h - 1 - i) * w + j : i * w + j; + if (data[i * img->bytes_per_line + j] != idx % 256) + { + ok(0, "Test %u: Got unexpected color 0x%02x at position %u, %u, expected 0x%02x.\n", + test_idx, data[i * img->bytes_per_line + j], j, i, idx % 256); + return; + } + } + } +} + +static void test_load_texture(void) +{ + IDirect3DRMTexture3 *texture3; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture *texture1; + D3DRMIMAGE *d3drm_img; + IDirect3DRM3 *d3drm3; + IDirect3DRM2 *d3drm2; + IDirect3DRM *d3drm1; + char *filename; + HRESULT hr; + BOOL ret; + int i; + + static const struct + { + unsigned int w; + unsigned int h; + BOOL palettized; + } + tests[] = + { + {100, 100, TRUE }, + {99, 100, TRUE }, + {100, 100, FALSE}, + {99, 100, FALSE}, + {3, 39, FALSE}, + }; + + hr = Direct3DRMCreate(&d3drm1); + ok(hr == D3DRM_OK, "Failed to create IDirect3DRM object, hr %#x.\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRM2 interface, hr %#x.\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRM3 interface, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized); + + hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); + ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 4, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + + hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); + ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture2_GetImage(texture2); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 4 + 1, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture2_Release(texture2); + + hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); + ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#x.\n", i, hr); + d3drm_img = IDirect3DRMTexture3_GetImage(texture3); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 4 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + /* Test whether querying a version 1 texture from version 3 causes a + * change in the loading behavior. */ + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#x.\n", hr); + d3drm_img = IDirect3DRMTexture_GetImage(texture1); + todo_wine ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + if (d3drm_img) + test_bitmap_data(i * 4 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); + IDirect3DRMTexture_Release(texture1); + IDirect3DRMTexture3_Release(texture3); + + ret = DeleteFileA(filename); + ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); + HeapFree(GetProcessHeap(), 0, filename); + } + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); +} + +static void test_texture_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRM3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRM, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMWinDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObject, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMViewport, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewport2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrame3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisual, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMMesh, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMeshBuilder3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFace2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLight, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMTexture, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMTexture2, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMTexture3, &IID_IUnknown, S_OK }, + { &IID_IDirect3DRMWrap, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMMaterial2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimation, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimation2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationSet2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMObjectArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMDeviceArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMViewportArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFrameArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMVisualArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMLightArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPickedArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMFaceArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMAnimationArray, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMUserVisual, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMShadow2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMInterpolator, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMProgressiveMesh, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMPicked2Array, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DRMClippedVisual, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawClipper, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface4, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDrawSurface, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DDevice, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3D, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw7, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw4, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw3, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw2, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirectDraw, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IDirect3DLight, NULL, CLASS_E_CLASSNOTAVAILABLE }, + { &IID_IUnknown, &IID_IUnknown, S_OK, }, + }; + HRESULT hr; + IDirect3DRM *d3drm1; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IDirect3DRMTexture *texture1; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture3 *texture3; + IUnknown *unknown; + char *filename; + BOOL check; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x)\n", hr); + filename = create_bitmap(1, 1, TRUE); + hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture_QueryInterface(texture1, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture (hr = %#x)\n", hr); + IDirect3DRMTexture_Release(texture1); + test_qi("texture1_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr); + hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + hr = IDirect3DRMTexture2_QueryInterface(texture2, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture2 (hr = %#x)\n", hr); + IDirect3DRMTexture2_Release(texture2); + test_qi("texture2_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); + ok(SUCCEEDED(hr), "Failed to load texture (hr = %#x).\n", hr); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IUnknown, (void **)&unknown); + ok(SUCCEEDED(hr), "Cannot get IUnknown interface from IDirect3DRMTexture3 (hr = %#x)\n", hr); + IDirect3DRMTexture3_Release(texture3); + test_qi("texture3_qi", unknown, &IID_IUnknown, tests, sizeof(tests) / sizeof(*tests)); + IUnknown_Release(unknown); + + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + check = DeleteFileA(filename); + ok(check, "Cannot delete image stored in %s (error = %d).\n", filename, GetLastError()); + HeapFree(GetProcessHeap(), 0, filename); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -3720,4 +4119,6 @@ test_create_device_from_d3d1(); test_create_device_from_d3d2(); test_create_device_from_d3d3(); + test_load_texture(); + test_texture_qi(); }

1 0

[akhaldi] 70810: [D3DRM] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 29 Feb '16

29 Feb '16

Author: akhaldi Date: Mon Feb 29 00:01:53 2016 New Revision: 70810 URL: http://svn.reactos.org/svn/reactos?rev=70810&view=rev Log: [D3DRM] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/d3drm/texture.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3drm/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/tex… ============================================================================== --- trunk/reactos/dll/directx/wine/d3drm/texture.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3drm/texture.c [iso-8859-1] Mon Feb 29 00:01:53 2016 @@ -670,21 +670,26 @@ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2) - || IsEqualGUID(riid, &IID_IDirect3DRMTexture) + if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) + { + *out = &texture->IDirect3DRMTexture3_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2)) { *out = &texture->IDirect3DRMTexture2_iface; } - else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture)) { - *out = &texture->IDirect3DRMTexture3_iface; + *out = &texture->IDirect3DRMTexture_iface; } else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out); 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] Mon Feb 29 00:01:53 2016 @@ -25,7 +25,7 @@ reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4

1 0

[akhaldi] 70809: [PSDK] Update ndrtypes.h. CORE-10912
by akhaldi＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: akhaldi Date: Sun Feb 28 23:59:17 2016 New Revision: 70809 URL: http://svn.reactos.org/svn/reactos?rev=70809&view=rev Log: [PSDK] Update ndrtypes.h. CORE-10912 Modified: trunk/reactos/include/psdk/ndrtypes.h Modified: trunk/reactos/include/psdk/ndrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ndrtypes.h?re… ============================================================================== --- trunk/reactos/include/psdk/ndrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ndrtypes.h [iso-8859-1] Sun Feb 28 23:59:17 2016 @@ -83,7 +83,11 @@ * routine @ NotifyIndex. */ unsigned char HasNotify2 : 1; /* 0x10 - should call MIDL [notify_flag] routine @ * NotifyIndex. */ - unsigned char Unused : 3; + + /* The following bits are in fact used by midl but haven't yet been + named in the SDK. */ + unsigned char Unused : 3; /* 0x20 - has complex return */ + /* 0x40 - has range on conformance */ } INTERPRETER_OPT_FLAGS2, *PINTERPRETER_OPT_FLAGS2; /* Win2000 extensions */

1 0

[akhaldi] 70808: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: akhaldi Date: Sun Feb 28 23:33:47 2016 New Revision: 70808 URL: http://svn.reactos.org/svn/reactos?rev=70808&view=rev Log: [D3D8][D3D9][DDRAW][WINED3D] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cs.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/sampler.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/sampler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 70807: [WINHLP32] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: akhaldi Date: Sun Feb 28 23:05:53 2016 New Revision: 70807 URL: http://svn.reactos.org/svn/reactos?rev=70807&view=rev Log: [WINHLP32] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/winhlp32/hlpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/hlpfile.c [iso-8859-1] Sun Feb 28 23:05:53 2016 @@ -1463,7 +1463,7 @@ case 1: fs = page->file->fonts[font].LogFont.lfHeight; break; case 2: fs = page->file->fonts[font].LogFont.lfHeight + 4; break; } - /* FIXME: missing at least colors, also bold attribute looses information */ + /* FIXME: colors are missing, at a minimum; also, the bold attribute loses information */ sprintf(tmp, "\\f%u\\cf%u\\fs%u%s%s%s%s", font, font + 2, fs, 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 28 23:05:53 2016 @@ -239,7 +239,7 @@ reactos/base/applications/iexplore # Synced to WineStaging-1.7.55 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync -reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.55 +reactos/base/applications/winhlp32 # Synced to WineStaging-1.9.4 reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 reactos/base/services/rpcss # Synced to WineStaging-1.7.55 reactos/base/system/expand # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70806: [REG_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: akhaldi Date: Sun Feb 28 23:04:29 2016 New Revision: 70806 URL: http://svn.reactos.org/svn/reactos?rev=70806&view=rev Log: [REG_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 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 28 23:04:29 2016 @@ -72,17 +72,11 @@ if (err != ERROR_SUCCESS) return; - if (todo & TODO_REG_TYPE) - todo_wine lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); - else + todo_wine_if (todo & TODO_REG_TYPE) lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); - if (todo & TODO_REG_SIZE) - todo_wine lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - else + todo_wine_if (todo & TODO_REG_SIZE) lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); - if (todo & TODO_REG_DATA) - todo_wine lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); - else + todo_wine_if (todo & TODO_REG_DATA) lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); } @@ -110,12 +104,7 @@ /* Test empty type */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\" /d WineTest /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), - "got exit code %u\n", r); - if (r == REG_EXIT_SUCCESS) - todo_wine verify_reg(hkey, "emptyType", REG_SZ, "", 1, 0); - else - todo_wine win_skip("broken reg.exe detected\n"); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); /* Test input key formats */ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r); @@ -154,7 +143,7 @@ /* REG_NONE */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v none0 /d deadbeef /t REG_NONE /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d\n", r); - verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, TODO_REG_SIZE); + verify_reg(hkey, "none0", REG_NONE, "d\0e\0a\0d\0b\0e\0e\0f\0\0", 18, 0); /* REG_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); @@ -173,6 +162,9 @@ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); @@ -188,11 +180,11 @@ /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand1 /t REG_EXpand_sz /d \"dead^%PATH^%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, TODO_REG_SIZE); + verify_reg(hkey, "expand1", REG_EXPAND_SZ, "dead^%PATH^%beef", 17, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -200,11 +192,11 @@ run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_EXPAND_SZ /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, TODO_REG_SIZE); + verify_reg(hkey, "", REG_EXPAND_SZ, "WineTEST", 9, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_EXPAND_SZ /v expand3 /f /d \"\"", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, TODO_REG_SIZE); + verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); /* REG_BINARY */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin0 /f", &r); @@ -217,11 +209,11 @@ verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin2 /f /d x01", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin3 /f /d 01x", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin4 /f /d DeAdBeEf0DD", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); @@ -243,6 +235,9 @@ ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "bin5", REG_BINARY, buffer, 0, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v bin6 /t REG_BINARY /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -253,15 +248,17 @@ else win_skip("broken reg.exe detected\n"); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword0 /t REG_DWORD /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), - "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword5 /t reg_dword /d 12345678 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -275,26 +272,32 @@ ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); - todo_wine ok(dword == 123 || broken(dword == 0123 /* WinXP */), - "got wrong data %d, expected %d\n", dword, 123); + ok(dword == 123 || broken(dword == 0123 /* WinXP */), "got wrong data %d, expected 123\n", dword); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0xdeadbeef; - verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), - (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = ~0u; + verify_reg(hkey, "dword12", REG_DWORD, &dword, sizeof(dword), 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -305,49 +308,55 @@ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_BE /t REG_DWORD_BIG_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); dword = 456; - verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), TODO_REG_SIZE); + verify_reg(hkey, "DWORD_BE", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); /* REG_DWORD_BIG_ENDIAN is broken in every version of windows. It behaves like * an ordinary REG_DWORD - that is little endian. GG */ /* REG_MULTI_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); memcpy(buffer, "three\0little\0strings\0", 22); - verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi1 /s \"#\" /d \"three#little#strings\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi1", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi2 /d \"\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi2", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi3 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "multi3", REG_MULTI_SZ, &buffer[21], 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"threelittlestrings\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine verify_reg(hkey, "multi4", REG_MULTI_SZ, "threelittlestrings\0", 20, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi5 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi6 /s \"\\0\" /d \"three\\0little\\0strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi7 /s \"\" /d \"three#little#strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi8 /s \"#\" /d \"##\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi9 /s \"#\" /d \"two##strings\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi10 /s \"#\" /d \"#a\" /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi11 /s \"#\" /d \"a#\" /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); buffer[0]='a'; buffer[1]=0; buffer[2]=0; - verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi13 /t REG_MULTI_SZ /f /s", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); RegCloseKey(hkey); @@ -416,6 +425,23 @@ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_v_flags(void) +{ + DWORD r; + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -430,4 +456,5 @@ test_add(); test_delete(); test_query(); -} + test_v_flags(); +}

1 0

[akhaldi] 70805: [INCLUDE/WINE] Update test.h. CORE-10912
by akhaldi＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: akhaldi Date: Sun Feb 28 22:55:32 2016 New Revision: 70805 URL: http://svn.reactos.org/svn/reactos?rev=70805&view=rev Log: [INCLUDE/WINE] Update test.h. CORE-10912 Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun Feb 28 22:55:32 2016 @@ -110,14 +110,14 @@ extern void winetest_vskip( const char *msg, __winetest_va_list ap ); #ifdef __GNUC__ - +# define WINETEST_PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); extern void __winetest_cdecl winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ - +# define WINETEST_PRINTF_ATTR(fmt,args) extern void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ); extern void __winetest_cdecl winetest_skip( const char *msg, ... ); extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ); @@ -144,6 +144,16 @@ #define todo_wine todo_ros #else #define todo_wine todo("wine") +#endif + +#ifdef USE_WINE_TODOS +#define todo_wine_if(is_todo) \ + if ((is_todo) && (!strcmp(winetest_platform, "reactos"))) \ + todo(winetest_platform) +#else +#define todo_wine_if(is_todo) \ + if ((is_todo) && (!strcmp(winetest_platform, "wine"))) \ + todo(winetest_platform) #endif

1 0

[akhaldi] 70804: [REG] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: akhaldi Date: Sun Feb 28 22:53:26 2016 New Revision: 70804 URL: http://svn.reactos.org/svn/reactos?rev=70804&view=rev Log: [REG] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc trunk/reactos/base/applications/cmdutils/reg/reg.c trunk/reactos/base/applications/cmdutils/reg/reg.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "ÐÑÐµÑÐºÐ°: ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²ÑÐ½Ðµ Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ðµ Ð² Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½Ð°ÑÐ° Ð¼Ð°ÑÐ¸Ð½Ð°\n" STRING_CANNOT_FIND, "ÐÑÐµÑÐºÐ°: Ð£ÑÐµÐ´Ð±Ð°ÑÐ° Ð½Ðµ Ð¾ÑÐºÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐµÐ½ ÐºÐ»ÑÑ Ð¸Ð»Ð¸ ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ\n" STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -17,4 +17,16 @@ STRING_NO_REMOTE, "Chyba: Nelze pÅidat klÃÄe na vzdÃ¡lenÃ½ stroj\n" STRING_CANNOT_FIND, "Chyba: SystÃ©m nenalezl zadanÃ½ klÃÄ nebo hodnotu registru\n" STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "Fejl: Kunne ikke tilfÃ¸je nÃ¸gler til fjern maskinen\n" STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nÃ¸gle eller vÃ¦rdi\n" STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "Fehler: Konnte SchlÃ¼ssel nicht zum entfernten Rechner hinzufÃ¼gen\n" STRING_CANNOT_FIND, "Fehler: Der angegebene SchlÃ¼ssel oder Wert konnte nicht gefunden werden\n" STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -7,9 +7,21 @@ STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" STRING_SUCCESS, "The operation completed successfully\n" - STRING_INVALID_KEY, "Error: Invalid key name\n" - STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n" - STRING_NO_REMOTE, "Error: Unable to access remote machine\n" - STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry key or value\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_INVALID_KEY, "reg: Invalid key name\n" + STRING_INVALID_CMDLINE, "reg: Invalid command line parameters\n" + STRING_NO_REMOTE, "reg: Unable to access remote machine\n" + STRING_CANNOT_FIND, "reg: The system was unable to find the specified registry key or value\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "Error: No se pueden agregar las claves al equipo remoto\n" STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n" STRING_UNSUPPORTED_TYPE, "Error: Tipo no soportado\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "ErreurÂ : impossible d'ajouter des clÃ©s Ã une machine distante\n" STRING_CANNOT_FIND, "ErreurÂ : le systÃ¨me n'a pas pu trouver la clÃ© ou la valeur de registre spÃ©cifiÃ©e\n" STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "Errore: impossibile aggiungere chiavi alla macchina remota\n" STRING_CANNOT_FIND, "Errore: il sistema non Ã¨ riuscito a trovare la chiave di registro o il valore specificati\n" STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "ã¨ã©ã¼: ã³ãã³ã ã©ã¤ã³å¼æ°ãç¡å¹ã§ã\n" STRING_NO_REMOTE, "ã¨ã©ã¼: ãªã¢ã¼ã ãã·ã³ã«ãã¼ãè¿½å ã§ãã¾ããã§ãã\n" STRING_CANNOT_FIND, "ã¨ã©ã¼: ã·ã¹ãã ã¯æå®ããããã¼ã¾ãã¯å¤ãè¦ã¤ãããã¾ããã§ãã\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "ìë¬:ì¬ë°ë¥´ì§ ìì ëªë ¹ë¼ì¸ ë§¤ê°ë³ì\n" STRING_NO_REMOTE, "ìë¬: ìê²© ë¨¸ì ì í¤ë¥¼ ëíë ê²ì ê°ë¥íì§ ììµëë¤\n" STRING_CANNOT_FIND, "ìë¬: ì´ ìì¤íìì ì§ì ë ë ì§ì¤í¸ë¦¬ í¤ë ê°ì ì°¾ìì ììµëë¤\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "Klaida: Netinkami komandos eilutÄs parametrai\n" STRING_NO_REMOTE, "Klaida: Negalima pridÄti raktÅ³ nuotoliniame kompiuteryje\n" STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikÅ¡mÄs\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n" STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "Feil: Ugyldige parametere pÃ¥ kommandolinjen\n" STRING_NO_REMOTE, "Feil: Kan ikke legge til nÃ¸kler pÃ¥ ekstern maskin\n" STRING_CANNOT_FIND, "Feil: Systemet klarte ikke finne den angitte registernÃ¸kkelen eller -verdien\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "BÅÄd: Nie moÅ¼na dodaÄ kluczy do zdalnej maszyny\n" STRING_CANNOT_FIND, "BÅÄd: System nie mÃ³gÅ znaleÅºÄ podanej wartoÅci lub klucza rejestru\n" STRING_UNSUPPORTED_TYPE, "BÅÄd: NieobsÅugiwany typ\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "Erro: ParÃ¢metros da linha de comandos invÃ¡lidos\n" STRING_NO_REMOTE, "Erro: Incapaz de adicionar chaves Ã mÃ¡quina remota\n" STRING_CANNOT_FIND, "Erro: O sistema foi incapaz de encontrar a chave de registo ou valor especificado\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -18,4 +18,16 @@ STRING_NO_REMOTE, "Eroare: Nu se pot adÄuga chei pe calculatorul de la distanÈÄ\n" STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut gÄsi cheia sau valoarea de registru specificatÄ\n" STRING_UNSUPPORTED_TYPE, "Eroare: Tip nerecunoscut\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -12,4 +12,16 @@ STRING_NO_REMOTE, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐºÐ»ÑÑÐ¸ Ð½Ð° ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¼Ð°ÑÐ¸Ð½Ðµ\n" STRING_CANNOT_FIND, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÐºÐ»ÑÑ ÑÐµÐµÑÑÑÐ° Ð¸Ð»Ð¸ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ\n" STRING_UNSUPPORTED_TYPE, "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÑÐ¸Ð¿\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "Napaka: NapaÄen parameter v ukazni vrstici\n" STRING_NO_REMOTE, "Napaka: Na morem dodati kljuÄa na oddaljen raÄunalnik\n" STRING_CANNOT_FIND, "Napaka: Sistem ni naÅ¡el zahtevanega kljuÄa ali vrednosti\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sq-AL.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -15,5 +15,17 @@ STRING_INVALID_CMDLINE, "Error: Parametrat e pavlefshme ne vijÃ«n komanduse\n" STRING_NO_REMOTE, "Error: NÃ« pamundÃ«si pÃ«r tÃ« shtuar Ã§elÃ«sat nÃ« makinÃ« nÃ« distancÃ«\n" STRING_CANNOT_FIND, "Error: Sistemi nuk ishte nÃ« gjendje pÃ«r tÃ« gjetur Ã§elÃ«sat tÃ« caktuar tÃ« regjistrit ose vlerÃ«s\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "Fel: ogiltiga kommandoradsparametrar\n" STRING_NO_REMOTE, "Fel: Kan inte lÃ¤gga till nycklar till fjÃ¤rrmaskin\n" STRING_CANNOT_FIND, "Fel: Systemet kunde inte hitta angiven nyckel eller vÃ¤rde i registret\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -14,4 +14,16 @@ STRING_NO_REMOTE, "YanlÄ±ÅlÄ±k: Uzak makineye eriÅilemez\n" STRING_CANNOT_FIND, "YanlÄ±ÅlÄ±k: Dizge belirtilen deÄer defteri dizinini ya da deÄerini bulamadÄ±\n" STRING_UNSUPPORTED_TYPE, "YanlÄ±ÅlÄ±k: Desteklenmeyen tÃ¼r\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -11,5 +11,17 @@ STRING_INVALID_CMDLINE, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ°\n" STRING_NO_REMOTE, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð´Ð¾Ð´Ð°ÑÐ¸ ÐºÐ»ÑÑÑ Ð½Ð° Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½ÑÐ¹ Ð¼Ð°ÑÐ¸Ð½Ñ\n" STRING_CANNOT_FIND, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ ÐºÐ»ÑÑ ÑÐµÑÑÑÑÑ ÑÐ¸ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ\n" - STRING_UNSUPPORTED_TYPE, "Error: Unsupported type\n" + STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/zh-CN.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -14,4 +14,16 @@ STRING_NO_REMOTE, "éè¯¯: æ æ³è®¿é®è¿ç¨è®¡ç®æº\n" STRING_CANNOT_FIND, "éè¯¯: ç³»ç»æ¯æ æ³æ¾å°æå®çæ³¨åè¡¨é¡¹æå¼\n" STRING_UNSUPPORTED_TYPE, "éè¯¯: ä¸æ¯æçç±»å\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } Modified: trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/zh-TW.rc [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -14,4 +14,16 @@ STRING_NO_REMOTE, "é¯èª¤: ç¡æ³è¨ªåé ç«¯è¨ç®æ©\n" STRING_CANNOT_FIND, "é¯èª¤: ç³»çµ±æ¯ç¡æ³æ¾å°æå®çè¨»åè¡¨é æå¼\n" STRING_UNSUPPORTED_TYPE, "é¯èª¤: ä¸æ¯æ´çé¡å\n" + STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" + STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" + STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" + STRING_YESNO, " (Yes|No)" + STRING_YES, "Y" + STRING_NO, "N" + STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_DEFAULT_VALUE, "(Default)" + STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" + STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" + STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" } 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 28 22:53:26 2016 @@ -29,6 +29,8 @@ #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +WINE_DEFAULT_DEBUG_CHANNEL(reg); + static const WCHAR short_hklm[] = {'H','K','L','M',0}; static const WCHAR short_hkcu[] = {'H','K','C','U',0}; static const WCHAR short_hkcr[] = {'H','K','C','R',0}; @@ -81,19 +83,11 @@ {REG_MULTI_SZ, type_multi_sz}, }; -static int reg_printfW(const WCHAR *msg, ...) -{ - va_list va_args; - int wlen; +static void output_writeconsole(const WCHAR *str, DWORD wlen) +{ DWORD count, ret; - WCHAR msg_buffer[8192]; - - va_start(va_args, msg); - vsnprintfW(msg_buffer, 8192, msg, va_args); - va_end(va_args); - - wlen = lstrlenW(msg_buffer); - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); if (!ret) { DWORD len; @@ -103,29 +97,83 @@ * back to WriteFile(), assuming the console encoding is still the right * one in that case. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, - NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); - if (!msgA) - return 0; - - WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, - NULL, NULL); + if (!msgA) return; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); } - - return count; -} - -static int reg_message(int msg) -{ - static const WCHAR formatW[] = {'%','s',0}; - WCHAR msg_buffer[8192]; - - LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, - sizeof(msg_buffer)/sizeof(WCHAR)); - return reg_printfW(formatW, msg_buffer); +} + +static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) +{ + WCHAR *str; + DWORD len; + + SetLastError(NO_ERROR); + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, + fmt, 0, 0, (WCHAR *)&str, 0, &va_args); + if (len == 0 && GetLastError() != NO_ERROR) + { + WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + return; + } + output_writeconsole(str, len); + LocalFree(str); +} + +static void __cdecl output_message(unsigned int id, ...) +{ + WCHAR fmt[1024]; + __ms_va_list va_args; + + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) + { + WINE_FIXME("LoadString failed with %d\n", GetLastError()); + return; + } + __ms_va_start(va_args, id); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); +} + +static void __cdecl output_string(const WCHAR *fmt, ...) +{ + __ms_va_list va_args; + + __ms_va_start(va_args, fmt); + output_formatstring(fmt, va_args); + __ms_va_end(va_args); +} + +/* ask_confirm() adapted from programs/cmd/builtins.c */ +static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) +{ + HMODULE hmod; + WCHAR Ybuffer[4]; + WCHAR Nbuffer[4]; + WCHAR defval[32]; + WCHAR answer[MAX_PATH]; + DWORD count; + + hmod = GetModuleHandleW(NULL); + LoadStringW(hmod, STRING_YES, Ybuffer, ARRAY_SIZE(Ybuffer)); + LoadStringW(hmod, STRING_NO, Nbuffer, ARRAY_SIZE(Nbuffer)); + LoadStringW(hmod, STRING_DEFAULT_VALUE, defval, ARRAY_SIZE(defval)); + + while (1) + { + output_message(msgid, reg_info ? reg_info : defval); + output_message(STRING_YESNO); + ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), answer, ARRAY_SIZE(answer), &count, NULL); + answer[0] = toupperW(answer[0]); + if (answer[0] == Ybuffer[0]) + return TRUE; + if (answer[0] == Nbuffer[0]) + return FALSE; + } } static inline BOOL path_rootname_cmp(const WCHAR *input_path, const WCHAR *rootkey_name) @@ -186,7 +234,9 @@ switch (reg_type) { + case REG_NONE: case REG_SZ: + case REG_EXPAND_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); out_data = HeapAlloc(GetProcessHeap(),0,*reg_count); @@ -194,13 +244,14 @@ break; } case REG_DWORD: + /* case REG_DWORD_LITTLE_ENDIAN: */ + case REG_DWORD_BIG_ENDIAN: /* Yes, this is correct! */ { LPWSTR rest; DWORD val; - val = strtolW(data, &rest, 0); - if (rest == data) { - static const WCHAR nonnumber[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','n','u','m','b','e','r','.','\n',0}; - reg_printfW(nonnumber); + val = strtoulW(data, &rest, (data[1] == 'x') ? 16 : 10); + if (*rest || data[0] == '-') { + output_message(STRING_MISSING_INTEGER); break; } *reg_count = sizeof(DWORD); @@ -210,7 +261,6 @@ } case REG_BINARY: { - static const WCHAR nohex[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','h','e','x',' ','d','a','t','a','.','\n',0}; BYTE hex0, hex1; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); @@ -234,15 +284,14 @@ no_hex_data: /* cleanup, print error */ HeapFree(GetProcessHeap(), 0, out_data); - reg_printfW(nohex); + output_message(STRING_MISSING_HEXDATA); out_data = NULL; break; } + case REG_MULTI_SZ: + /* FIXME: Needs handling */ default: - { - static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; - reg_printfW(unhandled, reg_type,data); - } + output_message(STRING_UNHANDLED_TYPE, reg_type, data); } return out_data; @@ -254,13 +303,13 @@ if (i < 3 || (key[i - 1] == '\\' && key[i - 2] == '\\')) { - reg_message(STRING_INVALID_KEY); + output_message(STRING_INVALID_KEY); return FALSE; } if (key[0] == '\\' && key[1] == '\\' && key[2] != '\\') { - reg_message(STRING_NO_REMOTE); + output_message(STRING_NO_REMOTE); return FALSE; } @@ -270,20 +319,16 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { - static const WCHAR stubW[] = {'A','D','D',' ','-',' ','%','s', - ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0}; LPWSTR p; HKEY root,subkey; - reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); - if (!sane_path(key_name)) return 1; p = strchrW(key_name,'\\'); if (!p) { - reg_message(STRING_INVALID_KEY); + output_message(STRING_INVALID_KEY); return 1; } p++; @@ -291,13 +336,19 @@ root = path_get_rootkey(key_name); if (!root) { - reg_message(STRING_INVALID_KEY); + output_message(STRING_INVALID_KEY); + return 1; + } + + if (value_name && value_empty) + { + output_message(STRING_INVALID_CMDLINE); return 1; } if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) { - reg_message(STRING_INVALID_KEY); + output_message(STRING_INVALID_KEY); return 1; } @@ -309,9 +360,14 @@ if (!force) { - if (RegQueryValueW(subkey,value_name,NULL,NULL)==ERROR_SUCCESS) + if (RegQueryValueExW(subkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - /* FIXME: Prompt for overwrite */ + if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) + { + RegCloseKey(subkey); + output_message(STRING_CANCELLED); + return 0; + } } } @@ -319,19 +375,28 @@ if (reg_type == ~0u) { RegCloseKey(subkey); - reg_message(STRING_UNSUPPORTED_TYPE); - return 1; - } - - if (data) - reg_data = get_regdata(data,reg_type,separator,&reg_count); + output_message(STRING_UNSUPPORTED_TYPE, type); + return 1; + } + if (reg_type == REG_DWORD && !data) + { + RegCloseKey(subkey); + output_message(STRING_INVALID_CMDLINE); + return 1; + } + + if (data && !(reg_data = get_regdata(data, reg_type, separator, &reg_count))) + { + RegCloseKey(subkey); + return 1; + } RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count); HeapFree(GetProcessHeap(),0,reg_data); } RegCloseKey(subkey); - reg_message(STRING_SUCCESS); + output_message(STRING_SUCCESS); return 0; } @@ -342,18 +407,13 @@ LPWSTR p; HKEY root,subkey; - static const WCHAR stubW[] = {'D','E','L','E','T','E', - ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' - ,0}; - reg_printfW(stubW, key_name, value_name, value_empty, value_all, force); - if (!sane_path(key_name)) return 1; p = strchrW(key_name,'\\'); if (!p) { - reg_message(STRING_INVALID_KEY); + output_message(STRING_INVALID_KEY); return 1; } p++; @@ -361,25 +421,32 @@ root = path_get_rootkey(key_name); if (!root) { - reg_message(STRING_INVALID_KEY); - return 1; - } - - if (value_name && value_empty) - { - reg_message(STRING_INVALID_CMDLINE); - return 1; - } - - if (value_empty && value_all) - { - reg_message(STRING_INVALID_CMDLINE); + output_message(STRING_INVALID_KEY); + return 1; + } + + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + { + output_message(STRING_INVALID_CMDLINE); return 1; } if (!force) { - /* FIXME: Prompt for delete */ + BOOL ret; + + if (value_name || value_empty) + ret = ask_confirm(STRING_DELETE_VALUE, value_name); + else if (value_all) + ret = ask_confirm(STRING_DELETE_VALUEALL, key_name); + else + ret = ask_confirm(STRING_DELETE_SUBKEY, key_name); + + if (!ret) + { + output_message(STRING_CANCELLED); + return 0; + } } /* Delete subtree only if no /v* option is given */ @@ -387,16 +454,16 @@ { if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) { - reg_message(STRING_CANNOT_FIND); - return 1; - } - reg_message(STRING_SUCCESS); + output_message(STRING_CANNOT_FIND); + return 1; + } + output_message(STRING_SUCCESS); return 0; } if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) { - reg_message(STRING_CANNOT_FIND); + output_message(STRING_CANNOT_FIND); return 1; } @@ -440,7 +507,7 @@ if (RegDeleteValueW(subkey,value_name) != ERROR_SUCCESS) { RegCloseKey(subkey); - reg_message(STRING_CANNOT_FIND); + output_message(STRING_CANNOT_FIND); return 1; } } @@ -450,7 +517,7 @@ } RegCloseKey(subkey); - reg_message(STRING_SUCCESS); + output_message(STRING_SUCCESS); return 0; } @@ -458,8 +525,8 @@ BOOL subkey) { static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', - '-',' ','%','s',' ','%','s',' ','%','d',' ','%','d','\n',0}; - reg_printfW(stubW, key_name, value_name, value_empty, subkey); + '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; + output_string(stubW, key_name, value_name, value_empty, subkey); return 1; } @@ -484,7 +551,7 @@ if (argc < 2 || !lstrcmpW(argvW[1], slashHelpW) || !lstrcmpiW(argvW[1], slashHW)) { - reg_message(STRING_USAGE); + output_message(STRING_USAGE); return 0; } @@ -495,13 +562,13 @@ if (argc < 3) { - reg_message(STRING_INVALID_CMDLINE); + output_message(STRING_INVALID_CMDLINE); return 1; } else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || !lstrcmpiW(argvW[2], slashHW))) { - reg_message(STRING_ADD_USAGE); + output_message(STRING_ADD_USAGE); return 0; } @@ -515,9 +582,24 @@ else if (!lstrcmpiW(argvW[i], slashTW)) type = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashSW)) - separator = argvW[++i][0]; + { + WCHAR *ptr = argvW[++i]; + + if (!ptr || strlenW(ptr) != 1) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = ptr[0]; + } else if (!lstrcmpiW(argvW[i], slashDW)) - data = argvW[++i]; + { + if (!(data = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } @@ -531,13 +613,13 @@ if (argc < 3) { - reg_message(STRING_INVALID_CMDLINE); + output_message(STRING_INVALID_CMDLINE); return 1; } else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || !lstrcmpiW(argvW[2], slashHW))) { - reg_message(STRING_DELETE_USAGE); + output_message(STRING_DELETE_USAGE); return 0; } @@ -562,13 +644,13 @@ if (argc < 3) { - reg_message(STRING_INVALID_CMDLINE); + output_message(STRING_INVALID_CMDLINE); return 1; } else if (argc == 3 && (!lstrcmpW(argvW[2], slashHelpW) || !lstrcmpiW(argvW[2], slashHW))) { - reg_message(STRING_QUERY_USAGE); + output_message(STRING_QUERY_USAGE); return 0; } @@ -586,7 +668,7 @@ } else { - reg_message(STRING_INVALID_CMDLINE); - return 1; - } -} + output_message(STRING_INVALID_CMDLINE); + return 1; + } +} Modified: trunk/reactos/base/applications/cmdutils/reg/reg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/reg.h [iso-8859-1] Sun Feb 28 22:53:26 2016 @@ -33,3 +33,15 @@ #define STRING_NO_REMOTE 108 #define STRING_CANNOT_FIND 109 #define STRING_UNSUPPORTED_TYPE 110 +#define STRING_MISSING_INTEGER 111 +#define STRING_MISSING_HEXDATA 112 +#define STRING_UNHANDLED_TYPE 113 +#define STRING_OVERWRITE_VALUE 114 +#define STRING_YESNO 115 +#define STRING_YES 116 +#define STRING_NO 117 +#define STRING_CANCELLED 118 +#define STRING_DEFAULT_VALUE 119 +#define STRING_DELETE_VALUE 120 +#define STRING_DELETE_VALUEALL 121 +#define STRING_DELETE_SUBKEY 122 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 28 22:53:26 2016 @@ -229,7 +229,7 @@ ReactOS shares the following programs with Winehq. reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.55 -reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.9.4 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.55 reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.55 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70803: [UNICODE] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 28 Feb '16

28 Feb '16

Author: akhaldi Date: Sun Feb 28 22:40:54 2016 New Revision: 70803 URL: http://svn.reactos.org/svn/reactos?rev=70803&view=rev Log: [UNICODE] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/unicode/c_10001.c trunk/reactos/tools/unicode/c_10002.c trunk/reactos/tools/unicode/c_10003.c trunk/reactos/tools/unicode/c_10008.c trunk/reactos/tools/unicode/c_1361.c trunk/reactos/tools/unicode/c_20932.c trunk/reactos/tools/unicode/c_932.c trunk/reactos/tools/unicode/c_936.c trunk/reactos/tools/unicode/c_949.c trunk/reactos/tools/unicode/c_950.c trunk/reactos/tools/unicode/casemap.c trunk/reactos/tools/unicode/compose.c trunk/reactos/tools/unicode/cptable.c trunk/reactos/tools/unicode/mbtowc.c trunk/reactos/tools/unicode/sortkey.c trunk/reactos/tools/unicode/utf8.c trunk/reactos/tools/unicode/wctomb.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/unicode/c_10001.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10001.c?re… Modified: trunk/reactos/tools/unicode/c_10002.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10002.c?re… Modified: trunk/reactos/tools/unicode/c_10003.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10003.c?re… Modified: trunk/reactos/tools/unicode/c_10008.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10008.c?re… Modified: trunk/reactos/tools/unicode/c_1361.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1361.c?rev… Modified: trunk/reactos/tools/unicode/c_20932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20932.c?re… Modified: trunk/reactos/tools/unicode/c_932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_932.c?rev=… Modified: trunk/reactos/tools/unicode/c_936.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_936.c?rev=… Modified: trunk/reactos/tools/unicode/c_949.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_949.c?rev=… Modified: trunk/reactos/tools/unicode/c_950.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_950.c?rev=… Modified: trunk/reactos/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/casemap.c?re… Modified: trunk/reactos/tools/unicode/compose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/compose.c?re… Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cptable.c?re… Modified: trunk/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/mbtowc.c?rev… Modified: trunk/reactos/tools/unicode/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/sortkey.c?re… Modified: trunk/reactos/tools/unicode/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/utf8.c?rev=7… Modified: trunk/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctomb.c?rev…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs