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

Eric Pouech : dbghelp: In i386 stackwalk implementation, store the frame index in the private information.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 20b229a2a8ba349a5c8942025877b637ea5bf678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b229a2a8ba349a5c8942025… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:30:46 2011 +0100 dbghelp: In i386 stackwalk implementation, store the frame index in the private information. --- dlls/dbghelp/cpu_i386.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 03d53b3..09d88a6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -135,14 +135,18 @@ static BOOL fetch_next_frame32(struct cpu_stack_walk* csw, enum st_mode {stm_start, stm_32bit, stm_16bit, stm_done}; /* indexes in Reserved array */ -#define __CurrentMode 0 -#define __CurrentSwitch 1 -#define __NextSwitch 2 +#define __CurrentModeCount 0 +#define __CurrentSwitch 1 +#define __NextSwitch 2 -#define curr_mode (frame->Reserved[__CurrentMode]) +#define curr_mode (frame->Reserved[__CurrentModeCount] & 0x0F) +#define curr_count (frame->Reserved[__CurrentModeCount] >> 4) #define curr_switch (frame->Reserved[__CurrentSwitch]) #define next_switch (frame->Reserved[__NextSwitch]) +#define set_curr_mode(m) {frame->Reserved[__CurrentModeCount] &= ~0x0F; frame->Reserved[__CurrentModeCount] |= (m & 0x0F);} +#define inc_curr_count() (frame->Reserved[__CurrentModeCount] += 0x10) + static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) { STACK32FRAME frame32; @@ -153,7 +157,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO WORD val16; DWORD val32; BOOL do_switch; - unsigned deltapc = 1; + unsigned deltapc; #ifdef __i386__ CONTEXT _context; #endif @@ -161,14 +165,25 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO /* sanity check */ if (curr_mode >= stm_done) return FALSE; - TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%p nSwitch=%p\n", + TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s cSwitch=%p nSwitch=%p\n", wine_dbgstr_addr(&frame->AddrPC), wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), + wine_dbgstr_longlong(curr_count), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); + /* if we're at first call (which doesn't actually unwind, it just computes ReturnPC, + * or if we're doing the first real unwind (count == 1), then we can directly use + * eip. otherwise, eip is *after* the insn that actually made the call to + * previous frame, so decrease eip by delta pc (1!) so that we're inside previous + * insn. + * Doing so, we ensure that the pc used for unwinding is always inside the function + * we want to use for next frame + */ + deltapc = curr_count <= 1 ? 0 : 1; + #ifdef __i386__ if (!context) { @@ -196,8 +211,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO } /* Init done */ - curr_mode = (frame->AddrPC.Mode == AddrModeFlat) ? stm_32bit : stm_16bit; - deltapc = 0; + set_curr_mode((frame->AddrPC.Mode == AddrModeFlat) ? stm_32bit : stm_16bit); /* cur_switch holds address of WOW32Reserved field in TEB in debuggee * address space @@ -307,7 +321,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO goto done_err; } curr_switch = (DWORD_PTR)frame16.frame32; - curr_mode = stm_32bit; + set_curr_mode(stm_32bit); if (!sw_read_mem(csw, curr_switch, &ch, sizeof(ch))) curr_switch = 0; } @@ -365,7 +379,7 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO if (!sw_read_mem(csw, sw_xlat_addr(csw, &tmp), &ch, sizeof(ch))) curr_switch = 0; - curr_mode = stm_16bit; + set_curr_mode(stm_16bit); } } else @@ -483,17 +497,19 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO else frame->FuncTableEntry = NULL; - TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s cSwitch=%p nSwitch=%p FuncTable=%p\n", + inc_curr_count(); + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s cSwitch=%p nSwitch=%p FuncTable=%p\n", wine_dbgstr_addr(&frame->AddrPC), wine_dbgstr_addr(&frame->AddrFrame), wine_dbgstr_addr(&frame->AddrReturn), wine_dbgstr_addr(&frame->AddrStack), curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), + wine_dbgstr_longlong(curr_count), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch, frame->FuncTableEntry); return TRUE; done_err: - curr_mode = stm_done; + set_curr_mode(stm_done); return FALSE; }

1 0

Eric Pouech : dbghelp: Fix StackWalk when dwarf or pdb unwinders are called on first frame ( CPU i386).
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 44eed2465c92ba6321f25ed70b3cd81b76c74c51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44eed2465c92ba6321f25ed70… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:30:21 2011 +0100 dbghelp: Fix StackWalk when dwarf or pdb unwinders are called on first frame (CPU i386). --- dlls/dbghelp/cpu_i386.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 6913b1b..817033b 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -217,26 +217,23 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO { DWORD_PTR xframe; struct pdb_cmd_pair cpair[4]; + CONTEXT newctx = *context; - if (dwarf2_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, context, &xframe)) + if (dwarf2_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, &newctx, &xframe)) { - frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; - frame->AddrStack.Offset = context->Esp = xframe; - frame->AddrFrame.Offset = context->Ebp; - frame->AddrReturn.Offset = context->Eip; + frame->AddrReturn.Mode = AddrModeFlat; + frame->AddrReturn.Offset = newctx.Eip; goto done_pep; } - cpair[0].name = "$ebp"; cpair[0].pvalue = &context->Ebp; - cpair[1].name = "$esp"; cpair[1].pvalue = &context->Esp; - cpair[2].name = "$eip"; cpair[2].pvalue = &context->Eip; - cpair[3].name = NULL; cpair[3].pvalue = NULL; + cpair[0].name = "$ebp"; cpair[0].pvalue = &newctx.Ebp; + cpair[1].name = "$esp"; cpair[1].pvalue = &newctx.Esp; + cpair[2].name = "$eip"; cpair[2].pvalue = &newctx.Eip; + cpair[3].name = NULL; cpair[3].pvalue = NULL; - if (pdb_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, context, cpair)) + if (pdb_virtual_unwind(csw, frame->AddrPC.Offset - deltapc, &newctx, cpair)) { - frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat; - frame->AddrStack.Offset = context->Esp; - frame->AddrFrame.Offset = context->Ebp; - frame->AddrReturn.Offset = context->Eip; + frame->AddrReturn.Mode = AddrModeFlat; + frame->AddrReturn.Offset = newctx.Eip; goto done_pep; } }

1 0

Jörg Höhle : winecoreaudio: Ignore failure to notify winmm wave clients.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 5021f6102b09820b7298e7885fd0069b47bacf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5021f6102b09820b7298e7885… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 01:53:54 2011 +0100 winecoreaudio: Ignore failure to notify winmm wave clients. --- dlls/winecoreaudio.drv/audio.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index ded830d..a2158ef 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -787,9 +787,9 @@ void CoreAudio_WaveRelease(void) /************************************************************************** * wodNotifyClient [internal] */ -static DWORD wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { - TRACE_(coreaudio)("wMsg = 0x%04x dwParm1 = %04x dwParam2 = %04x\n", wMsg, dwParam1, dwParam2); + TRACE("wMsg = 0x%04x dwParm1 = %04x dwParam2 = %04x\n", wMsg, dwParam1, dwParam2); switch (wMsg) { case WOM_OPEN: @@ -800,15 +800,12 @@ static DWORD wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD dwPara (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { - ERR("can't notify client !\n"); - return MMSYSERR_ERROR; + WARN("can't notify client !\n"); } break; default: - ERR("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; + FIXME("Unknown callback message %u\n", wMsg); } - return MMSYSERR_NOERROR; } @@ -975,9 +972,9 @@ static DWORD wodOpen(WORD wDevID, WINE_WAVEOUT_INSTANCE** pInstance, LPWAVEOPEND *pInstance = wwo; TRACE("opened instance %p\n", wwo); - ret = wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); + wodNotifyClient(wwo, WOM_OPEN, 0L, 0L); - return ret; + return MMSYSERR_NOERROR; error: if (audioUnit) @@ -1015,7 +1012,7 @@ static DWORD wodClose(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo) { OSSpinLockUnlock(&wwo->lock); WARN("buffers still playing !\n"); - ret = WAVERR_STILLPLAYING; + return WAVERR_STILLPLAYING; } else { OSStatus err; @@ -1045,7 +1042,7 @@ static DWORD wodClose(WORD wDevID, WINE_WAVEOUT_INSTANCE* wwo) list_remove(&wwo->entry); OSSpinLockUnlock(&WOutDev[wDevID].lock); - ret = wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); + wodNotifyClient(wwo, WOM_CLOSE, 0L, 0L); HeapFree(GetProcessHeap(), 0, wwo); } @@ -1749,7 +1746,7 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, /************************************************************************** * widNotifyClient [internal] */ -static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { TRACE("wMsg = 0x%04x dwParm1 = %04X dwParam2 = %04X\n", wMsg, dwParam1, dwParam2); @@ -1764,14 +1761,11 @@ static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam1, dwParam2)) { WARN("can't notify client !\n"); - return MMSYSERR_ERROR; } break; default: FIXME("Unknown callback message %u\n", wMsg); - return MMSYSERR_INVALPARAM; } - return MMSYSERR_NOERROR; } @@ -2029,7 +2023,9 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) OSSpinLockUnlock(&wwi->lock); - return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + widNotifyClient(wwi, WIM_OPEN, 0L, 0L); + + return MMSYSERR_NOERROR; } @@ -2099,7 +2095,7 @@ static DWORD widClose(WORD wDevID) wwi->state = WINE_WS_CLOSED; OSSpinLockUnlock(&wwi->lock); - ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); + widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); return ret; }

1 0

Eric Pouech : dbghelp: In i386 stack unwinder, ensure we always return decent 64bit values.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: c5f329e62cd349fb9a70fa28eabf326693fc9e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f329e62cd349fb9a70fa28e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Mar 13 21:30:12 2011 +0100 dbghelp: In i386 stack unwinder, ensure we always return decent 64bit values. --- dlls/dbghelp/cpu_i386.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 61ed427..6913b1b 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -105,7 +105,8 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO char ch; ADDRESS64 tmp; DWORD p; - WORD val; + WORD val16; + DWORD val32; BOOL do_switch; unsigned deltapc = 1; #ifdef __i386__ @@ -360,9 +361,9 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO frame->AddrStack.Offset = frame->AddrFrame.Offset + 2 * sizeof(WORD); /* "pop up" previous BP value */ if (!sw_read_mem(csw, sw_xlat_addr(csw, &frame->AddrFrame), - &val, sizeof(WORD))) + &val16, sizeof(WORD))) goto done_err; - frame->AddrFrame.Offset = val; + frame->AddrFrame.Offset = val16; } else { @@ -394,9 +395,9 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO #endif frame->AddrStack.Offset = frame->AddrFrame.Offset + 2 * sizeof(DWORD); /* "pop up" previous EBP value */ - if (!sw_read_mem(csw, frame->AddrFrame.Offset, - &frame->AddrFrame.Offset, sizeof(DWORD))) + if (!sw_read_mem(csw, frame->AddrFrame.Offset, &val32, sizeof(DWORD))) goto done_err; + frame->AddrFrame.Offset = val32; } } } @@ -406,30 +407,30 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO unsigned int i; p = sw_xlat_addr(csw, &frame->AddrFrame); - if (!sw_read_mem(csw, p + sizeof(WORD), &val, sizeof(WORD))) + if (!sw_read_mem(csw, p + sizeof(WORD), &val16, sizeof(WORD))) goto done_err; - frame->AddrReturn.Offset = val; + frame->AddrReturn.Offset = val16; /* get potential cs if a far call was used */ - if (!sw_read_mem(csw, p + 2 * sizeof(WORD), &val, sizeof(WORD))) + if (!sw_read_mem(csw, p + 2 * sizeof(WORD), &val16, sizeof(WORD))) goto done_err; if (frame->AddrFrame.Offset & 1) - frame->AddrReturn.Segment = val; /* far call assumed */ + frame->AddrReturn.Segment = val16; /* far call assumed */ else { /* not explicitly marked as far call, * but check whether it could be anyway */ - if ((val & 7) == 7 && val != frame->AddrReturn.Segment) + if ((val16 & 7) == 7 && val16 != frame->AddrReturn.Segment) { LDT_ENTRY le; - if (GetThreadSelectorEntry(csw->hThread, val, &le) && + if (GetThreadSelectorEntry(csw->hThread, val16, &le) && (le.HighWord.Bits.Type & 0x08)) /* code segment */ { /* it is very uncommon to push a code segment cs as * a parameter, so this should work in most cases */ - frame->AddrReturn.Segment = val; + frame->AddrReturn.Segment = val16; } } } @@ -440,21 +441,25 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO */ for (i = 0; i < sizeof(frame->Params) / sizeof(frame->Params[0]); i++) { - sw_read_mem(csw, p + (2 + i) * sizeof(WORD), &val, sizeof(val)); - frame->Params[i] = val; + sw_read_mem(csw, p + (2 + i) * sizeof(WORD), &val16, sizeof(val16)); + frame->Params[i] = val16; } } else { - if (!sw_read_mem(csw, frame->AddrFrame.Offset + sizeof(DWORD), - &frame->AddrReturn.Offset, sizeof(DWORD))) + unsigned int i; + if (!sw_read_mem(csw, frame->AddrFrame.Offset + sizeof(DWORD), &val32, sizeof(DWORD))) { WARN("Cannot read new frame offset %p\n", (void*)(DWORD_PTR)(frame->AddrFrame.Offset + (int)sizeof(DWORD))); goto done_err; } - sw_read_mem(csw, frame->AddrFrame.Offset + 2 * sizeof(DWORD), - frame->Params, sizeof(frame->Params)); + frame->AddrReturn.Offset = val32; + for (i = 0; i < sizeof(frame->Params) / sizeof(frame->Params[0]); i++) + { + sw_read_mem(csw, frame->AddrFrame.Offset + (2 + i) * sizeof(DWORD), &val32, sizeof(val32)); + frame->Params[i] = val32; + } } #ifdef __i386__ if (context)

1 0

Jörg Höhle : winecoreaudio: Fix 64-bits incompatibilities.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: a74c29e08181ee8f803f706240d2d4a2b7453b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74c29e08181ee8f803f70624… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 02:12:49 2011 +0100 winecoreaudio: Fix 64-bits incompatibilities. --- dlls/winecoreaudio.drv/audio.c | 16 ++++++++-------- dlls/winecoreaudio.drv/midi.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index a2158ef..9fb11b1 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -787,9 +787,9 @@ void CoreAudio_WaveRelease(void) /************************************************************************** * wodNotifyClient [internal] */ -static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("wMsg = 0x%04x dwParm1 = %04x dwParam2 = %04x\n", wMsg, dwParam1, dwParam2); + TRACE("wMsg = 0x%04x dwParm1 = %04lx dwParam2 = %04lx\n", wMsg, dwParam1, dwParam2); switch (wMsg) { case WOM_OPEN: @@ -1178,7 +1178,7 @@ static void wodHelper_NotifyDoneForList(WINE_WAVEOUT_INSTANCE* wwo, LPWAVEHDR lp lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); + wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0); lpWaveHdr = lpNext; } @@ -1746,9 +1746,9 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon, /************************************************************************** * widNotifyClient [internal] */ -static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("wMsg = 0x%04x dwParm1 = %04X dwParam2 = %04X\n", wMsg, dwParam1, dwParam2); + TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2); switch (wMsg) { @@ -1816,7 +1816,7 @@ static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi) lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); lpWaveHdr = lpNext; } @@ -2265,7 +2265,7 @@ static DWORD widStop(WORD wDevID) lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); } return ret; @@ -2345,7 +2345,7 @@ static DWORD widReset(WORD wDevID) lpWaveHdr->lpNext = NULL; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags |= WHDR_DONE; - widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); + widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0); lpWaveHdr = lpNext; } diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index d2b08e2..071e937 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -222,14 +222,14 @@ LONG CoreAudio_MIDIRelease(void) /************************************************************************** * MIDI_NotifyClient [internal] */ -static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwParam2) +static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { DWORD dwCallBack; UINT uFlags; HANDLE hDev; DWORD dwInstance; - TRACE("wDevID=%d wMsg=%d dwParm1=%04X dwParam2=%04X\n", wDevID, wMsg, dwParam1, dwParam2); + TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { case MOM_OPEN: @@ -443,7 +443,7 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L); + MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); return MMSYSERR_NOERROR; } @@ -811,7 +811,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&midiInLock);

1 0

Jörg Höhle : winecoreaudio: Do not access MIDIHDR past notification callback.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: c0d6db394479ef48fe858efbb8e0f5b86bdb2109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d6db394479ef48fe858efbb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Mar 9 01:51:08 2011 +0100 winecoreaudio: Do not access MIDIHDR past notification callback. --- dlls/winecoreaudio.drv/midi.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 5e6eeae..d2b08e2 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -694,8 +694,8 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) LPMIDIHDR ptr; for (ptr = sources[wDevID].lpQueueHdr; ptr->lpNext != 0; - ptr = (LPMIDIHDR)ptr->lpNext); - ptr->lpNext = (struct midihdr_tag*)lpMidiHdr; + ptr = ptr->lpNext); + ptr->lpNext = lpMidiHdr; } LeaveCriticalSection(&midiInLock); @@ -806,11 +806,12 @@ static DWORD MIDIIn_Reset(WORD wDevID) EnterCriticalSection(&midiInLock); while (sources[wDevID].lpQueueHdr) { - sources[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; - sources[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; + LPMIDIHDR lpMidiHdr = sources[wDevID].lpQueueHdr; + sources[wDevID].lpQueueHdr = lpMidiHdr->lpNext; + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)sources[wDevID].lpQueueHdr, dwTime); - sources[wDevID].lpQueueHdr = (LPMIDIHDR)sources[wDevID].lpQueueHdr->lpNext; + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime); } LeaveCriticalSection(&midiInLock);

1 0

Dmitry Timoshkov : advapi32: Properly skip the tests that depend on English locale.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 99109567ad134e5aff36473661cf23091a7a36ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=99109567ad134e5aff3647366… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 14 17:35:04 2011 +0800 advapi32: Properly skip the tests that depend on English locale. --- dlls/advapi32/tests/security.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3dae81b..130352e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1917,7 +1917,7 @@ static void test_LookupAccountName(void) domain_size = domain_save; sid_size = sid_save; - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (test with hardcoded 'Everyone')\n"); } @@ -2055,7 +2055,7 @@ static void test_LookupAccountName(void) return; } - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (skipping well known name creation tests)\n"); return; @@ -2542,7 +2542,7 @@ static void test_SetEntriesInAclW(void) ok(NewAcl != NULL, "returned acl was NULL\n"); LocalFree(NewAcl); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (test with hardcoded 'Everyone')\n"); } @@ -2673,7 +2673,7 @@ static void test_SetEntriesInAclA(void) ok(NewAcl != NULL, "returned acl was NULL\n"); LocalFree(NewAcl); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (test with hardcoded 'Everyone')\n"); }

1 0

Stefan Dösinger : d3d8: Test depth stencil size mismatches.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: a6424b94450cd10911039eb381eb976f798c3410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6424b94450cd10911039eb38… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 10 22:35:03 2011 +0100 d3d8: Test depth stencil size mismatches. --- dlls/d3d8/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index def9f80..a9fe6f3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2117,6 +2117,44 @@ cleanup: DestroyWindow(hwnd); } +static void test_depth_stencil_size(void) +{ + IDirect3DDevice8 *device; + IDirect3DSurface8 *ds, *rt, *ds_bigger; + IDirect3D8 *d3d8; + HRESULT hr; + HWND hwnd; + + d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d8 || !hwnd) goto cleanup; + + device = create_device(d3d8, hwnd, hwnd, TRUE); + if (!device) goto cleanup; + + hr = IDirect3DDevice8_CreateRenderTarget(device, 64, 64, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 32, 32, D3DFMT_D24X8, D3DMULTISAMPLE_NONE, &ds); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24X8, D3DMULTISAMPLE_NONE, &ds_bigger); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetRenderTarget returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds_bigger); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + + IDirect3DSurface8_Release(rt); + IDirect3DSurface8_Release(ds); + IDirect3DSurface8_Release(ds_bigger); + +cleanup: + if (d3d8) IDirect3D8_Release(d3d8); + DestroyWindow(hwnd); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -2164,6 +2202,7 @@ START_TEST(device) test_depth_stencil_reset(); test_wndproc(); test_wndproc_windowed(); + test_depth_stencil_size(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d8: Destroy the windows after the test.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: a80579b2f3b6d63937259f7b9d529caca28d6b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80579b2f3b6d63937259f7b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 10 19:49:36 2011 +0100 d3d8: Destroy the windows after the test. --- dlls/d3d8/tests/device.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6885dd4..62f19a2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -767,6 +767,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D8_Release(pD3d); + DestroyWindow(hwnd); } static void test_states(void) @@ -812,6 +813,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D8_Release(pD3d); + DestroyWindow(hwnd); } static void test_shader_versions(void) @@ -935,7 +937,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D8_Release(pD3d); - if(hwnd) DestroyWindow(hwnd); + DestroyWindow(hwnd); } static void test_shader(void) @@ -1184,7 +1186,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D8_Release(pD3d); - if(hwnd) DestroyWindow(hwnd); + DestroyWindow(hwnd); } static void test_limits(void) @@ -1250,7 +1252,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (pD3d) IDirect3D8_Release(pD3d); - if(hwnd) DestroyWindow(hwnd); + DestroyWindow(hwnd); } static void test_lights(void) @@ -1325,6 +1327,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (d3d8) IDirect3D8_Release(d3d8); + DestroyWindow(hwnd); } static void test_render_zero_triangles(void) @@ -1399,6 +1402,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (d3d8) IDirect3D8_Release(d3d8); + DestroyWindow(hwnd); } static void test_depth_stencil_reset(void) @@ -1516,6 +1520,7 @@ cleanup: ok(!refcount, "Device has %u references left.\n", refcount); } if (d3d8) IDirect3D8_Release(d3d8); + DestroyWindow(hwnd); } static HWND filter_messages; @@ -2109,6 +2114,7 @@ static void test_ApplyStateBlock(void) IDirect3DDevice8_Release(device); cleanup: if (d3d8) IDirect3D8_Release(d3d8); + DestroyWindow(hwnd); } START_TEST(device)

1 0

Dmitry Timoshkov : advapi32: Move the 'const' modifier in front of the storage specifier.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 494ceab83ab4bca01729d4a0af7302c11c1f9806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494ceab83ab4bca01729d4a0a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 14 18:31:40 2011 +0800 advapi32: Move the 'const' modifier in front of the storage specifier. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 130352e..74afc7b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -696,7 +696,7 @@ static void test_FileSecurity(void) DWORD sdSize; DWORD retSize; BYTE *sd; - SECURITY_INFORMATION const request = OWNER_SECURITY_INFORMATION + const SECURITY_INFORMATION request = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;

1 0