October 2013 - Wine-Commits

Alistair Leslie-Hughes : mscoree: Implement CreateInterface.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 7028e2bbbc9a3155b71fab47d6f3288b69bd0be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7028e2bbbc9a3155b71fab47d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 1 10:17:50 2013 +1000 mscoree: Implement CreateInterface. --- dlls/mscoree/mscoree.spec | 1 + dlls/mscoree/mscoree_main.c | 7 +++++++ dlls/mscoree/tests/mscoree.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index ad883c6..93248e2 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -30,6 +30,7 @@ @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) @ stdcall CreateDebuggingInterfaceFromVersion(long wstr ptr) +@ stdcall CreateInterface(ptr ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index de37706..772ba01 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -594,6 +594,13 @@ HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterfac return CLASS_E_CLASSNOTAVAILABLE; } +HRESULT WINAPI CreateInterface(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) +{ + TRACE("(%s,%s,%p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface); + + return CLRCreateInstance(clsid, riid, ppInterface); +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { mscorecf *This; diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index f8de6fa..41844ef 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -21,6 +21,7 @@ #include "corerror.h" #include "mscoree.h" +#include "metahost.h" #include "shlwapi.h" #include "wine/test.h" @@ -31,6 +32,7 @@ static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); static HRESULT (WINAPI *pCreateConfigStream)(LPCWSTR, IStream**); +static HRESULT (WINAPI *pCreateInterface)(REFCLSID, REFIID, VOID**); static BOOL init_functionpointers(void) { @@ -47,8 +49,10 @@ static BOOL init_functionpointers(void) pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); pCreateConfigStream = (void *)GetProcAddress(hmscoree, "CreateConfigStream"); + pCreateInterface = (void *)GetProcAddress(hmscoree, "CreateInterface"); - if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim) + if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim || + !pCreateInterface) { win_skip("functions not available\n"); FreeLibrary(hmscoree); @@ -386,6 +390,28 @@ static void test_createconfigstream(void) DeleteFileW(file); } +void test_createinstance(void) +{ + HRESULT hr; + ICLRMetaHost *host; + + if(!pCreateInterface) + { + win_skip("Function CreateInterface not found.\n"); + return; + } + + hr = pCreateInterface(&CLSID_CLRMetaHost, &IID_ICLRMetaHost, (void**)&host); + if(SUCCEEDED(hr)) + { + ICLRMetaHost_Release(host); + } + else + { + win_skip(".NET 4 not installed.\n"); + } +} + START_TEST(mscoree) { if (!init_functionpointers()) @@ -394,6 +420,7 @@ START_TEST(mscoree) test_versioninfo(); test_loadlibraryshim(); test_createconfigstream(); + test_createinstance(); FreeLibrary(hmscoree); }

1 0

Akihiro Sagawa : gdi32: Don' t modify output glyph metrics unless the function succeeds.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 88acc9c899f20c3ba92353b7933f0a9f64bed3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88acc9c899f20c3ba92353b79… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 4 00:56:17 2013 +0900 gdi32: Don't modify output glyph metrics unless the function succeeds. --- dlls/gdi32/freetype.c | 53 ++++++++++++++++++++++++---------------------- dlls/gdi32/tests/font.c | 5 ++++ 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ca9e18f..ab7b99f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6184,6 +6184,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, const MAT2* lpmat) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; + GLYPHMETRICS gm; FT_Face ft_face = incoming_font->ft_face; GdiFont *font = incoming_font; FT_Glyph_Metrics metrics; @@ -6419,8 +6420,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, top = (metrics.horiBearingY + 63) & -64; bottom = (metrics.horiBearingY - metrics.height) & -64; - lpgm->gmCellIncX = adv; - lpgm->gmCellIncY = 0; + gm.gmCellIncX = adv; + gm.gmCellIncY = 0; origin_x = left; origin_y = top; } else { @@ -6492,14 +6493,14 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncY = -((vec.y+63) >> 6); + gm.gmCellIncY = -((vec.y+63) >> 6); if (!avgAdvance || vec.y) - lpgm->gmCellIncX = (vec.x+63) >> 6; + gm.gmCellIncX = (vec.x+63) >> 6; else { vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; + gm.gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } if (vertical_metrics) @@ -6520,28 +6521,29 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width = (right - left) >> 6; height = (top - bottom) >> 6; - lpgm->gmBlackBoxX = width ? width : 1; - lpgm->gmBlackBoxY = height ? height : 1; - lpgm->gmptGlyphOrigin.x = origin_x >> 6; - lpgm->gmptGlyphOrigin.y = origin_y >> 6; + gm.gmBlackBoxX = width ? width : 1; + gm.gmBlackBoxY = height ? height : 1; + gm.gmptGlyphOrigin.x = origin_x >> 6; + gm.gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; - abc->abcB = lpgm->gmBlackBoxX; + abc->abcB = gm.gmBlackBoxX; abc->abcC = adv - abc->abcA - abc->abcB; - TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, - wine_dbgstr_point(&lpgm->gmptGlyphOrigin), - lpgm->gmCellIncX, lpgm->gmCellIncY); + TRACE("%u,%u,%s,%d,%d\n", gm.gmBlackBoxX, gm.gmBlackBoxY, + wine_dbgstr_point(&gm.gmptGlyphOrigin), + gm.gmCellIncX, gm.gmCellIncY); if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) && is_identity_MAT2(lpmat)) /* don't cache custom transforms */ { - FONT_GM(font,original_index)->gm = *lpgm; + FONT_GM(font,original_index)->gm = gm; FONT_GM(font,original_index)->abc = *abc; FONT_GM(font,original_index)->init = TRUE; } if(format == GGO_METRICS) { + *lpgm = gm; return 1; /* FIXME */ } @@ -6626,7 +6628,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, src += ft_face->glyph->bitmap.pitch; dst += pitch; } - return needed; + break; } case ft_glyph_format_outline: { @@ -6654,7 +6656,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, start += pitch; } } - return needed; + break; } default: @@ -6717,7 +6719,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!width || !height) { - if (!buf || !buflen) return 0; + if (!buf || !buflen) break; return GDI_ERROR; } @@ -6725,18 +6727,18 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { if ( render_mode == FT_RENDER_MODE_LCD) { - lpgm->gmBlackBoxX += 2; - lpgm->gmptGlyphOrigin.x -= 1; + gm.gmBlackBoxX += 2; + gm.gmptGlyphOrigin.x -= 1; } else { - lpgm->gmBlackBoxY += 2; - lpgm->gmptGlyphOrigin.y += 1; + gm.gmBlackBoxY += 2; + gm.gmptGlyphOrigin.y += 1; } } - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; + width = gm.gmBlackBoxX; + height = gm.gmBlackBoxY; pitch = width * 4; needed = pitch * height; @@ -6771,7 +6773,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vmul = 3; } - x_shift = ft_face->glyph->bitmap_left - lpgm->gmptGlyphOrigin.x; + x_shift = ft_face->glyph->bitmap_left - gm.gmptGlyphOrigin.x; if ( x_shift < 0 ) { src += hmul * -x_shift; @@ -6783,7 +6785,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width -= x_shift; } - y_shift = lpgm->gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; + y_shift = gm.gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; if ( y_shift < 0 ) { src += src_pitch * vmul * -y_shift; @@ -7025,6 +7027,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FIXME("Unsupported format %d\n", format); return GDI_ERROR; } + *lpgm = gm; return needed; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 031b86a..2343db6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4172,7 +4172,12 @@ static void test_GetGlyphOutline(void) ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } else + { ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret); + memset(&gm2, 0xab, sizeof(gm2)); + ok(memcmp(&gm, &gm2, sizeof(GLYPHMETRICS)) == 0, + "%2d:GLYPHMETRICS shouldn't be touched on error\n", fmt[i]); + } } }

1 0

Alexandre Julliard : configure: Use the correct strip program when installing.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 4732b2f4ea6f550d6c942161972573ca5ace7629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4732b2f4ea6f550d6c9421619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 3 21:35:33 2013 +0200 configure: Use the correct strip program when installing. --- Make.vars.in | 1 + configure | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++ 3 files changed, 100 insertions(+), 0 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index ea3869d..d10e70e 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -39,6 +39,7 @@ DLLTOOL = @DLLTOOL@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ +STRIP = @STRIP@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ diff --git a/configure b/configure index e0e3320..4154b43 100755 --- a/configure +++ b/configure @@ -737,6 +737,7 @@ GREP LN_S RANLIB ARFLAGS +STRIP ac_ct_AR AR BISON @@ -4544,6 +4545,98 @@ esac fi fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP="strip" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + ARFLAGS=rc if test -n "$ac_tool_prefix"; then @@ -4820,6 +4913,8 @@ $as_echo "no" >&6; } fi + +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="env STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: diff --git a/configure.ac b/configure.ac index 00dc50d..708197a 100644 --- a/configure.ac +++ b/configure.ac @@ -257,11 +257,15 @@ then fi AC_CHECK_TOOLS(AR,[ar gar],ar) +AC_CHECK_TOOL(STRIP,strip,strip) AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_PROG_LN_S AC_PROG_EGREP AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) + +dnl Use the correct strip to install programs +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="env STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" AC_PROG_INSTALL dnl Prepend src dir to install path dir if it's a relative path case "$INSTALL" in

1 0

Qian Hong : user32/tests: Added tests for OpenInputDesktop and SwitchDesktop.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: b0cac343631f712f337d18516fef9e631770c27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cac343631f712f337d18516… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Oct 4 00:29:55 2013 +0800 user32/tests: Added tests for OpenInputDesktop and SwitchDesktop. --- dlls/user32/tests/winstation.c | 175 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 175 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 248b82e..7155b33 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -475,6 +475,180 @@ static void test_getuserobjectinformation(void) ok(CloseDesktop(desk), "CloseDesktop failed\n"); } +static void test_inputdesktop(void) +{ + HDESK input_desk, old_input_desk, thread_desk, old_thread_desk, new_desk; + DWORD ret; + CHAR name[1024]; + INPUT inputs[1]; + + inputs[0].type = INPUT_KEYBOARD; + inputs[0].ki.wVk = 0; + inputs[0].ki.wScan = 0x3c0; + inputs[0].ki.dwFlags = KEYEVENTF_UNICODE; + + /* OpenInputDesktop creates new handles for each calls */ + old_input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); +todo_wine + ok(old_input_desk != NULL, "OpenInputDesktop failed!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(old_input_desk, UOI_NAME, name, 1024, NULL); +todo_wine + ok(ret, "GetUserObjectInformation failed!\n"); +todo_wine + ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); + + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); +todo_wine + ok(input_desk != NULL, "OpenInputDesktop failed!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(input_desk, UOI_NAME, name, 1024, NULL); +todo_wine + ok(ret, "GetUserObjectInformation failed!\n"); +todo_wine + ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); + +todo_wine + ok(old_input_desk != input_desk, "returned the same handle!\n"); + ret = CloseDesktop(input_desk); +todo_wine + ok(ret, "CloseDesktop failed!\n"); + + /* by default, GetThreadDesktop is the input desktop, SendInput should success. */ + old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(old_thread_desk, UOI_NAME, name, 1024, NULL); + ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); + + SetLastError(0xdeadbeef); + ret = SendInput(1, inputs, sizeof(INPUT)); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); + ok(ret == 1, "unexpected return count %d\n", ret); + + /* Set thread desktop to the new desktop, SendInput should failed. */ + new_desk = CreateDesktopA("new_desk", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); + ok(new_desk != NULL, "CreateDesktop failed!\n"); + ret = SetThreadDesktop(new_desk); + ok(ret, "SetThreadDesktop failed!\n"); + thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(thread_desk == new_desk, "thread desktop doesn't match!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(thread_desk, UOI_NAME, name, 1024, NULL); + ok(!strcmp(name, "new_desk"), "unexpected desktop %s\n", name); + + SetLastError(0xdeadbeef); + ret = SendInput(1, inputs, sizeof(INPUT)); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError()); + ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret); + + /* Set thread desktop back to the old thread desktop, SendInput should success. */ + ret = SetThreadDesktop(old_thread_desk); + ok(ret, "SetThreadDesktop failed!\n"); + thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(thread_desk == old_thread_desk, "thread desktop doesn't match!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(thread_desk, UOI_NAME, name, 1024, NULL); + ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); + + SetLastError(0xdeadbeef); + ret = SendInput(1, inputs, sizeof(INPUT)); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); + ok(ret == 1, "unexpected return count %d\n", ret); + + /* Set thread desktop to the input desktop, SendInput should success. */ + ret = SetThreadDesktop(old_input_desk); +todo_wine + ok(ret, "SetThreadDesktop failed!\n"); + thread_desk = GetThreadDesktop(GetCurrentThreadId()); +todo_wine + ok(thread_desk == old_input_desk, "thread desktop doesn't match!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(thread_desk, UOI_NAME, name, 1024, NULL); + ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); + + SetLastError(0xdeadbeef); + ret = SendInput(1, inputs, sizeof(INPUT)); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); + ok(ret == 1, "unexpected return count %d\n", ret); + + /* Switch input desktop to the new desktop, SendInput should failed. */ + ret = SwitchDesktop(new_desk); + ok(ret, "SwitchDesktop failed!\n"); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); +todo_wine + ok(input_desk != NULL, "OpenInputDesktop failed!\n"); + ok(input_desk != new_desk, "returned the same handle!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(input_desk, UOI_NAME, name, 1024, NULL); +todo_wine + ok(ret, "GetUserObjectInformation failed!\n"); +todo_wine + ok(!strcmp(name, "new_desk"), "unexpected desktop %s\n", name); + ret = CloseDesktop(input_desk); +todo_wine + ok(ret, "CloseDesktop failed!\n"); + + SetLastError(0xdeadbeef); + ret = SendInput(1, inputs, sizeof(INPUT)); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "unexpected last error %08x\n", GetLastError()); + ok(ret == 1 || broken(ret == 0) /* Win64 */, "unexpected return count %d\n", ret); + + /* Set thread desktop to the new desktop, SendInput should success. */ + ret = SetThreadDesktop(new_desk); + ok(ret, "SetThreadDesktop failed!\n"); + thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(thread_desk == new_desk, "thread desktop doesn't match!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(thread_desk, UOI_NAME, name, 1024, NULL); + ok(!strcmp(name, "new_desk"), "unexpected desktop %s\n", name); + + SetLastError(0xdeadbeef); + ret = SendInput(1, inputs, sizeof(INPUT)); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); + ok(ret == 1, "unexpected return count %d\n", ret); + + /* Switch input desktop to the old input desktop, set thread desktop to the old + * thread desktop, clean side effects. SendInput should success. */ + ret = SwitchDesktop(old_input_desk); + input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); +todo_wine + ok(input_desk != NULL, "OpenInputDesktop failed!\n"); +todo_wine + ok(input_desk != old_input_desk, "returned the same handle!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(input_desk, UOI_NAME, name, 1024, NULL); +todo_wine + ok(ret, "GetUserObjectInformation failed!\n"); +todo_wine + ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); + + ret = SetThreadDesktop(old_thread_desk); + ok(ret, "SetThreadDesktop failed!\n"); + thread_desk = GetThreadDesktop(GetCurrentThreadId()); + ok(thread_desk == old_thread_desk, "thread desktop doesn't match!\n"); + memset(name, 0, sizeof(name)); + ret = GetUserObjectInformationA(thread_desk, UOI_NAME, name, 1024, NULL); + ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name); + + SetLastError(0xdeadbeef); + ret = SendInput(1, inputs, sizeof(INPUT)); + ok(GetLastError() == 0xdeadbeef, "unexpected last error %08x\n", GetLastError()); + ok(ret == 1, "unexpected return count %d\n", ret); + + /* free resources */ + ret = CloseDesktop(input_desk); +todo_wine + ok(ret, "CloseDesktop failed!\n"); + ret = CloseDesktop(old_input_desk); +todo_wine + ok(ret, "CloseDesktop failed!\n"); + ret = CloseDesktop(new_desk); + ok(ret, "CloseDesktop failed!\n"); +} + START_TEST(winstation) { /* Check whether this platform supports WindowStation calls */ @@ -487,6 +661,7 @@ START_TEST(winstation) return; } + test_inputdesktop(); test_enumstations(); test_enumdesktops(); test_handles();

1 0

Dmitry Timoshkov : server: Set the unix file write mode bit also for FILE_APPEND_DATA access.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: b29fbc4f00bf4ac76e6b8579bc3e08b72a9a5490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29fbc4f00bf4ac76e6b8579b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 2 12:19:08 2013 +0900 server: Set the unix file write mode bit also for FILE_APPEND_DATA access. --- server/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/file.c b/server/file.c index 2ecf97c..94d3060 100644 --- a/server/file.c +++ b/server/file.c @@ -459,7 +459,7 @@ static mode_t file_access_to_mode( unsigned int access ) access = generic_file_map_access( access ); if (access & FILE_READ_DATA) mode |= 4; - if (access & FILE_WRITE_DATA) mode |= 2; + if (access & (FILE_WRITE_DATA|FILE_APPEND_DATA)) mode |= 2; if (access & FILE_EXECUTE) mode |= 1; return mode; }

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_PARAM_SRCMOD_TYPE typedef.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 94dece4c0c477cd6a3a7cd92ba0fe01cd79a8ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dece4c0c477cd6a3a7cd92b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 08:54:15 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_PARAM_SRCMOD_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 361845f..7900858 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -514,7 +514,8 @@ enum bwritersampler_texture_type #define BWRITERSI_TEXLD_PROJECT 1 #define BWRITERSI_TEXLD_BIAS 2 -typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE { +enum bwritershader_param_srcmod_type +{ BWRITERSPSM_NONE = 0, BWRITERSPSM_NEG, BWRITERSPSM_BIAS, @@ -529,7 +530,7 @@ typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE { BWRITERSPSM_ABS, BWRITERSPSM_ABSNEG, BWRITERSPSM_NOT, -} BWRITERSHADER_PARAM_SRCMOD_TYPE; +}; #define BWRITER_SM1_VS 0xfffe #define BWRITER_SM1_PS 0xffff

1 0

Henri Verbeet : wined3d: Send index buffer binding updates through the command stream.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: d61b14371a4d65da9106b199031d4330b546d792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61b14371a4d65da9106b1990… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 08:54:12 2013 +0200 wined3d: Send index buffer binding updates through the command stream. --- dlls/wined3d/cs.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 32 ++++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5add94d..0f060b4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -35,6 +35,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_VERTEX_DECLARATION, WINED3D_CS_OP_SET_STREAM_SOURCE, WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, + WINED3D_CS_OP_SET_INDEX_BUFFER, }; struct wined3d_cs_present @@ -117,6 +118,13 @@ struct wined3d_cs_set_stream_source_freq UINT flags; }; +struct wined3d_cs_set_index_buffer +{ + enum wined3d_cs_op opcode; + struct wined3d_buffer *buffer; + enum wined3d_format_id format_id; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -389,6 +397,36 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i cs->ops->submit(cs); } +static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_index_buffer *op = data; + struct wined3d_buffer *prev; + + prev = cs->state.index_buffer; + cs->state.index_buffer = op->buffer; + cs->state.index_format = op->format_id; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + + device_invalidate_state(cs->device, STATE_INDEXBUFFER); +} + +void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, + enum wined3d_format_id format_id) +{ + struct wined3d_cs_set_index_buffer *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_INDEX_BUFFER; + op->buffer = buffer; + op->format_id = format_id; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -401,6 +439,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, + /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 603e5f5..acca498 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1828,42 +1828,30 @@ void CDECL wined3d_device_get_material(const struct wined3d_device *device, stru void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) { + enum wined3d_format_id prev_format; struct wined3d_buffer *prev_buffer; TRACE("device %p, buffer %p, format %s.\n", device, buffer, debug_d3dformat(format_id)); prev_buffer = device->update_state->index_buffer; + prev_format = device->update_state->index_format; device->update_state->index_buffer = buffer; device->update_state->index_format = format_id; - /* Handle recording of state blocks. */ if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.indices = TRUE; - if (buffer) - wined3d_buffer_incref(buffer); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); + + if (prev_buffer == buffer && prev_format == format_id) return; - } - if (prev_buffer != buffer) - { - device_invalidate_state(device, STATE_INDEXBUFFER); - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev_buffer) - { - InterlockedDecrement(&prev_buffer->resource.bind_count); - wined3d_buffer_decref(prev_buffer); - } - } + if (buffer) + wined3d_buffer_incref(buffer); + if (!device->recording) + wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); } struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7b014e..45ead88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2487,6 +2487,8 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, + enum wined3d_format_id format_id) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : kernel32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: baf491b80bf625d821929803a871a892bc216e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf491b80bf625d821929803a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 3 00:08:57 2013 +0200 kernel32: Use BOOL type where appropriate. --- dlls/kernel32/process.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6b4d9b4..afbdf72 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -84,7 +84,7 @@ typedef struct static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; static BOOL is_wow64; -static const int is_win64 = (sizeof(void *) > sizeof(int)); +static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); HMODULE kernel32_handle = 0; SYSTEM_BASIC_INFORMATION system_info = { 0 }; @@ -116,7 +116,7 @@ extern void SHELL_LoadRegistry(void); /*********************************************************************** * contains_path */ -static inline int contains_path( LPCWSTR name ) +static inline BOOL contains_path( LPCWSTR name ) { return ((*name && (name[1] == ':')) || strchrW(name, '/') || strchrW(name, '\\')); } @@ -128,7 +128,7 @@ static inline int contains_path( LPCWSTR name ) * Check if an environment variable needs to be handled specially when * passed through the Unix environment (i.e. prefixed with "WINE"). */ -static inline int is_special_env_var( const char *var ) +static inline BOOL is_special_env_var( const char *var ) { return (!strncmp( var, "PATH=", sizeof("PATH=")-1 ) || !strncmp( var, "PWD=", sizeof("PWD=")-1 ) ||

1 0

Frédéric Delanoy : gdi32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 3b2f85e0b63c6fb70e26efe6cbe480128200eea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2f85e0b63c6fb70e26efe6c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 3 00:08:55 2013 +0200 gdi32/tests: Use BOOL type where appropriate. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 6b52356..dfa8711 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1564,7 +1564,7 @@ static COLORREF get_nearest( int r, int g, int b ) return (r*r + g*g + b*b < (255-r)*(255-r) + (255-g)*(255-g) + (255-b)*(255-b)) ? 0x000000 : 0xffffff; } -static int is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) +static BOOL is_black_pen( COLORREF fg, COLORREF bg, int r, int g, int b ) { if (fg == 0 || bg == 0xffffff) return RGB(r,g,b) != 0xffffff && RGB(r,g,b) != bg; return RGB(r,g,b) == 0x000000 || RGB(r,g,b) == bg;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: 11431e2f9a74a71443514db3f24986bf3ec0c1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11431e2f9a74a71443514db3f… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 2 23:41:02 2013 +0200 po: Update German translation. --- po/de.po | 55 +++++++++++++++++-------------------------------------- 1 files changed, 17 insertions(+), 38 deletions(-) diff --git a/po/de.po b/po/de.po index 9efd3a4..36a2ec7 100644 --- a/po/de.po +++ b/po/de.po @@ -8552,17 +8552,12 @@ msgstr "" "Übertragung abgeschlossen ist und versuchen Sie es erneut." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Die gegenwärtigen MIDI-Mapper Einstellungen beziehen sich auf ein MIDI-" -"Gerät, das nicht installiert ist. Benutzen Sie den MIDI-Mapper, um dies zu " -"ändern." +"Gerät, das nicht installiert ist." #: winmm.rc:53 msgid "" @@ -9409,22 +9404,16 @@ msgstr "" "einer gerufenen Prozedur werden von der aufrufenden geerbt.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <Ver> ist die Kurzform von CHDIR. Es wechselt das aktuelle\n" +"CD <Verzeichnis> ist die Kurzform von CHDIR. Es wechselt das aktuelle\n" "Verzeichnis.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR Wechselt in ein Verzeichnis.\n" +msgstr "CHDIR <Verzeichnis> wechselt in ein Verzeichnis.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9432,7 +9421,7 @@ msgstr "CLS löscht den Bildschirminhalt der Konsole.\n" #: cmd.rc:45 msgid "COPY <filename> copies a file.\n" -msgstr "COPY Kopiert eine Datei.\n" +msgstr "COPY <Dateiname> kopiert eine Datei.\n" #: cmd.rc:46 msgid "CTTY changes the input/output device.\n" @@ -9444,7 +9433,7 @@ msgstr "DATE zeigt oder ändert das Systemdatum.\n" #: cmd.rc:48 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL löscht eine oder mehrere Dateien.\n" +msgstr "DEL <Dateiname> löscht eine oder mehrere Dateien.\n" #: cmd.rc:49 msgid "DIR lists the contents of a directory.\n" @@ -9473,14 +9462,9 @@ msgstr "" #: cmd.rc:61 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE löscht die angegebenen Dateien.\n" +msgstr "ERASE <Dateiname> löscht die angegebenen Dateien.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9488,10 +9472,13 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"Der FOR Befehl wird genutzt, um einen Befehl für eine Menge von Dateien\n" -"einzeln auszuführen.\n" +"Der FOR-Befehl wird genutzt, um einen Befehl für jede Datei in einer Menge\n" +"von Dateien einzeln auszuführen.\n" "\n" -"Syntax: FOR %Variable IN (set) DO Befehl\n" +"Syntax: FOR %Variable IN (Menge) DO Befehl\n" +"\n" +"Das %-Zeichen muss doppelt angegeben werden, wenn FOR in Batchdateien\n" +"verwendet wird.\n" #: cmd.rc:80 msgid "" @@ -9523,8 +9510,8 @@ msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" msgstr "" -"HELP <Kommando> zeigt eine kurze Hilfe zu einem Thema.\n" -"HELP ohne Argumente zeigt alle CMD Kommandos.\n" +"HELP <Befehl> zeigt eine kurze Hilfe zu einem Thema.\n" +"HELP ohne Argumente zeigt alle eingebauten CMD-Befehle.\n" #: cmd.rc:93 msgid "" @@ -9688,16 +9675,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <Dateiname> benennt die angegebenen Dateien um.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD ist die Kurzform von RMDIR.\n" +msgstr "RD <Verzeichnis> ist die Kurzform von RMDIR. Löscht ein Verzeichnis.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR löscht das angegebene Verzeichnis.\n" +msgstr "RMDIR <Verzeichnis> löscht das angegebene Verzeichnis.\n" #: cmd.rc:203 msgid "" @@ -9874,15 +9857,11 @@ msgstr "" "Ab diesem Punkt wird die vorherige Umgebung wiederhergestellt.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <Verzeichnisname> speichert das aktuelle Verzeichnis auf einem\n" +"PUSHD <Verzeichnis> speichert das aktuelle Verzeichnis auf einem\n" "Stack und wechselt das Arbeitsverzeichnis zu dem angegebenen.\n" #: cmd.rc:247

1 0