November 2012 - Wine-Commits

Jason Edmeades : cmd: Add support for NUL in copy.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: d16f4e700bc16e174bfff8c430cfa93b1f9076fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16f4e700bc16e174bfff8c43… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Nov 9 22:36:30 2012 +0000 cmd: Add support for NUL in copy. --- programs/cmd/builtins.c | 52 ++++++++++++++++++++++-------- programs/cmd/tests/test_builtins.cmd | 17 +++++++++- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++- 3 files changed, 61 insertions(+), 16 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2e7fdd9..8715c51 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -47,6 +47,7 @@ const WCHAR slashW[] = {'\\','\0'}; const WCHAR equalW[] = {'=','\0'}; const WCHAR wildcardsW[] = {'*','?','\0'}; const WCHAR slashstarW[] = {'\\','*','\0'}; +const WCHAR deviceW[] = {'\\','\\','.','\\','\0'}; const WCHAR inbuilt[][10] = { {'C','A','L','L','\0'}, {'C','D','\0'}, @@ -414,7 +415,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app BOOL ok; DWORD bytesread, byteswritten; - WINE_TRACE("ASCII Copying %s to %s (append?%d)\n", + WINE_TRACE("Manual Copying %s to %s (append?%d)\n", wine_dbgstr_w(srcname), wine_dbgstr_w(dstname), append); in = CreateFileW(srcname, GENERIC_READ, 0, NULL, @@ -502,7 +503,7 @@ void WCMD_copy(WCHAR * args) { int argno = 0; WCHAR *rawarg; WIN32_FIND_DATAW fd; - HANDLE hff; + HANDLE hff = INVALID_HANDLE_VALUE; int binarymode = -1; /* -1 means use the default, 1 is binary, 0 ascii */ BOOL concatnextfilename = FALSE; /* True if we have just processed a + */ BOOL anyconcats = FALSE; /* Have we found any + options */ @@ -514,6 +515,7 @@ void WCMD_copy(WCHAR * args) { BOOL status; WCHAR copycmd[4]; DWORD len; + BOOL dstisdevice = FALSE; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; typedef struct _COPY_FILES @@ -785,6 +787,12 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Resolved destination is '%s' (calc later %d)\n", wine_dbgstr_w(destname), appendfirstsource); + /* Remember if the destination is a device */ + if (strncmpW(destination->name, deviceW, strlenW(deviceW)) == 0) { + WINE_TRACE("Destination is a device\n"); + dstisdevice = TRUE; + } + /* Now we need to walk the set of sources, and process each name we come to. If anyconcats is true, we are writing to one file, otherwise we are using the source name each time. @@ -800,8 +808,10 @@ void WCMD_copy(WCHAR * args) { while (thiscopy != NULL) { WCHAR srcpath[MAX_PATH]; + const WCHAR *srcname; WCHAR *filenamepart; DWORD attributes; + BOOL srcisdevice = FALSE; /* If it was not explicit, we now know whether we are concatenating or not and hence whether to copy as binary or ascii */ @@ -836,29 +846,41 @@ void WCMD_copy(WCHAR * args) { WINE_TRACE("Copy source (calculated): path: '%s' (Concats: %d)\n", wine_dbgstr_w(srcpath), anyconcats); - /* Loop through all source files */ - WINE_TRACE("Searching for: '%s'\n", wine_dbgstr_w(srcpath)); - hff = FindFirstFileW(srcpath, &fd); - if (hff != INVALID_HANDLE_VALUE) { + /* If the source is a device, just use it, otherwise search */ + if (strncmpW(srcpath, deviceW, strlenW(deviceW)) == 0) { + WINE_TRACE("Source is a device\n"); + srcisdevice = TRUE; + srcname = &srcpath[4]; /* After the \\.\ prefix */ + } else { + + /* Loop through all source files */ + WINE_TRACE("Searching for: '%s'\n", wine_dbgstr_w(srcpath)); + hff = FindFirstFileW(srcpath, &fd); + if (hff != INVALID_HANDLE_VALUE) { + srcname = fd.cFileName; + } + } + + if (srcisdevice || hff != INVALID_HANDLE_VALUE) { do { WCHAR outname[MAX_PATH]; BOOL overwrite; /* Skip . and .., and directories */ - if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + if (!srcisdevice && fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { WINE_TRACE("Skipping directories\n"); } else { /* Build final destination name */ strcpyW(outname, destination->name); - if (destisdirectory || appendfirstsource) strcatW(outname, fd.cFileName); + if (destisdirectory || appendfirstsource) strcatW(outname, srcname); /* Build source name */ - strcpyW(filenamepart, fd.cFileName); + if (!srcisdevice) strcpyW(filenamepart, srcname); - /* Do we just overwrite */ + /* Do we just overwrite (we do if we are writing to a device) */ overwrite = !prompt; - if (anyconcats && writtenoneconcat) { + if (dstisdevice || (anyconcats && writtenoneconcat)) { overwrite = TRUE; } @@ -879,7 +901,7 @@ void WCMD_copy(WCHAR * args) { else overwrite = TRUE; } - /* If we needed tyo save away the first filename, do it */ + /* If we needed to save away the first filename, do it */ if (appendfirstsource && overwrite) { heap_free(destination->name); destination->name = heap_strdupW(outname); @@ -898,6 +920,8 @@ void WCMD_copy(WCHAR * args) { } } else if (!thiscopy->binarycopy) { status = WCMD_ManualCopy(srcpath, outname, TRUE, FALSE); + } else if (srcisdevice) { + status = WCMD_ManualCopy(srcpath, outname, FALSE, FALSE); } else { status = CopyFileW(srcpath, outname, FALSE); } @@ -921,8 +945,8 @@ void WCMD_copy(WCHAR * args) { } } } - } while (FindNextFileW(hff, &fd) != 0); - FindClose (hff); + } while (!srcisdevice && FindNextFileW(hff, &fd) != 0); + if (!srcisdevice) FindClose (hff); } else { /* Error if the first file was not found */ if (!anyconcats || (anyconcats && !writtenoneconcat)) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 93ef7e2..eb9b888 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -607,7 +607,22 @@ if exist foo ( ) else ( echo *** ) -cd .. & rd foobar +echo 1234 >a.a +copy a.a+NUL b.b >nul +call :CheckFileSize a.a 7 b.b 8 +copy NUL+a.a b.b >nul +call :CheckFileSize a.a 7 b.b 8 +mkdir subdir +copy a.a+NUL subdir\ >nul +call :CheckFileSize a.a 7 subdir\a.a 8 +del subdir\a.a +cd subdir +copy ..\a.a NUL >nul +if exist a.a echo Failed +cd .. +rd subdir /s /q +del a.a b.b +cd .. & rd foobar /s /q echo ------------ Testing if/else ------------ echo --- if/else should work with blocks diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 218db9c..e7300b4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -415,7 +415,13 @@ bar bar bar NUL -(a)todo_wine@foo created +foo created +Passed: file size check on a.a [7]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on b.b [8]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on a.a [7]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on b.b [8]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on a.a [7]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on subdir\a.a [8]@or_broken(a)Skipping file size check on NT4 ------------ Testing if/else ------------ --- if/else should work with blocks if seems to work

1 0

Jason Edmeades : cmd: Prevent external env vars causing tests to fail.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 2e92853091262fee67f651dfc6a0188e349ba0b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e92853091262fee67f651dfc… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Nov 8 22:06:21 2012 +0000 cmd: Prevent external env vars causing tests to fail. --- programs/cmd/tests/test_builtins.cmd | 683 +++++++++++++++--------------- programs/cmd/tests/test_builtins.cmd.exp | 36 +- 2 files changed, 362 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e92853091262fee67f65…

1 0

Henri Verbeet : d3d9: Avoid resetting device state for d3d9ex resets.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 79f0b4d9771d7fbd553770f7337309a7d96527e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f0b4d9771d7fbd553770f73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:12 2012 +0100 d3d9: Avoid resetting device state for d3d9ex resets. --- dlls/d3d8/device.c | 3 +- dlls/d3d9/device.c | 11 ++---- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 70 ++++++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c73f065..b4bd3f9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -597,7 +597,8 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback))) + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + NULL, reset_enum_callback, TRUE))) { wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->lost = FALSE; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ce5bf1a..0c70f96 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -582,8 +582,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback); - if (FAILED(hr)) + hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + NULL, reset_enum_callback, !device->d3d_parent->extended); + if (FAILED(hr) && !device->d3d_parent->extended) device->not_reset = TRUE; else device->not_reset = FALSE; @@ -2907,11 +2908,7 @@ static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - mode ? &wined3d_mode : NULL, reset_enum_callback); - if (FAILED(hr)) - device->not_reset = TRUE; - else - device->not_reset = FALSE; + mode ? &wined3d_mode : NULL, reset_enum_callback, FALSE); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 376db17..14fc73d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2867,7 +2867,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, swapchain_desc.backbuffer_format = mode.format_id; hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback); + &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE); if (FAILED(hr)) { ERR("Failed to reset device.\n"); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16287ad..ea11f70 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4974,15 +4974,15 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru /* Do not call while under the GL lock. */ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, - wined3d_device_reset_cb callback) + wined3d_device_reset_cb callback, BOOL reset_state) { struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_display_mode m; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; + HRESULT hr = WINED3D_OK; unsigned int i; - HRESULT hr; TRACE("device %p, swapchain_desc %p, mode %p, callback %p.\n", device, swapchain_desc, mode, callback); @@ -4992,7 +4992,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - stateblock_unbind_resources(device->stateBlock); + if (reset_state) + stateblock_unbind_resources(device->stateBlock); + if (device->fb.render_targets) { if (swapchain->back_buffers && swapchain->back_buffers[0]) @@ -5012,11 +5014,14 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->onscreen_depth_stencil = NULL; } - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + if (reset_state) { - TRACE("Enumerating resource %p.\n", resource); - if (FAILED(hr = callback(resource))) - return hr; + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Enumerating resource %p.\n", resource); + if (FAILED(hr = callback(resource))) + return hr; + } } /* Is it necessary to recreate the gl context? Actually every setting can be changed @@ -5067,8 +5072,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->enable_auto_depth_stencil && !device->auto_depth_stencil) { - HRESULT hr; - TRACE("Creating the depth stencil buffer\n"); if (FAILED(hr = device->device_parent->ops->create_swapchain_surface(device->device_parent, @@ -5222,28 +5225,49 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->exStyle = exStyle; } - TRACE("Resetting stateblock.\n"); - wined3d_stateblock_decref(device->updateStateBlock); - wined3d_stateblock_decref(device->stateBlock); + if (reset_state) + { + TRACE("Resetting stateblock.\n"); + wined3d_stateblock_decref(device->updateStateBlock); + wined3d_stateblock_decref(device->stateBlock); - if (device->d3d_initialized) - delete_opengl_contexts(device, swapchain); + if (device->d3d_initialized) + delete_opengl_contexts(device, swapchain); - /* Note: No parent needed for initial internal stateblock */ - hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); - if (FAILED(hr)) - ERR("Resetting the stateblock failed with error %#x.\n", hr); + /* Note: No parent needed for initial internal stateblock */ + hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); + if (FAILED(hr)) + ERR("Resetting the stateblock failed with error %#x.\n", hr); + else + TRACE("Created stateblock %p.\n", device->stateBlock); + device->updateStateBlock = device->stateBlock; + wined3d_stateblock_incref(device->updateStateBlock); + + stateblock_init_default_state(device->stateBlock); + } else - TRACE("Created stateblock %p.\n", device->stateBlock); - device->updateStateBlock = device->stateBlock; - wined3d_stateblock_incref(device->updateStateBlock); + { + struct wined3d_surface *rt = device->fb.render_targets[0]; + struct wined3d_state *state = &device->stateBlock->state; - stateblock_init_default_state(device->stateBlock); + /* Note the min_z / max_z is not reset. */ + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = rt->resource.width; + state->viewport.height = rt->resource.height; + device_invalidate_state(device, STATE_VIEWPORT); + + state->scissor_rect.top = 0; + state->scissor_rect.left = 0; + state->scissor_rect.right = rt->resource.width; + state->scissor_rect.bottom = rt->resource.height; + device_invalidate_state(device, STATE_SCISSORRECT); + } swapchain_update_render_to_fbo(swapchain); swapchain_update_draw_bindings(swapchain); - if (device->d3d_initialized) + if (reset_state && device->d3d_initialized) hr = create_primary_opengl_context(device, swapchain); /* All done. There is no need to reload resources or shaders, this will happen automatically on the diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f8364e1..e97c102 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -102,7 +102,7 @@ @ cdecl wined3d_device_present(ptr ptr ptr ptr ptr long) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) -@ cdecl wined3d_device_reset(ptr ptr ptr ptr) +@ cdecl wined3d_device_reset(ptr ptr ptr ptr long) @ cdecl wined3d_device_restore_fullscreen_window(ptr ptr) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_clip_plane(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7169a25..329698a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2184,7 +2184,7 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, - wined3d_device_reset_cb callback); + wined3d_device_reset_cb callback, BOOL reset_state); void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window); void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device,

1 0

Henri Verbeet : d3d9/tests: Create the d3d9ex object in create_device().
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 84da62d9933c75a4a89828ca34da6c8e8303960c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84da62d9933c75a4a89828ca3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:13 2012 +0100 d3d9/tests: Create the d3d9ex object in create_device(). --- dlls/d3d9/tests/d3d9ex.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 8b79b46..6be030c 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -49,11 +49,15 @@ static HWND create_window(void) return ret; } -static IDirect3DDevice9Ex *create_device(IDirect3D9Ex *d3d9, HWND device_window, HWND focus_window, BOOL windowed) +static IDirect3DDevice9Ex *create_device(HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9Ex *device; D3DDISPLAYMODEEX mode, *m; + IDirect3D9Ex *d3d9; + + if (FAILED(pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9))) + return NULL; present_parameters.Windowed = windowed; present_parameters.hDeviceWindow = device_window; @@ -73,16 +77,20 @@ static IDirect3DDevice9Ex *create_device(IDirect3D9Ex *d3d9, HWND device_window, m = windowed ? NULL : &mode; if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) goto done; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) goto done; if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, m, &device))) return device; + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, m, &device))) goto done; + + device = NULL; - return NULL; +done: + IDirect3D9Ex_Release(d3d9); + return device; } static ULONG getref(IUnknown *obj) { @@ -387,21 +395,13 @@ static void test_texture_sysmem_create(void) IDirect3DDevice9Ex *device; IDirect3DTexture9 *texture; D3DLOCKED_RECT locked_rect; - IDirect3D9Ex *d3d9; UINT refcount; HWND window; HRESULT hr; void *mem; - if (FAILED(hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9))) - { - skip("Failed to create IDirect3D9Ex object (hr %#x), skipping tests.\n", hr); - return; - } - window = create_window(); - device = create_device(d3d9, window, window, TRUE); - if (!device) + if (!(device = create_device(window, window, TRUE))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -428,8 +428,6 @@ static void test_texture_sysmem_create(void) done: DestroyWindow(window); - if (d3d9) - IDirect3D9Ex_Release(d3d9); } START_TEST(d3d9ex)

1 0

Nikolay Sivov : xmllite: Store remaining reader input parameters.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: dc2fe2a4bec08235b124950a8501a38ee7f14355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2fe2a4bec08235b124950a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 18 23:33:55 2012 -0500 xmllite: Store remaining reader input parameters. --- dlls/xmllite/reader.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1970ac8..3f22152 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -29,6 +29,7 @@ #include "xmllite_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); @@ -73,6 +74,9 @@ typedef struct _xmlreaderinput /* reference passed on IXmlReaderInput creation, is kept when input is created */ IUnknown *input; IMalloc *imalloc; + xml_encoding encoding; + BOOL hint; + WCHAR *baseuri; /* stream reference set after SetInput() call from reader, stored as sequential stream, cause currently optimizations possible with IStream aren't implemented */ @@ -161,6 +165,21 @@ static inline void readerinput_free(xmlreaderinput *input, void *mem) return m_free(input->imalloc, mem); } +static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = readerinput_alloc(input, size); + if (ret) memcpy(ret, str, size); + } + + return ret; +} + static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) { const int initial_len = 0x2000; @@ -195,6 +214,32 @@ static HRESULT get_code_page(xml_encoding encoding, xmlreaderinput *input) return S_OK; } +static xml_encoding parse_encoding_name(const WCHAR *encoding) +{ + int min, max, n, c; + + if (!encoding) return XmlEncoding_Unknown; + + min = 0; + max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; + + while (min <= max) + { + n = (min+max)/2; + + c = strcmpiW(xml_encoding_map[n].encoding, encoding); + if (!c) + return xml_encoding_map[n].enc; + + if (c > 0) + max = n-1; + else + min = n+1; + } + + return XmlEncoding_Unknown; +} + static HRESULT alloc_input_buffer(xmlreaderinput *input) { input_buffer *buffer; @@ -688,6 +733,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) if (This->input) IUnknown_Release(This->input); if (This->stream) ISequentialStream_Release(This->stream); if (This->buffer) free_input_buffer(This->buffer); + readerinput_free(This, This->baseuri); readerinput_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -747,7 +793,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, xmlreaderinput *readerinput; HRESULT hr; - FIXME("%p %p %s %d %s %p: stub\n", stream, imalloc, wine_dbgstr_w(encoding), + TRACE("%p %p %s %d %s %p\n", stream, imalloc, wine_dbgstr_w(encoding), hint, wine_dbgstr_w(base_uri), ppInput); if (!stream || !ppInput) return E_INVALIDARG; @@ -763,6 +809,9 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput->imalloc = imalloc; readerinput->stream = NULL; if (imalloc) IMalloc_AddRef(imalloc); + readerinput->encoding = parse_encoding_name(encoding); + readerinput->hint = hint; + readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); hr = alloc_input_buffer(readerinput); if (hr != S_OK)

1 0

Jason Edmeades : cmd: Add support for tokens= (for /f).
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 47b35d5545cd9794c299acb0417ab9f2de538fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b35d5545cd9794c299acb04… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Nov 8 21:53:08 2012 +0000 cmd: Add support for tokens= (for /f). --- programs/cmd/builtins.c | 200 +++++++++++++++++++++++++++--- programs/cmd/tests/test_builtins.cmd | 31 +++++ programs/cmd/tests/test_builtins.cmd.exp | 21 +++ 3 files changed, 237 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47b35d5545cd9794c299a…

1 0

Andrew Talbot : crypt32: Remove unused variables.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 8300fd5aa8f57e2c93b2c6c74834e2db697d4ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8300fd5aa8f57e2c93b2c6c74… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 19 22:00:08 2012 +0000 crypt32: Remove unused variables. --- dlls/crypt32/oid.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 4f09e7b..4c3f95f 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1053,9 +1053,6 @@ static const WCHAR rc2[] = { 'r','c','2',0 }; static const WCHAR rc4[] = { 'r','c','4',0 }; static const WCHAR sha[] = { 's','h','a',0 }; static const WCHAR sha1[] = { 's','h','a','1',0 }; -static const WCHAR sha256[] = { 's','h','a','2','5','6',0 }; -static const WCHAR sha384[] = { 's','h','a','3','8','4',0 }; -static const WCHAR sha512[] = { 's','h','a','5','1','2',0 }; static const WCHAR RSA[] = { 'R','S','A',0 }; static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 }; static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 };

1 0

Andrew Talbot : mscoree: Remove unneeded address-of operator from function name.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: d2de810df38c3c0ef4514fe5e4c07fc2df671aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2de810df38c3c0ef4514fe5e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 19 22:00:19 2012 +0000 mscoree: Remove unneeded address-of operator from function name. --- dlls/mscoree/mscoree_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 620fb9b..de37706 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -607,7 +607,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(mscorecf)); This->IClassFactory_iface.lpVtbl = &mscorecf_vtbl; - This->pfnCreateInstance = &create_monodata; + This->pfnCreateInstance = create_monodata; This->ref = 1; This->clsid = *rclsid;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTDRAWCLIPPER.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 0a7e2accc4844e34334d9f58a7e4c2057eeb910d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7e2accc4844e34334d9f58a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:11 2012 +0100 d3drm: Avoid LPDIRECTDRAWCLIPPER. --- dlls/d3drm/d3drm.c | 20 ++++++++++---------- dlls/d3drm/device.c | 10 ++++------ dlls/d3drm/tests/d3drm.c | 4 ++-- include/d3drm.h | 12 ++++++------ include/d3drmobj.h | 6 +++--- 5 files changed, 25 insertions(+), 27 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index cadfd70..e90ce30 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -260,7 +260,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LP return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM* iface, LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, LPDIRECT3DRMDEVICE * ppDevice) +static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM *iface, + IDirectDrawClipper *pDDClipper, GUID *pGUID, int width, int height, + IDirect3DRMDevice **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); @@ -638,10 +640,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2* iface, - LPDIRECTDRAWCLIPPER pDDClipper, - LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2 *iface, + IDirectDrawClipper *pDDClipper, GUID *pGUID, int width, int height, + IDirect3DRMDevice2 **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); @@ -1083,14 +1084,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface, return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3* iface, - LPDIRECTDRAWCLIPPER clipper, - LPGUID GUID, int width, int height, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3 *iface, + IDirectDrawClipper *clipper, GUID *guid, int width, int height, + IDirect3DRMDevice3 **device) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, clipper, debugstr_guid(GUID), + FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, clipper, debugstr_guid(guid), width, height, device); return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index c43c27c..05ca080 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -223,9 +223,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2* iface, - LPDIRECTDRAWCLIPPER lpDDClipper, - LPGUID lpGUID, int width, int height) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2 *iface, + IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -652,9 +651,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3* iface, - LPDIRECTDRAWCLIPPER lpDDClipper, - LPGUID lpGUID, int width, int height) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3 *iface, + IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cde1577..7fee3e1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -944,9 +944,9 @@ static void test_Frame(void) static void test_Viewport(void) { + IDirectDrawClipper *pClipper; HRESULT hr; LPDIRECT3DRM pD3DRM; - LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMFRAME pFrame; LPDIRECT3DRMVIEWPORT pViewport; @@ -1177,9 +1177,9 @@ static void test_Texture(void) static void test_Device(void) { + IDirectDrawClipper *pClipper; HRESULT hr; LPDIRECT3DRM pD3DRM; - LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMWINDEVICE pWinDevice; GUID driver; diff --git a/include/d3drm.h b/include/d3drm.h index b228400..3ec1183 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -72,8 +72,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, @@ -207,8 +207,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, @@ -345,8 +345,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index c0ec232..3bafd9d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -377,7 +377,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; - STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; + STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -504,7 +504,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; - STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; + STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -649,7 +649,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; - STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; + STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECTDRAWSURFACE.
by Alexandre Julliard Nov. 20, 2012

Nov. 20, 2012

Module: wine Branch: master Commit: 34dd6ff2e4811b92639bc54a5615f58472c4b602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34dd6ff2e4811b92639bc54a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 22:04:10 2012 +0100 d3drm: Avoid LPDIRECTDRAWSURFACE. --- dlls/d3drm/d3drm.c | 28 ++++++++++++---------------- dlls/d3drm/device.c | 10 ++++------ dlls/d3drm/frame.c | 16 ++++++++-------- dlls/d3drm/texture.c | 9 ++++++--- include/d3drm.h | 21 ++++++++++++--------- include/d3drmobj.h | 28 ++++++++++++++-------------- 6 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34dd6ff2e4811b92639bc…

1 0