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

Andrew Eikum : mciqtz: Actually assign result to the output structure.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: ad175df21a26cb9c76537a1198c98534f1a1913e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad175df21a26cb9c76537a119… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Mar 8 15:08:41 2012 -0600 mciqtz: Actually assign result to the output structure. --- dlls/mciqtz32/mciqtz.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 03f6f9d..3e16235 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -653,11 +653,11 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS LONG state = State_Stopped; IMediaControl_GetState(wma->pmctrl, -1, &state); if (state == State_Stopped) - state = MCI_MODE_STOP; + lpParms->dwReturn = MCI_MODE_STOP; else if (state == State_Running) - state = MCI_MODE_PLAY; + lpParms->dwReturn = MCI_MODE_PLAY; else if (state == State_Paused) - state = MCI_MODE_PAUSE; + lpParms->dwReturn = MCI_MODE_PAUSE; break; } case MCI_STATUS_MEDIA_PRESENT:

1 0

Jacek Caban : jscript: Added IVariantChangeType stub implementation.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 1cadd7cc32201357149430f385008606f112cec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cadd7cc32201357149430f38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:27:47 2012 +0100 jscript: Added IVariantChangeType stub implementation. --- dlls/jscript/jscript.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 68ace36..750104c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -46,6 +46,7 @@ typedef struct { IActiveScriptParseProcedure2 IActiveScriptParseProcedure2_iface; IActiveScriptProperty IActiveScriptProperty_iface; IObjectSafety IObjectSafety_iface; + IVariantChangeType IVariantChangeType_iface; LONG ref; @@ -70,6 +71,7 @@ void script_release(script_ctx_t *ctx) release_cc(ctx->cc); jsheap_free(&ctx->tmp_heap); SysFreeString(ctx->last_match); + heap_free(ctx); } @@ -373,6 +375,9 @@ static HRESULT WINAPI JScript_QueryInterface(IActiveScript *iface, REFIID riid, }else if(IsEqualGUID(riid, &IID_IObjectSafety)) { TRACE("(%p)->(IID_IObjectSafety %p)\n", This, ppv); *ppv = &This->IObjectSafety_iface; + }else if(IsEqualGUID(riid, &IID_IVariantChangeType)) { + TRACE("(%p)->(IID_IVariantChangeType %p)\n", This, ppv); + *ppv = &This->IVariantChangeType_iface; } if(*ppv) { @@ -962,6 +967,43 @@ static const IObjectSafetyVtbl JScriptSafetyVtbl = { JScriptSafety_SetInterfaceSafetyOptions }; +static inline JScript *impl_from_IVariantChangeType(IVariantChangeType *iface) +{ + return CONTAINING_RECORD(iface, JScript, IVariantChangeType_iface); +} + +static HRESULT WINAPI VariantChangeType_QueryInterface(IVariantChangeType *iface, REFIID riid, void **ppv) +{ + JScript *This = impl_from_IVariantChangeType(iface); + return IActiveScript_QueryInterface(&This->IActiveScript_iface, riid, ppv); +} + +static ULONG WINAPI VariantChangeType_AddRef(IVariantChangeType *iface) +{ + JScript *This = impl_from_IVariantChangeType(iface); + return IActiveScript_AddRef(&This->IActiveScript_iface); +} + +static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) +{ + JScript *This = impl_from_IVariantChangeType(iface); + return IActiveScript_Release(&This->IActiveScript_iface); +} + +static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) +{ + JScript *This = impl_from_IVariantChangeType(iface); + FIXME("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); + return E_NOTIMPL; +} + +static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { + VariantChangeType_QueryInterface, + VariantChangeType_AddRef, + VariantChangeType_Release, + VariantChangeType_ChangeType +}; + HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) { @@ -986,6 +1028,7 @@ HRESULT WINAPI JScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pUn ret->IActiveScriptParseProcedure2_iface.lpVtbl = &JScriptParseProcedureVtbl; ret->IActiveScriptProperty_iface.lpVtbl = &JScriptPropertyVtbl; ret->IObjectSafety_iface.lpVtbl = &JScriptSafetyVtbl; + ret->IVariantChangeType_iface.lpVtbl = &VariantChangeTypeVtbl; ret->ref = 1; ret->safeopt = INTERFACE_USES_DISPEX;

1 0

Dmitry Timoshkov : kernel32: Add some CreateFile disposition and access tests.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 7a9fce25ec725a7d1942e414ec53fecbe4bc0458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9fce25ec725a7d1942e414e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 8 20:29:50 2012 +0800 kernel32: Add some CreateFile disposition and access tests. --- dlls/kernel32/tests/file.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 39e6cb9..9cfb664 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3151,6 +3151,92 @@ static void test_ReplaceFileW(void) } } +static void test_CreatFile(void) +{ + static const struct test_data + { + DWORD disposition, access, error, clean_up; + } td[] = + { + /* 0 */ { 0, 0, ERROR_INVALID_PARAMETER, 0 }, + /* 1 */ { 0, GENERIC_READ, ERROR_INVALID_PARAMETER, 0 }, + /* 2 */ { 0, GENERIC_READ|GENERIC_WRITE, ERROR_INVALID_PARAMETER, 0 }, + /* 3 */ { CREATE_NEW, 0, ERROR_FILE_EXISTS, 1 }, + /* 4 */ { CREATE_NEW, 0, 0, 1 }, + /* 5 */ { CREATE_NEW, GENERIC_READ, 0, 1 }, + /* 6 */ { CREATE_NEW, GENERIC_WRITE, 0, 1 }, + /* 7 */ { CREATE_NEW, GENERIC_READ|GENERIC_WRITE, 0, 0 }, + /* 8 */ { CREATE_ALWAYS, 0, 0, 0 }, + /* 9 */ { CREATE_ALWAYS, GENERIC_READ, 0, 0 }, + /* 10*/ { CREATE_ALWAYS, GENERIC_WRITE, 0, 0 }, + /* 11*/ { CREATE_ALWAYS, GENERIC_READ|GENERIC_WRITE, 0, 1 }, + /* 12*/ { OPEN_EXISTING, 0, ERROR_FILE_NOT_FOUND, 0 }, + /* 13*/ { CREATE_ALWAYS, 0, 0, 0 }, + /* 14*/ { OPEN_EXISTING, 0, 0, 0 }, + /* 15*/ { OPEN_EXISTING, GENERIC_READ, 0, 0 }, + /* 16*/ { OPEN_EXISTING, GENERIC_WRITE, 0, 0 }, + /* 17*/ { OPEN_EXISTING, GENERIC_READ|GENERIC_WRITE, 0, 1 }, + /* 18*/ { OPEN_ALWAYS, 0, 0, 0 }, + /* 19*/ { OPEN_ALWAYS, GENERIC_READ, 0, 0 }, + /* 20*/ { OPEN_ALWAYS, GENERIC_WRITE, 0, 0 }, + /* 21*/ { OPEN_ALWAYS, GENERIC_READ|GENERIC_WRITE, 0, 0 }, + /* 22*/ { TRUNCATE_EXISTING, 0, ERROR_INVALID_PARAMETER, 0 }, + /* 23*/ { TRUNCATE_EXISTING, GENERIC_READ, ERROR_INVALID_PARAMETER, 0 }, + /* 24*/ { TRUNCATE_EXISTING, GENERIC_WRITE, 0, 0 }, + /* 25*/ { TRUNCATE_EXISTING, GENERIC_READ|GENERIC_WRITE, 0, 0 } + }; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + DWORD i, ret, written; + HANDLE hfile; + + GetTempPath(MAX_PATH, temp_path); + GetTempFileName(temp_path, "tmp", 0, file_name); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + SetLastError(0xdeadbeef); + hfile = CreateFile(file_name, td[i].access, 0, NULL, td[i].disposition, 0, 0); + if (!td[i].error) + { + ok(hfile != INVALID_HANDLE_VALUE, "%d: CreateFile error %d\n", i, GetLastError()); + written = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &td[i].error, sizeof(td[i].error), &written, NULL); + if (td[i].access & GENERIC_WRITE) + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); + else + { + ok(!ret, "%d: WriteFile should fail\n", i); + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + } + CloseHandle(hfile); + } + else + { + /* FIXME: remove the condition below once Wine is fixed */ + if (td[i].disposition == TRUNCATE_EXISTING && !(td[i].access & GENERIC_WRITE)) + { + todo_wine + { + ok(hfile == INVALID_HANDLE_VALUE, "%d: CreateFile should fail\n", i); + ok(GetLastError() == td[i].error, "%d: expected %d, got %d\n", i, td[i].error, GetLastError()); + } + CloseHandle(hfile); + } + else + { + ok(hfile == INVALID_HANDLE_VALUE, "%d: CreateFile should fail\n", i); + ok(GetLastError() == td[i].error, "%d: expected %d, got %d\n", i, td[i].error, GetLastError()); + } + } + + if (td[i].clean_up) DeleteFile(file_name); + } + + DeleteFile(file_name); +} + START_TEST(file) { InitFunctionPointers(); @@ -3166,6 +3252,7 @@ START_TEST(file) test_GetTempFileNameA(); test_CopyFileA(); test_CopyFileW(); + test_CreatFile(); test_CreateFileA(); test_CreateFileW(); test_DeleteFileA();

1 0

André Hentschel : dbghelp: Add arm_fetch_minidump_thread implementation.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 138cb84be0f693d52dd6cb6ef638c0a81747682a URL: http://source.winehq.org/git/wine.git/?a=commit;h=138cb84be0f693d52dd6cb6ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:27:07 2012 +0100 dbghelp: Add arm_fetch_minidump_thread implementation. --- dlls/dbghelp/cpu_arm.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 2712db4..eeb8984 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -224,8 +224,16 @@ static const char* arm_fetch_regname(unsigned regno) static BOOL arm_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) { - FIXME("NIY\n"); - return FALSE; + if (ctx->ContextFlags && (flags & ThreadWriteInstructionWindow)) + { + /* FIXME: crop values across module boundaries, */ +#ifdef __arm__ + ULONG base = ctx->Pc <= 0x80 ? 0 : ctx->Pc - 0x80; + minidump_add_memory_block(dc, base, ctx->Pc + 0x80 - base, 0); +#endif + } + + return TRUE; } static BOOL arm_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags)

1 0

Christian Costa : configure: Check if version of msgfmt (from gettext) is recent enough.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 949693011dfc91c38a79c779b96df0ac4d8f54e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949693011dfc91c38a79c779b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 5 20:00:20 2012 +0100 configure: Check if version of msgfmt (from gettext) is recent enough. --- configure | 24 ++++++++++++++++++++++-- configure.ac | 19 ++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6e81f94..55464c7 100755 --- a/configure +++ b/configure @@ -5150,11 +5150,31 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether msgfmt supports contexts" >&5 +$as_echo_n "checking whether msgfmt supports contexts... " >&6; } + cat >conftest.po <<EOF +# comment +msgctxt "ctxt" +msgid "id" +msgstr "str" +EOF + if $MSGFMT -o /dev/null conftest.po 2>&5 + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + MSGFMT=false + fi +fi if test "$MSGFMT" = false; then : case "x$with_gettext" in - x) as_fn_append wine_warnings "|gettext tools not found, translations won't be built." ;; + x) as_fn_append wine_warnings "|gettext tools not found (or too old), translations won't be built." ;; xno) ;; - *) as_fn_error $? "gettext tools not found, translations won't be built. + *) as_fn_error $? "gettext tools not found (or too old), translations won't be built. This is an error since --with-gettext was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 0b68774..357c829 100644 --- a/configure.ac +++ b/configure.ac @@ -349,8 +349,25 @@ else fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + AC_MSG_CHECKING([whether msgfmt supports contexts]) + cat >conftest.po <<EOF +# comment +msgctxt "ctxt" +msgid "id" +msgstr "str" +EOF + if $MSGFMT -o /dev/null conftest.po 2>&AS_MESSAGE_LOG_FD + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + MSGFMT=false + fi +fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], - [gettext tools not found, translations won't be built.]) + [gettext tools not found (or too old), translations won't be built.]) dnl **** Check for some libraries ****

1 0

Thomas Faber : msvcp60: Fix build with MSVC.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 44feaf9bd8dd6402d3f5aabd12a0c0634e3714a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44feaf9bd8dd6402d3f5aabd1… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 7 09:23:50 2012 +0100 msvcp60: Fix build with MSVC. --- dlls/msvcp60/memory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp60/memory.c b/dlls/msvcp60/memory.c index 6f6a77a..4407cfe 100644 --- a/dlls/msvcp60/memory.c +++ b/dlls/msvcp60/memory.c @@ -80,7 +80,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { - return MSVCRT_operator_new(sizeof(char[count])); + return MSVCRT_operator_new(count); } /* ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z */ @@ -177,7 +177,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun return NULL; } - return MSVCRT_operator_new(sizeof(wchar_t[count])); + return MSVCRT_operator_new(count * sizeof(wchar_t)); } /* ?allocate@?$allocator(a)_W@std@@QAEPA_WIPBX(a)Z */ @@ -276,7 +276,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate( return NULL; } - return MSVCRT_operator_new(sizeof(unsigned short[count])); + return MSVCRT_operator_new(count * sizeof(unsigned short)); } /* ?allocate@?$allocator(a)G@std@@QAEPAGIPBX(a)Z */

1 0

Thomas Faber : msvcp90: Fix build with MSVC.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 62901e6ea07df194ab7f1407783a17d639a58ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62901e6ea07df194ab7f14077… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 7 10:10:18 2012 +0100 msvcp90: Fix build with MSVC. --- dlls/msvcp90/memory.c | 6 +++--- dlls/msvcp90/string.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 4ecc379..c5cae50 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -80,7 +80,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { - return MSVCRT_operator_new(sizeof(char[count])); + return MSVCRT_operator_new(count); } /* ?allocate@?$allocator(a)D@std@@QAEPADIPBX(a)Z */ @@ -177,7 +177,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun return NULL; } - return MSVCRT_operator_new(sizeof(wchar_t[count])); + return MSVCRT_operator_new(count * sizeof(wchar_t)); } /* ?allocate@?$allocator(a)_W@std@@QAEPA_WIPBX(a)Z */ @@ -276,7 +276,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate( return NULL; } - return MSVCRT_operator_new(sizeof(unsigned short[count])); + return MSVCRT_operator_new(count * sizeof(unsigned short)); } /* ?allocate@?$allocator(a)G@std@@QAEPAGIPBX(a)Z */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 8a6bf64..e404699 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -215,7 +215,7 @@ MSVCP_bool CDECL MSVCP_char_traits_wchar_lt(const wchar_t *ch1, int CDECL MSVCP_char_traits_wchar_compare(const wchar_t *s1, const wchar_t *s2, MSVCP_size_t count) { - int ret = memcmp(s1, s2, sizeof(wchar_t[count])); + int ret = memcmp(s1, s2, count * sizeof(wchar_t)); return (ret>0 ? 1 : (ret<0 ? -1 : 0)); } @@ -238,7 +238,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest, return dest; } - return memcpy(dest, src, sizeof(wchar_t[count])); + return memcpy(dest, src, count * sizeof(wchar_t)); } /* ?copy@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -275,7 +275,7 @@ wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest, return dest; } - return memmove(dest, src, sizeof(WCHAR[count])); + return memmove(dest, src, count * sizeof(WCHAR)); } /* ?move@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -395,7 +395,7 @@ unsigned short * CDECL MSVCP_char_traits_short__Copy_s(unsigned short *dest, return dest; } - return memcpy(dest, src, sizeof(unsigned short[count])); + return memcpy(dest, src, count * sizeof(unsigned short)); } /* ?copy@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */ @@ -430,7 +430,7 @@ unsigned short* CDECL MSVCP_char_traits_short__Move_s(unsigned short *dest, return dest; } - return memmove(dest, src, sizeof(unsigned short[count])); + return memmove(dest, src, count * sizeof(unsigned short)); } /* ?move@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */

1 0

André Hentschel : include: Add more error codes.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: d6d88652729f398bbade378259aa91d319ec1e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d88652729f398bbade37825… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 7 16:33:28 2012 +0100 include: Add more error codes. --- include/winerror.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 79cc5ed..df67e3c 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -460,6 +460,61 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_MP_PROCESSOR_MISMATCH 725 #define ERROR_HIBERNATED 726 #define ERROR_RESUME_HIBERNATION 727 +#define ERROR_FIRMWARE_UPDATED 728 +#define ERROR_DRIVERS_LEAKING_LOCKED_PAGES 729 +#define ERROR_WAKE_SYSTEM 730 +#define ERROR_ABANDONED_WAIT_0 735 +#define ERROR_ELEVATION_REQUIRED 740 +#define ERROR_REPARSE 741 +#define ERROR_OPLOCK_BREAK_IN_PROGRESS 742 +#define ERROR_VOLUME_MOUNTED 743 +#define ERROR_RXACT_COMMITTED 744 +#define ERROR_NOTIFY_CLEANUP 745 +#define ERROR_PRIMARY_TRANSPORT_CONNECT_FAILED 746 +#define ERROR_PAGE_FAULT_TRANSITION 747 +#define ERROR_PAGE_FAULT_DEMAND_ZERO 748 +#define ERROR_PAGE_FAULT_COPY_ON_WRITE 749 +#define ERROR_PAGE_FAULT_GUARD_PAGE 750 +#define ERROR_PAGE_FAULT_PAGING_FILE 751 +#define ERROR_CACHE_PAGE_LOCKED 752 +#define ERROR_CRASH_DUMP 753 +#define ERROR_BUFFER_ALL_ZEROS 754 +#define ERROR_REPARSE_OBJECT 755 +#define ERROR_RESOURCE_REQUIREMENTS_CHANGED 756 +#define ERROR_TRANSLATION_COMPLETE 757 +#define ERROR_NOTHING_TO_TERMINATE 758 +#define ERROR_PROCESS_NOT_IN_JOB 759 +#define ERROR_PROCESS_IN_JOB 760 +#define ERROR_VOLSNAP_HIBERNATE_READY 761 +#define ERROR_FSFILTER_OP_COMPLETED_SUCCESSFULLY 762 +#define ERROR_INTERRUPT_VECTOR_ALREADY_CONNECTED 763 +#define ERROR_INTERRUPT_STILL_CONNECTED 764 +#define ERROR_WAIT_FOR_OPLOCK 765 +#define ERROR_DBG_EXCEPTION_HANDLED 766 +#define ERROR_DBG_CONTINUE 767 +#define ERROR_CALLBACK_POP_STACK 768 +#define ERROR_COMPRESSION_DISABLED 769 +#define ERROR_CANTFETCHBACKWARDS 770 +#define ERROR_CANTSCROLLBACKWARDS 771 +#define ERROR_ROWSNOTRELEASED 772 +#define ERROR_BAD_ACCESSOR_FLAGS 773 +#define ERROR_ERRORS_ENCOUNTERED 774 +#define ERROR_NOT_CAPABLE 775 +#define ERROR_REQUEST_OUT_OF_SEQUENCE 776 +#define ERROR_VERSION_PARSE_ERROR 777 +#define ERROR_BADSTARTPOSITION 778 +#define ERROR_MEMORY_HARDWARE 779 +#define ERROR_DISK_REPAIR_DISABLED 780 +#define ERROR_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE 781 +#define ERROR_SYSTEM_POWERSTATE_TRANSITION 782 +#define ERROR_SYSTEM_POWERSTATE_COMPLEX_TRANSITION 783 +#define ERROR_MCA_EXCEPTION 784 +#define ERROR_ACCESS_AUDIT_BY_POLICY 785 +#define ERROR_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY 786 +#define ERROR_ABANDON_HIBERFILE 787 +#define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED 788 +#define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR 789 +#define ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR 790 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996

1 0

Stefan Dösinger : d3d8/tests: Port the depth blit test to d3d8.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 3c1d5f6c5d950debb7626bbcaa560cbc8a10e2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1d5f6c5d950debb7626bbca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 7 21:26:07 2012 +0100 d3d8/tests: Port the depth blit test to d3d8. --- dlls/d3d8/device.c | 14 +++++++++ dlls/d3d8/tests/device.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 2 +- 3 files changed, 88 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5777fd5..b528e2c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -944,12 +944,26 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_resource = wined3d_surface_get_resource(Source->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", + pSourceSurface); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } srcFormat = wined3d_desc.format; src_w = wined3d_desc.width; src_h = wined3d_desc.height; wined3d_resource = wined3d_surface_get_resource(Dest->wined3d_surface); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + WARN("Dest %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", + pDestinationSurface); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } destFormat = wined3d_desc.format; /* Check that the source and destination formats match */ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index cfac2cd..2e1bc98 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3091,6 +3091,78 @@ done: UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void depth_blit_test(void) +{ + HWND hwnd = NULL; + IDirect3D8 *d3d8 = NULL; + IDirect3DDevice8 *device = NULL; + IDirect3DSurface8 *backbuffer, *ds1, *ds2, *ds3; + RECT src_rect; + const POINT dst_point = {0, 0}; + HRESULT hr; + + d3d8 = pDirect3DCreate8(D3D_SDK_VERSION); + ok(d3d8 != NULL, "Direct3DCreate8 failed.\n"); + hwnd = CreateWindow("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed.\n"); + if (!d3d8 || !hwnd) + goto done; + + device = create_device(d3d8, hwnd, hwnd, TRUE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetRenderTarget(device, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &ds1); + ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &ds2); + ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, &ds3); + ok(SUCCEEDED(hr), "CreateDepthStencilSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, ds2, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Flipped. */ + SetRect(&src_rect, 0, 480, 640, 0); + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, ds2, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, ds2, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Depth -> color blit.*/ + hr = IDirect3DDevice8_CopyRects(device, ds1, &src_rect, 1, backbuffer, &dst_point); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, NULL rects, current depth stencil -> unbound depth stencil */ + hr = IDirect3DDevice8_CopyRects(device, ds1, NULL, 0, ds2, NULL); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, NULL rects, unbound depth stencil -> current depth stencil */ + hr = IDirect3DDevice8_CopyRects(device, ds2, NULL, 0, ds1, NULL); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + /* Full, NULL rects, unbound depth stencil -> unbound depth stencil */ + hr = IDirect3DDevice8_CopyRects(device, ds2, NULL, 0, ds3, NULL); + ok(hr == D3DERR_INVALIDCALL, "CopyRects returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(ds3); + IDirect3DSurface8_Release(ds2); + IDirect3DSurface8_Release(ds1); + +done: + if (device) IDirect3DDevice8_Release(device); + if (d3d8) IDirect3D8_Release(d3d8); + if (hwnd) DestroyWindow(hwnd); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3145,6 +3217,7 @@ START_TEST(device) test_wrong_shader(); test_mode_change(); test_device_window_reset(); + depth_blit_test(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d8e1ed2..aab8101 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2429,7 +2429,7 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to read render target back, hr %#x.\n", hr); hr = IDirect3DDevice8_CopyRects(device, ds, NULL, 0, ds_plain, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Depth buffer copy, hr %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + ok(hr == D3DERR_INVALIDCALL, "Depth buffer copy, hr %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : kernel32: Fix file test compilation with PSDK headers.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 75209ffdaf83c1be1437e68f5adf741a74a558a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75209ffdaf83c1be1437e68f5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 8 20:29:35 2012 +0800 kernel32: Fix file test compilation with PSDK headers. --- dlls/kernel32/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index f2a9a07..39e6cb9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1763,7 +1763,7 @@ static BOOL create_fake_dll( LPCSTR filename ) # error You must specify the machine type #endif nt->FileHeader.NumberOfSections = 1; - nt->FileHeader.SizeOfOptionalHeader = IMAGE_SIZEOF_NT_OPTIONAL_HEADER; + nt->FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt->FileHeader.Characteristics = IMAGE_FILE_DLL | IMAGE_FILE_EXECUTABLE_IMAGE; nt->OptionalHeader.Magic = IMAGE_NT_OPTIONAL_HDR_MAGIC; nt->OptionalHeader.MajorLinkerVersion = 1;

1 0