March 2014 - Wine-Commits - list.winehq.org

Stefan Dösinger : d3d9/tests: Show that a failing SetPrivateData call does not clear the old contents.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 379c6564dbb024c45f6cc7ce1063885988cdd7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=379c6564dbb024c45f6cc7ce1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:09 2014 +0100 d3d9/tests: Show that a failing SetPrivateData call does not clear the old contents. --- dlls/d3d9/tests/device.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 08a5be4..93f43fa 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5109,6 +5109,20 @@ static void test_private_data(void) device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* A failing SetPrivateData call does not clear the old data with the same tag. */ + hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + sizeof(device), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + sizeof(device) * 2, D3DSPD_IUNKNOWN); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DVertexBuffer9, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + IUnknown_Release(ptr); + hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); @@ -5176,6 +5190,7 @@ static void test_private_data(void) ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); hr = IDirect3DSurface9_GetPrivateData(surface2, &IID_IDirect3DVertexBuffer9, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr);

1 0

Sebastian Lackner : ntdll: Fix possible race-condition in iocp poller code.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 9277fcfdb4ff787bbf63e640bb7ed67567ed330d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9277fcfdb4ff787bbf63e640b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 10 18:51:21 2014 +0100 ntdll: Fix possible race-condition in iocp poller code. --- dlls/ntdll/threadpool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 5bf3385..e2fc6a5 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -235,12 +235,14 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, */ static DWORD CALLBACK iocp_poller(LPVOID Arg) { + HANDLE cport = Arg; + while( TRUE ) { PRTL_OVERLAPPED_COMPLETION_ROUTINE callback; LPVOID overlapped; IO_STATUS_BLOCK iosb; - NTSTATUS res = NtRemoveIoCompletion( compl_port, (PULONG_PTR)&callback, (PULONG_PTR)&overlapped, &iosb, NULL ); + NTSTATUS res = NtRemoveIoCompletion( cport, (PULONG_PTR)&callback, (PULONG_PTR)&overlapped, &iosb, NULL ); if (res) { ERR("NtRemoveIoCompletion failed: 0x%x\n", res); @@ -297,7 +299,7 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO if (!res) { /* FIXME native can start additional threads in case of e.g. hung callback function. */ - res = RtlQueueWorkItem( iocp_poller, NULL, WT_EXECUTEDEFAULT ); + res = RtlQueueWorkItem( iocp_poller, cport, WT_EXECUTEDEFAULT ); if (!res) compl_port = cport; else

1 0

Stefan Dösinger : wined3d: Don' t modify existing data if set_private_data fails.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: ab6368b6e8a6aa202f7c2aa34eef5c3307b54d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6368b6e8a6aa202f7c2aa34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:08 2014 +0100 wined3d: Don't modify existing data if set_private_data fails. --- dlls/wined3d/resource.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 177d23e..04c3af4 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -211,7 +211,11 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", resource, debugstr_guid(guid), data, data_size, flags); - wined3d_resource_free_private_data(resource, guid); + if (flags & WINED3DSPD_IUNKNOWN && data_size != sizeof(IUnknown *)) + { + WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); + return WINED3DERR_INVALIDCALL; + } d = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d)); if (!d) return E_OUTOFMEMORY; @@ -221,12 +225,6 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc if (flags & WINED3DSPD_IUNKNOWN) { - if (data_size != sizeof(IUnknown *)) - { - WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); - HeapFree(GetProcessHeap(), 0, d); - return WINED3DERR_INVALIDCALL; - } d->ptr.object = (IUnknown *)data; d->size = sizeof(IUnknown *); IUnknown_AddRef(d->ptr.object); @@ -242,6 +240,7 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc d->size = data_size; memcpy(d->ptr.data, data, data_size); } + wined3d_resource_free_private_data(resource, guid); list_add_tail(&resource->privateData, &d->entry); return WINED3D_OK;

1 0

Henri Verbeet : user32: Fix TEXT_WordBreak() when no characters fit.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: ec66785f02ff5fba9ec7a18a8697c19140059ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec66785f02ff5fba9ec7a18a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:43 2014 +0100 user32: Fix TEXT_WordBreak() when no characters fit. --- dlls/user32/tests/text.c | 16 ++++++++++++++++ dlls/user32/text.c | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 217baab..19bcd72 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -42,6 +42,8 @@ static void test_DrawTextCalcRect(void) 's','t','r','i','n','g','\0'}; static CHAR emptystring[] = ""; static WCHAR emptystringW[] = { 0 }; + static CHAR wordbreak_text[] = "line1 line2"; + static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }; BOOL ret; @@ -556,6 +558,20 @@ static void test_DrawTextCalcRect(void) ok(rect.bottom, "rect.bottom should not be 0\n"); } + SetRect(&rect, 0, 0, 1, 1); + heightcheck = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + + SetRect(&rect, 0, 0, 1, 1); + heightcheck = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %u\n", GetLastError()); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 7bef476..fdc3554 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -379,7 +379,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, i = chars_fit; word_fits = TRUE; if (!chars_fit) - ; /* we pretend that it fits anyway */ + word_fits = FALSE; else if (sla[i].fSoftBreak) /* chars_fit < *len_str so this is valid */ { /* the word just fitted */ @@ -392,7 +392,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, word_fits = (i != 0 || sla[i+1].fSoftBreak ); } - /* If there was one or the first character didn't fit then */ + /* If there was one. */ if (word_fits) { BOOL next_is_space;

1 0

Henri Verbeet : ddraw/tests: Skip the overlay tests in test_block_formats_creation() if overlays are not supported.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 82780d6ba62f105e06a96fa5c0328a65078ca047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82780d6ba62f105e06a96fa5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:46 2014 +0100 ddraw/tests: Skip the overlay tests in test_block_formats_creation() if overlays are not supported. --- dlls/ddraw/tests/ddraw4.c | 11 ++++++++++- dlls/ddraw/tests/ddraw7.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3b1f8d4..bb725e7 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4043,6 +4043,8 @@ static void test_block_formats_creation(void) DWORD supported_fmts = 0, supported_overlay_fmts = 0; DWORD num_fourcc_codes = 0, *fourcc_codes; DDSURFACEDESC2 ddsd; + DDCAPS hal_caps; + static const struct { DWORD fourcc; @@ -4132,12 +4134,19 @@ static void test_block_formats_creation(void) } HeapFree(GetProcessHeap(), 0, fourcc_codes); + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) { for (j = 0; j < sizeof(types) / sizeof(*types); j++) { BOOL support; - if (formats[i].overlay != types[j].overlay) + + if (formats[i].overlay != types[j].overlay + || (types[j].overlay && !(hal_caps.dwCaps & DDCAPS_OVERLAY))) continue; if (formats[i].overlay) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b4570af..15e89a1 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3850,6 +3850,8 @@ static void test_block_formats_creation(void) DWORD supported_fmts = 0, supported_overlay_fmts = 0; DWORD num_fourcc_codes = 0, *fourcc_codes; DDSURFACEDESC2 ddsd; + DDCAPS hal_caps; + static const struct { DWORD fourcc; @@ -3939,12 +3941,19 @@ static void test_block_formats_creation(void) } HeapFree(GetProcessHeap(), 0, fourcc_codes); + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) { for (j = 0; j < sizeof(types) / sizeof(*types); j++) { BOOL support; - if (formats[i].overlay != types[j].overlay) + + if (formats[i].overlay != types[j].overlay + || (types[j].overlay && !(hal_caps.dwCaps & DDCAPS_OVERLAY))) continue; if (formats[i].overlay)

1 0

Rico Schüller : d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 9809a3670c50723e9b5a63fbd05b1cf06408eb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9809a3670c50723e9b5a63fbd… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Mar 10 19:47:36 2014 +0100 d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported. --- dlls/d3dx9_36/tests/texture.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 631a658..aea09d5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -304,14 +304,14 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_R3G3B2))) expected = D3DFMT_R3G3B2; + else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4))) + expected = D3DFMT_X4R4G4B4; + else if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X1R5G5B5))) + expected = D3DFMT_X1R5G5B5; else - { - if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, - mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_X4R4G4B4))) - expected = D3DFMT_X4R4G4B4; - else - expected = D3DFMT_X1R5G5B5; - } + expected = D3DFMT_R5G6B5; format = D3DFMT_R3G3B2; hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT);

1 0

Alexandre Julliard : configure: Always run makedep on the top-level makefile.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 25084233d4d23d3bd66ac9f6f130a50ae8fb03e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25084233d4d23d3bd66ac9f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 11:23:35 2014 +0100 configure: Always run makedep on the top-level makefile. --- configure | 7 +++++-- configure.ac | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/configure b/configure index b82130e..b802bc2 100755 --- a/configure +++ b/configure @@ -4846,13 +4846,16 @@ else fi fi if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep wine_cv_toolsdir="\$(top_builddir)" elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep case "$wine_cv_toolsdir" in /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 else as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 fi @@ -16578,7 +16581,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[ch] *.yy.c .MAKEFILEDEPS: all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status Make.tmp Makefile && \$(MAKEDEP) ." + @./config.status Make.tmp Makefile" test "$srcdir" = . && wine_fn_append_rule "all: .gitignore .gitignore: config.status @@ -18236,7 +18239,7 @@ wine_fn_output_makedep () } wine_fn_output_makefile () { - cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && return + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$1 && rm -f Make.tmp && "$wine_makedep" . && return `cat $wine_rules_file` _WINE_EOF as_fn_error $? "could not create Makefile" "$LINENO" 5 diff --git a/configure.ac b/configure.ac index ee8cd1a..a7b90ac 100644 --- a/configure.ac +++ b/configure.ac @@ -215,13 +215,16 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, fi fi if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep wine_cv_toolsdir="\$(top_builddir)" elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep case "$wine_cv_toolsdir" in /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) else AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi]) @@ -2593,7 +2596,7 @@ CLEAN_FILES = *.o *.a *.so *.res *.fake *.ok *.tab.[[ch]] *.yy.c .MAKEFILEDEPS: all: Makefile Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status Make.tmp Makefile && \$(MAKEDEP) .]) + @./config.status Make.tmp Makefile]) test "$srcdir" = . && WINE_APPEND_RULE( [all: .gitignore @@ -3461,7 +3464,7 @@ fi AC_CONFIG_COMMANDS([Makefile], [wine_fn_output_makefile Makefile], [wine_fn_output_makefile () { - cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && return + cat Make.tmp - <<\_WINE_EOF >\$tmp/makefile && mv -f \$tmp/makefile \$[]1 && rm -f Make.tmp && "$wine_makedep" . && return `cat $wine_rules_file` _WINE_EOF AS_ERROR([could not create Makefile])

1 0

Ken Thomases : winex11: Don' t leak client window and colormap when pixel format is changed.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: eef81f5ecc27cac8bc2bf4eacdc0934cb7e30c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef81f5ecc27cac8bc2bf4eac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 10 18:23:13 2014 -0500 winex11: Don't leak client window and colormap when pixel format is changed. --- dlls/winex11.drv/window.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4da361a..2ca5ec2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1378,6 +1378,13 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi int cx = min( max( 1, data->client_rect.right - data->client_rect.left ), 65535 ); int cy = min( max( 1, data->client_rect.bottom - data->client_rect.top ), 65535 ); + if (data->client_window) + { + XDeleteContext( data->display, data->client_window, winContext ); + XDestroyWindow( data->display, data->client_window ); + } + + if (data->colormap) XFreeColormap( data->display, data->colormap ); data->colormap = XCreateColormap( data->display, root_window, visual->visual, (visual->class == PseudoColor || visual->class == GrayScale ||

1 0

Frédéric Delanoy : cmd/tests: Correctly determine script path for root directories.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: f80dd2469f0560714710f6f4e1d4905b17abb8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80dd2469f0560714710f6f4e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 11 00:16:27 2014 +0100 cmd/tests: Correctly determine script path for root directories. --- programs/cmd/tests/batch.c | 10 ++++++++-- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index c011d70..9df0bc5 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -459,8 +459,14 @@ START_TEST(batch) drive[0] = workdir[0]; drive[1] = workdir[1]; /* Should be ':' */ memcpy(path, workdir + drive_len, (workdir_len - drive_len) * sizeof(drive[0])); - path[workdir_len - drive_len] = '\\'; - path_len = workdir_len - drive_len + 1; + + /* Only add trailing backslash to 'path' for non-root directory */ + if (workdir_len - drive_len > 1) { + path[workdir_len - drive_len] = '\\'; + path_len = workdir_len - drive_len + 1; + } else { + path_len = 1; /* \ */ + } shortpath_len = GetShortPathNameA(path, shortpath, sizeof(shortpath)/sizeof(shortpath[0])); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1d1eea4..16fdd43 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -308,6 +308,13 @@ set WINE_FOO= echo ------------ Testing variable expansion ------------ call :setError 0 +echo ~p0 should be path containing batch file +echo %~p0 +mkdir dummydir +cd dummydir +echo %~p0 +cd .. +rmdir dummydir echo ~dp0 should be directory containing batch file echo %~dp0 mkdir dummydir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7380185..1575984 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -259,6 +259,9 @@ foo 'jim' 'apple"banana"grape' ------------ Testing variable expansion ------------ +~p0 should be path containing batch file +(a)path@ +(a)path@ ~dp0 should be directory containing batch file @pwd@\ @pwd@\

1 0

Michael Stefaniuc : dmcompos: COM cleanup for the IDirectMusicChordMap iface.
by Alexandre Julliard March 11, 2014

March 11, 2014

Module: wine Branch: master Commit: 4f03d5d1aebc0c828f3083b92b69cf5d8c77ca90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f03d5d1aebc0c828f3083b92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 10 23:53:11 2014 +0100 dmcompos: COM cleanup for the IDirectMusicChordMap iface. --- dlls/dmcompos/chordmap.c | 48 +++++++++++++++++++++++--------------- dlls/dmcompos/dmcompos_private.h | 2 +- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index 21849b8..2d22f37 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -23,7 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); WINE_DECLARE_DEBUG_CHANNEL(dmfile); static ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef (LPDIRECTMUSICCHORDMAP iface); static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); static ULONG WINAPI IDirectMusicChordMapImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); @@ -40,8 +39,8 @@ static HRESULT WINAPI IDirectMusicChordMapImpl_IUnknown_QueryInterface (LPUNKNOW IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicChordMap)) { - *ppobj = &This->ChordMapVtbl; - IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef ((LPDIRECTMUSICCHORDMAP)&This->ChordMapVtbl); + *ppobj = &This->IDirectMusicChordMap_iface; + IDirectMusicChordMap_AddRef(&This->IDirectMusicChordMap_iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; @@ -90,32 +89,43 @@ static const IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl = { }; /* IDirectMusicChordMapImpl IDirectMusicChordMap part: */ -static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface (LPDIRECTMUSICCHORDMAP iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); +static inline IDirectMusicChordMapImpl *impl_from_IDirectMusicChordMap(IDirectMusicChordMap *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicChordMapImpl, IDirectMusicChordMap_iface); +} + +static HRESULT WINAPI IDirectMusicChordMapImpl_QueryInterface(IDirectMusicChordMap *iface, + REFIID riid, void **ppobj) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); return IDirectMusicChordMapImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef (LPDIRECTMUSICCHORDMAP iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); +static ULONG WINAPI IDirectMusicChordMapImpl_AddRef(IDirectMusicChordMap *iface) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); return IDirectMusicChordMapImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_Release (LPDIRECTMUSICCHORDMAP iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); +static ULONG WINAPI IDirectMusicChordMapImpl_Release(IDirectMusicChordMap *iface) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); return IDirectMusicChordMapImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_GetScale (LPDIRECTMUSICCHORDMAP iface, DWORD* pdwScale) { - ICOM_THIS_MULTI(IDirectMusicChordMapImpl, ChordMapVtbl, iface); - FIXME("(%p, %p): stub\n", This, pdwScale); - return S_OK; +static HRESULT WINAPI IDirectMusicChordMapImpl_GetScale(IDirectMusicChordMap *iface, + DWORD *pdwScale) +{ + IDirectMusicChordMapImpl *This = impl_from_IDirectMusicChordMap(iface); + FIXME("(%p, %p): stub\n", This, pdwScale); + return S_OK; } -static const IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl = { - IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface, - IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef, - IDirectMusicChordMapImpl_IDirectMusicChordMap_Release, - IDirectMusicChordMapImpl_IDirectMusicChordMap_GetScale +static const IDirectMusicChordMapVtbl dmchordmap_vtbl = { + IDirectMusicChordMapImpl_QueryInterface, + IDirectMusicChordMapImpl_AddRef, + IDirectMusicChordMapImpl_Release, + IDirectMusicChordMapImpl_GetScale }; /* IDirectMusicChordMapImpl IDirectMusicObject part: */ @@ -534,7 +544,7 @@ HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } obj->UnknownVtbl = &DirectMusicChordMap_Unknown_Vtbl; - obj->ChordMapVtbl = &DirectMusicChordMap_ChordMap_Vtbl; + obj->IDirectMusicChordMap_iface.lpVtbl = &dmchordmap_vtbl; obj->ObjectVtbl = &DirectMusicChordMap_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicChordMap_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 34ca422..6f680e5 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -63,7 +63,7 @@ extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECL struct IDirectMusicChordMapImpl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicChordMapVtbl *ChordMapVtbl; + IDirectMusicChordMap IDirectMusicChordMap_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref;

1 0