January 2012 - Wine-commits

Jörg Höhle : mciseq: Refactor use of mciGetDriverData.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 3ae829d11b38d70244d8e0601e5b32a9313a44ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae829d11b38d70244d8e0601… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 22:47:45 2010 +0100 mciseq: Refactor use of mciGetDriverData. --- dlls/mciseq/mcimidi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index e35abc5..e7671d6 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -196,11 +196,11 @@ static DWORD MIDI_drvClose(DWORD dwDevID) /************************************************************************** * MIDI_mciGetOpenDev [internal] */ -static WINE_MCIMIDI* MIDI_mciGetOpenDev(UINT wDevID) +static WINE_MCIMIDI* MIDI_mciGetOpenDev(MCIDEVICEID wDevID, UINT wMsg) { WINE_MCIMIDI* wmm = (WINE_MCIMIDI*)mciGetDriverData(wDevID); - if (wmm == NULL || wmm->nUseCount == 0) { + if (wmm == NULL || ((wmm->nUseCount == 0) ^ (wMsg == MCI_OPEN_DRIVER))) { WARN("Invalid wDevID=%u\n", wDevID); return 0; } @@ -1600,8 +1600,7 @@ LRESULT CALLBACK MCIMIDI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } - wmm = (wMsg == MCI_OPEN_DRIVER) ? - (WINE_MCIMIDI*)mciGetDriverData(dwDevID) : MIDI_mciGetOpenDev(dwDevID); + wmm = MIDI_mciGetOpenDev(dwDevID, wMsg); if (wmm == NULL) return MCIERR_INVALID_DEVICE_ID; switch (wMsg) {

1 0

Jörg Höhle : mciseq: wNotifyDeviceID is redundant .
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 387b359a7eaf1115ac734d18d2f2e36806aba250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387b359a7eaf1115ac734d18d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Dec 15 22:56:08 2010 +0100 mciseq: wNotifyDeviceID is redundant. --- dlls/mciseq/mcimidi.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index e7671d6..2783c07 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -61,7 +61,6 @@ typedef struct tagWINE_MCIMIDI { UINT wDevID; /* the MCI one */ HMIDI hMidi; int nUseCount; /* Incremented for each shared open */ - MCIDEVICEID wNotifyDeviceID; /* MCI device ID with a pending notification */ HANDLE hCallback; /* Callback handle for pending notification */ HMMIO hFile; /* mmio file handle open as Element */ LPWSTR lpstrElementName; /* Name of file (if any) */ @@ -219,7 +218,7 @@ static void MIDI_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIMIDI* wmm, UINT wStat /* We simply save one parameter by not passing the wDevID local * to the command. They are the same (via mciGetDriverData). */ - MCIDEVICEID wDevID = wmm->wNotifyDeviceID; + MCIDEVICEID wDevID = wmm->wDevID; HANDLE old = InterlockedExchangePointer(&wmm->hCallback, NULL); if (old) mciDriverNotify(old, wDevID, MCI_NOTIFY_SUPERSEDED); mciDriverNotify(HWND_32(LOWORD(hWndCallBack)), wDevID, wStatus); @@ -767,7 +766,6 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp wmm->lpstrCopyright = NULL; wmm->lpstrName = NULL; - wmm->wNotifyDeviceID = wmm->wDevID; wmm->dwStatus = MCI_MODE_NOT_READY; /* while loading file contents */ /* spec says it should be the default format from the MIDI file... */ wmm->dwMciTimeFormat = MCI_FORMAT_MILLISECONDS; @@ -1563,11 +1561,8 @@ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpP TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmm->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } + if (dwFlags & MCI_NOTIFY) + MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); } return ret; }

1 0

Daniel Lehman : msvcp90: Use passed in beg to find the length in basic_string<>::replace.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 070479db58337f8af3c63b7ff47cb6b37ff7544a URL: http://source.winehq.org/git/wine.git/?a=commit;h=070479db58337f8af3c63b7ff… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Dec 29 16:41:29 2011 -0800 msvcp90: Use passed in beg to find the length in basic_string<>::replace. --- dlls/msvcp90/string.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 27f3ab7..1479780 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -2079,7 +2079,7 @@ basic_string_char* __thiscall basic_string_char_replace_iter_bstr(basic_string_c { String_iterator_char begin = { this, basic_string_char_ptr(this) }; return basic_string_char_replace(this, MSVCP_basic_string_char_Pdif(beg, begin), - MSVCP_basic_string_char_Pdif(end, begin), str); + MSVCP_basic_string_char_Pdif(end, beg), str); } /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0ID@Z */ @@ -2090,7 +2090,7 @@ basic_string_char* __thiscall basic_string_char_replace_iter_ch(basic_string_cha { String_iterator_char begin = { this, basic_string_char_ptr(this) }; return basic_string_char_replace_ch(this, MSVCP_basic_string_char_Pdif(beg, begin), - MSVCP_basic_string_char_Pdif(end, begin), count, ch); + MSVCP_basic_string_char_Pdif(end, beg), count, ch); } /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBD1@Z */ @@ -2102,7 +2102,7 @@ basic_string_char* __thiscall basic_string_char_replace_iter_ptr_ptr(basic_strin { String_iterator_char begin = { this, basic_string_char_ptr(this) }; return basic_string_char_replace_cstr_len(this, MSVCP_basic_string_char_Pdif(beg, begin), - MSVCP_basic_string_char_Pdif(end, begin), res_beg, res_end-res_beg); + MSVCP_basic_string_char_Pdif(end, beg), res_beg, res_end-res_beg); } /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBD@Z */ @@ -2113,7 +2113,7 @@ basic_string_char* __thiscall basic_string_char_replace_iter_cstr(basic_string_c { String_iterator_char begin = { this, basic_string_char_ptr(this) }; return basic_string_char_replace_cstr(this, MSVCP_basic_string_char_Pdif(beg, begin), - MSVCP_basic_string_char_Pdif(end, begin), str); + MSVCP_basic_string_char_Pdif(end, beg), str); } /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0PBDI@Z */ @@ -2124,7 +2124,7 @@ basic_string_char* __thiscall basic_string_char_replace_iter_cstr_len(basic_stri { String_iterator_char begin = { this, basic_string_char_ptr(this) }; return basic_string_char_replace_cstr_len(this, MSVCP_basic_string_char_Pdif(beg, begin), - MSVCP_basic_string_char_Pdif(end, begin), str, len); + MSVCP_basic_string_char_Pdif(end, beg), str, len); } /* ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IABV12@@Z */ @@ -4034,7 +4034,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_iter(basic_string { String_iterator_wchar begin = { this, basic_string_wchar_ptr(this) }; return basic_string_wchar_replace_cstr_len(this, - MSVCP_basic_string_wchar_Pdif(beg, begin), MSVCP_basic_string_wchar_Pdif(end, begin), + MSVCP_basic_string_wchar_Pdif(beg, begin), MSVCP_basic_string_wchar_Pdif(end, beg), res_beg.pos, MSVCP_basic_string_wchar_Pdif(res_end, res_beg)); } @@ -4048,7 +4048,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_bstr(basic_string { String_iterator_wchar begin = { this, basic_string_wchar_ptr(this) }; return basic_string_wchar_replace(this, MSVCP_basic_string_wchar_Pdif(beg, begin), - MSVCP_basic_string_wchar_Pdif(end, begin), str); + MSVCP_basic_string_wchar_Pdif(end, beg), str); } /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0I_W@Z */ @@ -4061,7 +4061,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_ch(basic_string_w { String_iterator_wchar begin = { this, basic_string_wchar_ptr(this) }; return basic_string_wchar_replace_ch(this, MSVCP_basic_string_wchar_Pdif(beg, begin), - MSVCP_basic_string_wchar_Pdif(end, begin), count, ch); + MSVCP_basic_string_wchar_Pdif(end, beg), count, ch); } /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0PB_W1@Z */ @@ -4075,7 +4075,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_ptr_ptr(basic_str { String_iterator_wchar begin = { this, basic_string_wchar_ptr(this) }; return basic_string_wchar_replace_cstr_len(this, MSVCP_basic_string_wchar_Pdif(beg, begin), - MSVCP_basic_string_wchar_Pdif(end, begin), res_beg, res_end-res_beg); + MSVCP_basic_string_wchar_Pdif(end, beg), res_beg, res_end-res_beg); } /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0PB_W@Z */ @@ -4088,7 +4088,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_cstr(basic_string { String_iterator_wchar begin = { this, basic_string_wchar_ptr(this) }; return basic_string_wchar_replace_cstr(this, MSVCP_basic_string_wchar_Pdif(beg, begin), - MSVCP_basic_string_wchar_Pdif(end, begin), str); + MSVCP_basic_string_wchar_Pdif(end, beg), str); } /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0PB_WI@Z */ @@ -4101,7 +4101,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_cstr_len(basic_st { String_iterator_wchar begin = { this, basic_string_wchar_ptr(this) }; return basic_string_wchar_replace_cstr_len(this, MSVCP_basic_string_wchar_Pdif(beg, begin), - MSVCP_basic_string_wchar_Pdif(end, begin), str, len); + MSVCP_basic_string_wchar_Pdif(end, beg), str, len); } /* ?insert@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)IABV12@@Z */

1 0

Aric Stewart : usp10: Add more Microsoft Sans Serif fallbacks.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: ece423b858000d2bd451880229eada1f05671037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece423b858000d2bd45188022… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 14:09:11 2012 -0600 usp10: Add more Microsoft Sans Serif fallbacks. --- dlls/usp10/usp10.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1f6ec53..c26c793 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -307,7 +307,7 @@ const scriptData scriptInformation[] = { {{Script_Latin, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('l','a','t','n'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_CR, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0x00000000, @@ -315,7 +315,7 @@ const scriptData scriptInformation[] = { {{Script_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 1, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0x00000000, - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Control, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 1, 0, 0, ANSI_CHARSET, 1, 0, 0, 0, 0, 0, 1, 0, 0}, 0x00000000, @@ -323,7 +323,7 @@ const scriptData scriptInformation[] = { {{Script_Punctuation, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0x00000000, - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Arabic, 1, 1, 0, 0, 0, 0, { 1,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARABIC, 0, 1, 0, 0, ARABIC_CHARSET, 0, 0, 0, 0, 0, 0, 1, 1, 0}, MS_MAKE_TAG('a','r','a','b'), @@ -351,11 +351,11 @@ const scriptData scriptInformation[] = { {{Script_Greek, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_GREEK, 0, 0, 0, 0, GREEK_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('g','r','e','k'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Cyrillic, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_RUSSIAN, 0, 0, 0, 0, RUSSIAN_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('c','y','r','l'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Armenian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARMENIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('a','r','m','n'), @@ -483,7 +483,7 @@ const scriptData scriptInformation[] = { {{Script_Punctuation2, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('l','a','t','n'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Numeric2, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 1, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, 0x00000000, @@ -623,7 +623,7 @@ const scriptData scriptInformation[] = { {{Script_Vietnamese_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_VIETNAMESE, 0, 0, 0, 0, VIETNAMESE_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('l','a','t','n'), - {0}}, + {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}}, {{Script_Thai_Currency, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_THAI, 0, 1, 0, 0, THAI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('t','h','a','i'),

1 0

Eric Pouech : dbghelp: When StackWalk fails to get any frame information, create a default one.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 1ecef8242de0027dbe38f1a2d79062ebd87f9b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ecef8242de0027dbe38f1a2d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Jan 3 21:37:49 2012 +0100 dbghelp: When StackWalk fails to get any frame information, create a default one. --- programs/winedbg/stack.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index f6583a3..74dcc40 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -192,6 +192,7 @@ unsigned stack_fetch_frames(const CONTEXT* _ctx) * it to avoid any damage */ CONTEXT ctx = *_ctx; + BOOL ret; HeapFree(GetProcessHeap(), 0, dbg_curr_thread->frames); dbg_curr_thread->frames = NULL; @@ -208,11 +209,12 @@ unsigned stack_fetch_frames(const CONTEXT* _ctx) sf.AddrFrame.Mode = AddrModeFlat; } - while (StackWalk64(be_cpu->machine, dbg_curr_process->handle, - dbg_curr_thread->handle, &sf, &ctx, stack_read_mem, - SymFunctionTableAccess64, SymGetModuleBase64, NULL)) + while ((ret = StackWalk64(be_cpu->machine, dbg_curr_process->handle, + dbg_curr_thread->handle, &sf, &ctx, stack_read_mem, + SymFunctionTableAccess64, SymGetModuleBase64, NULL)) || + nf == 0) /* we always register first frame information */ { - dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames, + dbg_curr_thread->frames = dbg_heap_realloc(dbg_curr_thread->frames, (nf + 1) * sizeof(dbg_curr_thread->frames[0])); dbg_curr_thread->frames[nf].addr_pc = sf.AddrPC; @@ -230,8 +232,11 @@ unsigned stack_fetch_frames(const CONTEXT* _ctx) (dbg_curr_thread->frames[nf - 1].is_ctx_valid && memcmp(&dbg_curr_thread->frames[nf - 1].context, &ctx, sizeof(ctx)))); nf++; - /* we've probably gotten ourselves into an infinite loop so bail */ - if (nf > 200) break; + /* bail if: + * - we've (probably) gotten ourselves into an infinite loop, + * - or StackWalk failed on first frame + */ + if (nf > 200 || !ret) break; } dbg_curr_thread->curr_frame = -1; dbg_curr_thread->num_frames = nf;

1 0

Aric Stewart : usp10: Move GSUB functions to opentype.c.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 40199873919fc9478e1766acbbb6b6d795f41c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40199873919fc9478e1766acb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 4 08:13:44 2012 -0600 usp10: Move GSUB functions to opentype.c. --- dlls/usp10/opentype.c | 809 +++++++++++++++++++++++++++++++++++++++++ dlls/usp10/shape.c | 841 +------------------------------------------ dlls/usp10/usp10_internal.h | 7 + 3 files changed, 827 insertions(+), 830 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40199873919fc9478e176…

1 0

Alexandre Julliard : secur32/tests: Don' t compare the encrypted results if the session key is different.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: ee1e1f0fdbf7313bfd1ac1c7145be20b8530f882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1e1f0fdbf7313bfd1ac1c71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 23:28:13 2012 +0100 secur32/tests: Don't compare the encrypted results if the session key is different. --- dlls/secur32/tests/ntlm.c | 82 ++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 48 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d3cd915..7533899 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -1058,47 +1058,43 @@ static void testSignSeal(void) ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); - if (memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, - crypt.pBuffers[0].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[0].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[0].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } - ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, - crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); - if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, - crypt.pBuffers[1].cbBuffer)) + /* first 8 bytes must always be the same */ + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, 8), "Crypt trailer not as expected.\n"); + + /* the rest depends on the session key */ + if (!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, crypt.pBuffers[0].cbBuffer)) { - int i; - for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + ok(!memcmp(crypt.pBuffers[0].pvBuffer, crypt_trailer_client, + crypt.pBuffers[0].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n"); + if (memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client, + crypt.pBuffers[1].cbBuffer)) { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); + int i; + for (i = 0; i < crypt.pBuffers[1].cbBuffer; i++) + { + if (i % 8 == 0) printf(" "); + printf("0x%02x,", ((unsigned char *)crypt.pBuffers[1].pvBuffer)[i]); + if (i % 8 == 7) printf("\n"); + } + printf("\n"); } - printf("\n"); - } - data[0].cbBuffer = sizeof(crypt_trailer_server); - data[1].cbBuffer = sizeof(crypt_message_server); - memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); - memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); + data[0].cbBuffer = sizeof(crypt_trailer_server); + data[1].cbBuffer = sizeof(crypt_message_server); + memcpy(data[0].pvBuffer, crypt_trailer_server, data[0].cbBuffer); + memcpy(data[1].pvBuffer, crypt_message_server, data[1].cbBuffer); - sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); + sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); - ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", - getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, - crypt.pBuffers[1].cbBuffer), - "Failed to decrypt message correctly.\n"); + ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", + getSecError(sec_status)); + ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, + crypt.pBuffers[1].cbBuffer), + "Failed to decrypt message correctly.\n"); + } + else trace( "A different session key is being used\n" ); trace("Testing with more than one buffer.\n"); @@ -1139,20 +1135,10 @@ static void testSignSeal(void) ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); - ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer), "Crypt trailer not as expected.\n"); + ok(!memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, 8), "Crypt trailer not as expected.\n"); + if (memcmp(crypt.pBuffers[3].pvBuffer, crypt_trailer_client2, - crypt.pBuffers[3].cbBuffer)) - { - int i; - for (i = 0; i < crypt.pBuffers[3].cbBuffer; i++) - { - if (i % 8 == 0) printf(" "); - printf("0x%02x,", ((unsigned char *)crypt.pBuffers[3].pvBuffer)[i]); - if (i % 8 == 7) printf("\n"); - } - printf("\n"); - } + crypt.pBuffers[3].cbBuffer)) goto end; ok(!memcmp(crypt.pBuffers[1].pvBuffer, crypt_message_client2, crypt.pBuffers[1].cbBuffer), "Crypt message not as expected.\n");

1 0

Henri Verbeet : d3d10: Add a D3D10CompileEffectFromMemory() stub.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 110aa65e0d0103a605b43c0037f7664f3dd62dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=110aa65e0d0103a605b43c003… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:51 2012 +0100 d3d10: Add a D3D10CompileEffectFromMemory() stub. --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_main.c | 18 ++++++++++++++++++ include/d3d10effect.h | 3 +++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index d1b2b98..9f6210b 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -1,4 +1,4 @@ -@ stub D3D10CompileEffectFromMemory +@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) @ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) @ stdcall D3D10CreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob @ stdcall D3D10CreateDevice(ptr long ptr long long ptr) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index af792d4..5c3eec8 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -243,6 +243,24 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return S_OK; } +HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, + ID3D10Blob **effect, ID3D10Blob **errors) +{ + FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," + " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + data, data_size, wine_dbgstr_a(filename), defines, include, + hlsl_flags, fx_flags, effect, errors); + + if (effect) + *effect = NULL; + if (errors) + *errors = NULL; + + return E_NOTIMPL; +} + + LPCSTR WINAPI D3D10GetVertexShaderProfile(ID3D10Device *device) { FIXME("device %p stub!\n", device); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 5dbf31b..521cd4b 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -827,6 +827,9 @@ DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown) extern "C" { #endif +HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, + ID3D10Blob **effect, ID3D10Blob **errors); HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device,

1 0

Henri Verbeet : d3d10: Return D3D10_SVT_VOID instead of 0 from d3d10_variable_type().
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 79d1b2733368ff51ec6b1bd0253841c19a609af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d1b2733368ff51ec6b1bd02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:52 2012 +0100 d3d10: Return D3D10_SVT_VOID instead of 0 from d3d10_variable_type(). This is the same value, but makes it more obvious where e.g. an "Unhandled basetype D3D10_SVT_VOID." message would come from. --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 350f63b..ab04a9e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -363,7 +363,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 21: return D3D10_SVT_SAMPLER; default: FIXME("Unknown variable type %#x.\n", t); - return 0; + return D3D10_SVT_VOID; } } else @@ -376,7 +376,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 4: return D3D10_SVT_BOOL; default: FIXME("Unknown variable type %#x.\n", t); - return 0; + return D3D10_SVT_VOID; } } }

1 0

Henri Verbeet : d3d10: Handle D3D10_SVT_BUFFER.
by Alexandre Julliard 04 Jan '12

04 Jan '12

Module: wine Branch: master Commit: 863578cc29322803f9e4d678faa87c53d8a09647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863578cc29322803f9e4d678f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 3 23:06:53 2012 +0100 d3d10: Handle D3D10_SVT_BUFFER. --- dlls/d3d10/effect.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ab04a9e..b9d5cd9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -361,6 +361,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object) case 19: return D3D10_SVT_RENDERTARGETVIEW; case 20: return D3D10_SVT_DEPTHSTENCILVIEW; case 21: return D3D10_SVT_SAMPLER; + case 22: return D3D10_SVT_BUFFER; default: FIXME("Unknown variable type %#x.\n", t); return D3D10_SVT_VOID; @@ -648,6 +649,7 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) case D3D10_SVT_TEXTURE2DMSARRAY: case D3D10_SVT_TEXTURE3D: case D3D10_SVT_TEXTURECUBE: + case D3D10_SVT_BUFFER: /* Either resource or constant buffer. */ v->vtbl = (const ID3D10EffectVariableVtbl *)&d3d10_effect_shader_resource_variable_vtbl; break; @@ -1222,6 +1224,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const case D3D10_SVT_TEXTURECUBE: case D3D10_SVT_RENDERTARGETVIEW: case D3D10_SVT_DEPTHSTENCILVIEW: + case D3D10_SVT_BUFFER: TRACE("SVT could not have elements.\n"); break;

1 0