February 2010 - Wine-Commits

Alexandre Julliard : ntdll: Export RtlInterlockedCompareExchange64.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 98ca10c89da597da57ce975586992dad3159c259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ca10c89da597da57ce97558… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 12:23:48 2010 +0100 ntdll: Export RtlInterlockedCompareExchange64. --- dlls/ntdll/large_int.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 46068b3..e2b0734 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "ntstatus.h" @@ -375,6 +378,15 @@ LONGLONG WINAPI RtlExtendedMagicDivide( } /* if */ } + +/************************************************************************* + * RtlInterlockedCompareExchange64 (NTDLL.@) + */ +LONGLONG WINAPI RtlInterlockedCompareExchange64( LONGLONG *dest, LONGLONG xchg, LONGLONG compare ) +{ + return interlocked_cmpxchg64( dest, xchg, compare ); +} + #endif /* _WIN64 */ /****************************************************************************** diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c7c81e8..241f3d8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -684,6 +684,7 @@ @ stdcall RtlInt64ToUnicodeString(double long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) +@ stdcall -arch=win32 -ret64 RtlInterlockedCompareExchange64(ptr double double) @ stdcall RtlInterlockedFlushSList(ptr) @ stdcall RtlInterlockedPopEntrySList(ptr) @ stdcall RtlInterlockedPushEntrySList(ptr ptr)

1 0

Alexandre Julliard : wininet/tests: Fix a test failure on Win2k.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 7aaec2e667ec1944c9f8d2500be32e75c9fa35a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aaec2e667ec1944c9f8d2500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:44:18 2010 +0100 wininet/tests: Fix a test failure on Win2k. --- dlls/wininet/tests/ftp.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index d152601..df9c347 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -800,10 +800,16 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); hSearch = FtpFindFirstFileA(hFtp, "welcome.msg", &findData, 0, 0); error = GetLastError(); - ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); - ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error ); - InternetCloseHandle(hSearch); /* Just in case */ + ok ( hSearch == NULL || broken(hSearch != NULL), /* win2k */ + "Expected FtpFindFirstFileA to fail\n" ); + if (!hSearch) + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error ); + else + { + ok( error == ERROR_SUCCESS, "wrong error %u on success\n", GetLastError() ); + InternetCloseHandle(hSearch); + } InternetCloseHandle(hOpenFile);

1 0

Alexandre Julliard : psapi/tests: Handle an error that happens on Win2k.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: c7f7d1985eabf1fb31302b4c2c5d990aa2733d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f7d1985eabf1fb31302b4c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:39:24 2010 +0100 psapi/tests: Handle an error that happens on Win2k. --- dlls/psapi/tests/psapi_main.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 6ef5b04..21a3d1a 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -157,8 +157,12 @@ static void test_GetMappedFileName(void) w32_err(pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)), ERROR_INVALID_HANDLE); w32_err(pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)), ERROR_ACCESS_DENIED); - if(!w32_suc(ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)))) - return; + + SetLastError( 0xdeadbeef ); + ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath)); + ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ + "GetMappedFileNameA failed with error %u\n", GetLastError() ); + if (!ret) return; ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */

1 0

Alexandre Julliard : user32/tests: Fix the menu capture test for NT4.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 30e1445f085df28f398f02ed41efc2cd078e3da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e1445f085df28f398f02ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:29:12 2010 +0100 user32/tests: Fix the menu capture test for NT4. --- dlls/user32/tests/win.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c92b3ed..615cb2a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2720,11 +2720,17 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); - ok(!set_cap_wnd, "SetCapture should have failed!\n"); + ok(!set_cap_wnd || broken(set_cap_wnd == cap_wnd), /* nt4 */ + "SetCapture should have failed!\n"); + if (set_cap_wnd) + { + DestroyWindow(hWnd); + break; + } /* check that SetCapture fails for another window and that it does not touch the error code */ set_cap_wnd = SetCapture(hWnd); - ok(!set_cap_wnd, "ReleaseCapture should have failed!\n"); + ok(!set_cap_wnd, "SetCapture should have failed!\n"); /* check that ReleaseCapture fails and does not touch the error code */ status = ReleaseCapture(); @@ -2764,8 +2770,10 @@ static void test_capture_4(void) HINSTANCE hInstance = GetModuleHandleA( NULL ); if (!pGetGUIThreadInfo) + { win_skip("GetGUIThreadInfo is not available\n"); - + return; + } wclass.lpszClassName = "TestCapture4Class"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = test_capture_4_proc;

1 0

Jörg Höhle : wineoss: Ignore failure to notify MIDI clients.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 4f1604e92de3f0a5d70c0427349a52042d975f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1604e92de3f0a5d70c04273… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 4 21:04:56 2010 +0100 wineoss: Ignore failure to notify MIDI clients. --- dlls/wineoss.drv/midi.c | 56 +++++++++++++--------------------------------- 1 files changed, 16 insertions(+), 40 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d82dbdc..52a6066 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -398,8 +398,8 @@ LRESULT OSS_MidiExit(void) /************************************************************************** * MIDI_NotifyClient [internal] */ -static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, - DWORD dwParam1, DWORD dwParam2) +static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, + DWORD dwParam1, DWORD dwParam2) { DWORD dwCallBack; UINT uFlags; @@ -414,8 +414,7 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: - if (wDevID > MODM_NumDevs) - return MMSYSERR_BADDEVICEID; + if (wDevID > MODM_NumDevs) return; dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback; uFlags = MidiOutDev[wDevID].wFlags; @@ -430,8 +429,7 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, case MIM_ERROR: case MIM_LONGERROR: case MIM_MOREDATA: - if (wDevID > MIDM_NumDevs) - return MMSYSERR_BADDEVICEID; + if (wDevID > MIDM_NumDevs) return; dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; uFlags = MidiInDev[wDevID].wFlags; @@ -439,12 +437,11 @@ static DWORD MIDI_NotifyClient(UINT wDevID, WORD wMsg, dwInstance = MidiInDev[wDevID].midiDesc.dwInstance; break; default: - WARN("Unsupported MSW-MIDI message %u\n", wMsg); - return MMSYSERR_ERROR; + ERR("Unsupported MSW-MIDI message %u\n", wMsg); + return; } - return DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2) ? - 0 : MMSYSERR_ERROR; + DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } static int midi_warn = 1; @@ -569,9 +566,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) { - WARN("Couldn't notify client\n"); - } + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } LeaveCriticalSection(&crit_sect); return; @@ -637,9 +632,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) TRACE("Sending event %08x\n", toSend); MidiInDev[wDevID].incLen = 0; dwTime -= MidiInDev[wDevID].startTime; - if (MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime) != MMSYSERR_NOERROR) { - WARN("Couldn't notify client\n"); - } + MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); } } @@ -779,10 +772,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].incLen = 0; MidiInDev[wDevID].startTime = 0; - if (MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); return MMSYSERR_NOERROR; } @@ -823,10 +813,7 @@ static DWORD midClose(WORD wDevID) midiCloseSeq(); MidiInDev[wDevID].bufsize = 0; - if (MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - ret = MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; return ret; } @@ -924,10 +911,8 @@ static DWORD midReset(WORD wDevID) MidiInDev[wDevID].lpQueueHdr->dwFlags &= ~MHDR_INQUEUE; MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE; /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, - (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { - WARN("Couldn't notify client\n"); - } + MIDI_NotifyClient(wDevID, MIM_LONGDATA, + (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime); MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; } LeaveCriticalSection(&crit_sect); @@ -1174,10 +1159,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].bufsize = 0x3FFF; MidiOutDev[wDevID].midiDesc = *lpDesc; - if (MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); TRACE("Successful !\n"); return MMSYSERR_NOERROR; } @@ -1219,10 +1201,7 @@ static DWORD modClose(WORD wDevID) MidiOutDev[wDevID].lpExtra = 0; MidiOutDev[wDevID].bufsize = 0; - if (MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - ret = MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); MidiOutDev[wDevID].midiDesc.hMidi = 0; return ret; } @@ -1596,10 +1575,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - if (MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L) != MMSYSERR_NOERROR) { - WARN("can't notify client !\n"); - return MMSYSERR_INVALPARAM; - } + MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); return MMSYSERR_NOERROR; }

1 0

Alexandre Julliard : comdlg32/tests: Remove some AbortProc checks that fail on various Windows versions.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 88cdfb9d9256333dbb023e53a64867c716cece74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cdfb9d9256333dbb023e53a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:29:27 2010 +0100 comdlg32/tests: Remove some AbortProc checks that fail on various Windows versions. --- dlls/comdlg32/tests/printdlg.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 61eefa6..f021b01 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -353,25 +353,19 @@ static void test_abort_proc(void) goto end; } - ok(abort_proc_called, "AbortProc didn't get called by StartDoc.\n"); - abort_proc_called = FALSE; + /* StartDoc may or may not call abort proc */ + abort_proc_called = FALSE; ok(StartPage(print_dc) > 0, "StartPage failed\n"); ok(!abort_proc_called, "AbortProc got called unexpectedly by StartPage.\n"); abort_proc_called = FALSE; + /* following functions sometimes call abort proc too */ ok(FillRect(print_dc, &rect, (HBRUSH)(COLOR_BACKGROUND + 1)), "FillRect failed\n"); - ok(!abort_proc_called, "AbortProc got called unexpectedly by StretchBlt.\n"); - abort_proc_called = FALSE; - ok(EndPage(print_dc) > 0, "EndPage failed\n"); - ok(!abort_proc_called, "AbortProc got called unexpectedly by EndPage.\n"); - abort_proc_called = FALSE; - ok(EndDoc(print_dc) > 0, "EndDoc failed\n"); - ok(!abort_proc_called, "AbortProc got called unexpectedly by EndDoc.\n"); - abort_proc_called = FALSE; + abort_proc_called = FALSE; ok(DeleteDC(print_dc), "DeleteDC failed\n"); ok(!abort_proc_called, "AbortProc got called unexpectedly by DeleteDC.\n"); abort_proc_called = FALSE;

1 0

Vincent Povirk : windowscodecs: Define a custom png error handler.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 44478b5364f0c82b5eacb2c3773e76d240bc5066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44478b5364f0c82b5eacb2c37… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 4 17:43:53 2010 -0600 windowscodecs: Define a custom png error handler. --- dlls/windowscodecs/pngformat.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 4a398dd..482ea90 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -51,6 +51,7 @@ MAKE_FUNCPTR(png_destroy_write_struct); MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); +MAKE_FUNCPTR(png_get_error_ptr); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); @@ -58,6 +59,7 @@ MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_error_fn); MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_to_rgb); @@ -92,6 +94,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_error); LOAD_FUNCPTR(png_get_bit_depth); LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_error_ptr); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); @@ -99,6 +102,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_error_fn); LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_gray_to_rgb); @@ -120,6 +124,23 @@ static void *load_libpng(void) return libpng_handle; } +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WARN("PNG error: %s\n", debugstr_a(error_message)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WARN("PNG warning: %s\n", debugstr_a(warning_message)); +} + typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; @@ -226,6 +247,8 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p int num_trans; png_uint_32 transparency; png_color_16p trans_values; + jmp_buf jmpbuf; + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); /* initialize libpng */ @@ -249,13 +272,14 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } /* set up setjmp/longjmp error handling */ - if (setjmp(png_jmpbuf(This->png_ptr))) + if (setjmp(jmpbuf)) { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; return E_FAIL; } + ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); /* seek to the start of the stream */ seek.QuadPart = 0; @@ -849,6 +873,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, PngEncoder *This = encoder_from_frame(iface); png_byte **row_pointers=NULL; UINT i; + jmp_buf jmpbuf; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); if (!This->frame_initialized || !This->width || !This->height || !This->format) @@ -858,11 +883,12 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, return E_INVALIDARG; /* set up setjmp/longjmp error handling */ - if (setjmp(png_jmpbuf(This->png_ptr))) + if (setjmp(jmpbuf)) { HeapFree(GetProcessHeap(), 0, row_pointers); return E_FAIL; } + ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); if (!This->info_written) { @@ -978,16 +1004,18 @@ static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) { PngEncoder *This = encoder_from_frame(iface); + jmp_buf jmpbuf; TRACE("(%p)\n", iface); if (!This->info_written || This->lines_written != This->height || This->frame_committed) return WINCODEC_ERR_WRONGSTATE; /* set up setjmp/longjmp error handling */ - if (setjmp(png_jmpbuf(This->png_ptr))) + if (setjmp(jmpbuf)) { return E_FAIL; } + ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); ppng_write_end(This->png_ptr, This->info_ptr); @@ -1093,6 +1121,7 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { PngEncoder *This = (PngEncoder*)iface; + jmp_buf jmpbuf; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); @@ -1116,7 +1145,7 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, This->stream = pIStream; /* set up setjmp/longjmp error handling */ - if (setjmp(png_jmpbuf(This->png_ptr))) + if (setjmp(jmpbuf)) { ppng_destroy_write_struct(&This->png_ptr, &This->info_ptr); This->png_ptr = NULL; @@ -1124,6 +1153,7 @@ static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, This->stream = NULL; return E_FAIL; } + ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); /* set up custom i/o handling */ ppng_set_write_fn(This->png_ptr, This, user_write_data, user_flush);

1 0

Alexandre Julliard : mstask/tests: Add some error codes for Win2k.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: f5c35b14f6d73ffb951d60c8ca69de0222918aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c35b14f6d73ffb951d60c8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 11:35:38 2010 +0100 mstask/tests: Add some error codes for Win2k. --- dlls/mstask/tests/task.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 82df6dd..d139207 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -445,7 +445,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hres == SCHED_E_CANNOT_OPEN_TASK), + hres == SCHED_E_CANNOT_OPEN_TASK || + hres == 0x200), /* win2k */ "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { @@ -464,7 +465,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hres == SCHED_E_CANNOT_OPEN_TASK), + hres == SCHED_E_CANNOT_OPEN_TASK || + hres == 0x200), /* win2k */ "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) { @@ -480,7 +482,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) hres = ITask_GetAccountInformation(test_task, &account_name); ok(hres == S_OK || broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || - hres == SCHED_E_CANNOT_OPEN_TASK), + hres == SCHED_E_CANNOT_OPEN_TASK || + hres == 0x200), /* win2k */ "GetAccountInformation failed: %08x\n", hres); if (hres == S_OK) {

1 0

Vincent Povirk : windowscodecs: Replace a call to a deprecated libpng function.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 29a599a5d688af33be7cd469aee9d3d19d45249b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a599a5d688af33be7cd469a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 4 17:45:31 2010 -0600 windowscodecs: Replace a call to a deprecated libpng function. It was removed in libpng 1.4.0. --- dlls/windowscodecs/pngformat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index f361363..4a398dd 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -58,8 +58,8 @@ MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_expand_gray_1_2_4_to_8); MAKE_FUNCPTR(png_set_filler); -MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); MAKE_FUNCPTR(png_set_gray_to_rgb); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_set_pHYs); @@ -99,8 +99,8 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_expand_gray_1_2_4_to_8); LOAD_FUNCPTR(png_set_filler); - LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); LOAD_FUNCPTR(png_set_gray_to_rgb); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_pHYs); @@ -282,7 +282,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p { if (bit_depth < 8) { - ppng_set_gray_1_2_4_to_8(This->png_ptr); + ppng_set_expand_gray_1_2_4_to_8(This->png_ptr); bit_depth = 8; } ppng_set_gray_to_rgb(This->png_ptr);

1 0

Henri Verbeet : wined3d: Get rid of the now redundant max_ffp_texture_stages device field.
by Alexandre Julliard Feb. 5, 2010

Feb. 5, 2010

Module: wine Branch: master Commit: 3df59ef0d5fa407362648220e394030214befc1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df59ef0d5fa407362648220e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 4 18:30:06 2010 +0100 wined3d: Get rid of the now redundant max_ffp_texture_stages device field. --- dlls/wined3d/device.c | 33 ++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a25f5e4..f10348c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3101,15 +3101,17 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { } } -static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { +static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This, const struct wined3d_gl_info *gl_info) +{ unsigned int i, tex; WORD ffu_map; device_update_fixed_function_usage_map(This); ffu_map = This->fixed_function_usage_map; - if (This->max_ffp_textures == This->max_ffp_texture_stages || - This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { + if (This->max_ffp_textures == gl_info->limits.texture_stages + || This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) + { for (i = 0; ffu_map; ffu_map >>= 1, ++i) { if (!(ffu_map & 1)) continue; @@ -3139,10 +3141,10 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { } } -static void device_map_psamplers(IWineD3DDeviceImpl *This) { +static void device_map_psamplers(IWineD3DDeviceImpl *This, const struct wined3d_gl_info *gl_info) +{ const WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.sampler_type; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; unsigned int i; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -3182,11 +3184,12 @@ static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshad return !vshader_sampler_tokens[current_mapping - MAX_FRAGMENT_SAMPLERS]; } -static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { +static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps, const struct wined3d_gl_info *gl_info) +{ const WINED3DSAMPLER_TEXTURE_TYPE *vshader_sampler_type = ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.reg_maps.sampler_type; const WINED3DSAMPLER_TEXTURE_TYPE *pshader_sampler_type = NULL; - int start = min(MAX_COMBINED_SAMPLERS, This->adapter->gl_info.limits.combined_samplers) - 1; + int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; int i; if (ps) { @@ -3223,7 +3226,9 @@ static void device_map_vsamplers(IWineD3DDeviceImpl *This, BOOL ps) { } } -void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { +void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) +{ + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; BOOL vs = use_vs(This->stateBlock); BOOL ps = use_ps(This->stateBlock); /* @@ -3233,15 +3238,10 @@ void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) { * -> When the mapping of a stage is changed, sampler and ALL texture stage states have * to be reset. Because of that try to work with a 1:1 mapping as much as possible */ - if (ps) { - device_map_psamplers(This); - } else { - device_map_fixed_function_samplers(This); - } + if (ps) device_map_psamplers(This, gl_info); + else device_map_fixed_function_samplers(This, gl_info); - if (vs) { - device_map_vsamplers(This, ps); - } + if (vs) device_map_vsamplers(This, ps, gl_info); } static HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, IWineD3DPixelShader *pShader) { @@ -7054,7 +7054,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, device->frag_pipe = fragment_pipeline; fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; - device->max_ffp_texture_stages = ffp_caps.MaxTextureBlendStages; hr = compile_state_table(device->StateTable, device->multistate_funcs, &adapter->gl_info, ffp_vertexstate_template, fragment_pipeline, misc_state_template); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f568eb..5dcc521 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1515,7 +1515,7 @@ struct IWineD3DDeviceImpl const struct fragment_pipeline *frag_pipe; const struct blit_shader *blitter; - unsigned int max_ffp_textures, max_ffp_texture_stages; + unsigned int max_ffp_textures; DWORD d3d_vshader_constantF, d3d_pshader_constantF; /* Advertised d3d caps, not GL ones */ DWORD vs_clipping;

1 0