January 2007 - Wine-commits

Rob Shearman : ole32: Remove a FIXME comment that no longer applies.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 84158d674252ecee8b023baf76a86963f73d6aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=84158d674252ecee8b023baf7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Jan 9 17:14:39 2007 +0000 ole32: Remove a FIXME comment that no longer applies. --- dlls/ole32/compobj.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f5e2789..452ea0d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3219,7 +3219,6 @@ HRESULT WINAPI CoWaitForMultipleHandles( * COM call */ if (COM_PeekMessage(apt, &msg)) { - /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg); DispatchMessageW(&msg);

1 0

Dmitry Timoshkov : winex11.drv: Force the fullscreen state update once the window is mapped.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: f6702ec4afb4098cbb67d6bd670a9f0527191f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6702ec4afb4098cbb67d6bd6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 9 23:57:33 2007 +0800 winex11.drv: Force the fullscreen state update once the window is mapped. --- dlls/winex11.drv/winpos.c | 80 +++++++++++++++++++++++++++++--------------- 1 files changed, 53 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index ab2080b..4a5a03b 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -186,11 +186,39 @@ void X11DRV_SetWindowStyle( HWND hwnd, D * Use the NETWM protocol to set the fullscreen state. * This only works for mapped windows. */ -static void update_fullscreen_state( Display *display, struct x11drv_win_data *data, - const RECT *old_client_rect, const RECT *old_screen_rect ) +static void update_fullscreen_state( Display *display, Window win, BOOL new_fs_state ) { XEvent xev; - BOOL old_fs_state = FALSE, new_fs_state = FALSE; + + TRACE("setting fullscreen state for window %ld to %s\n", win, new_fs_state ? "true" : "false"); + + xev.xclient.type = ClientMessage; + xev.xclient.window = win; + xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); + xev.xclient.serial = 0; + xev.xclient.display = display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[0] = new_fs_state ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; + xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_FULLSCREEN); + xev.xclient.data.l[2] = 0; + wine_tsx11_lock(); + XSendEvent(display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); + wine_tsx11_unlock(); +} + +/*********************************************************************** + * fullscreen_state_changed + * + * Check if the fullscreen state of a given window has changed + */ +static BOOL fullscreen_state_changed( const struct x11drv_win_data *data, + const RECT *old_client_rect, const RECT *old_screen_rect, + BOOL *new_fs_state ) +{ + BOOL old_fs_state = FALSE; + + *new_fs_state = FALSE; if (old_client_rect->left <= 0 && old_client_rect->right >= old_screen_rect->right && old_client_rect->top <= 0 && old_client_rect->bottom >= old_screen_rect->bottom) @@ -198,30 +226,18 @@ static void update_fullscreen_state( Dis if (data->client_rect.left <= 0 && data->client_rect.right >= screen_width && data->client_rect.top <= 0 && data->client_rect.bottom >= screen_height) - new_fs_state = TRUE; - - if (new_fs_state == old_fs_state) return; - - TRACE("setting fullscreen state for hwnd %p to %s\n", data->hwnd, new_fs_state ? "true" : "false"); - - if (data->whole_window) - { - xev.xclient.type = ClientMessage; - xev.xclient.window = data->whole_window; - xev.xclient.message_type = x11drv_atom(_NET_WM_STATE); - xev.xclient.serial = 0; - xev.xclient.display = display; - xev.xclient.send_event = True; - xev.xclient.format = 32; - xev.xclient.data.l[0] = new_fs_state ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; - xev.xclient.data.l[1] = x11drv_atom(_NET_WM_STATE_FULLSCREEN); - xev.xclient.data.l[2] = 0; - wine_tsx11_lock(); - XSendEvent(display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); - wine_tsx11_unlock(); - } + *new_fs_state = TRUE; + +#if 0 /* useful to debug fullscreen state problems */ + TRACE("old rect %s, new rect %s, old screen %s, new screen (0,0-%d,%d)\n", + wine_dbgstr_rect(old_client_rect), wine_dbgstr_rect(&data->client_rect), + wine_dbgstr_rect(old_screen_rect), screen_width, screen_height); + TRACE("old fs state %d\n, new fs state = %d\n", old_fs_state, new_fs_state); +#endif + return *new_fs_state != old_fs_state; } + /*********************************************************************** * SetWindowPos (X11DRV.@) */ @@ -352,6 +368,8 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWN if (data->whole_window && !data->lock_changes) { + BOOL new_fs_state, mapped = FALSE; + if ((new_style & WS_VISIBLE) && !(new_style & WS_MINIMIZE) && X11DRV_is_window_rect_mapped( rectWindow )) { @@ -364,6 +382,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWN wine_tsx11_lock(); XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); + mapped = TRUE; } else if ((swp_flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) { @@ -372,9 +391,11 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWN wine_tsx11_lock(); XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); + mapped = TRUE; } SetRect( &old_screen_rect, 0, 0, screen_width, screen_height ); - update_fullscreen_state( display, data, &old_client_rect, &old_screen_rect ); + if (fullscreen_state_changed( data, &old_client_rect, &old_screen_rect, &new_fs_state ) || mapped) + update_fullscreen_state( display, data->whole_window, new_fs_state ); } } } @@ -800,7 +821,12 @@ static BOOL CALLBACK update_windows_on_d if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) - update_fullscreen_state( display, data, &data->client_rect, &resize_data->old_screen_rect ); + { + BOOL new_fs_state; + + if (fullscreen_state_changed( data, &data->client_rect, &resize_data->old_screen_rect, &new_fs_state )) + update_fullscreen_state( display, data->whole_window, new_fs_state ); + } if (resize_data->old_virtual_rect.left != virtual_screen_rect.left) mask |= CWX; if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY;

1 0

Dmitry Timoshkov : kernel32: Do not forget to cleanup if the test is skipped.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 13dfa9a7114997cfca429f6fda11f59469f5e678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13dfa9a7114997cfca429f6fd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 10 15:27:47 2007 +0800 kernel32: Do not forget to cleanup if the test is skipped. --- dlls/kernel32/tests/virtual.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 767008f..8773765 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -64,6 +64,8 @@ static void test_VirtualAllocEx(void) if (!addr1 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { /* Win9x */ trace("VirtualAllocEx is not implemented, skipping the test\n"); + TerminateProcess(hProcess, 0); + CloseHandle(hProcess); return; }

1 0

Bill Medland : odbccp32: Add tests structure.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: cf6e0d827075f8f28a5b09b7bf534620cd50eaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6e0d827075f8f28a5b09b7b… Author: Bill Medland <billmedland(a)shaw.ca> Date: Tue Jan 9 08:41:04 2007 -0800 odbccp32: Add tests structure. --- .gitignore | 4 +++ Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/odbccp32/tests/Makefile.in | 13 +++++++++ dlls/odbccp32/tests/misc.c | 55 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 9 files changed, 82 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf6e0d827075f8f28a5b0…

1 0

Eric Pouech : winedump: Fixed signature for dumping MDMP files.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 2885555b41a7176e43757bb05aedea781b52fc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2885555b41a7176e43757bb05… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Jan 9 21:28:11 2007 +0100 winedump: Fixed signature for dumping MDMP files. --- tools/winedump/minidump.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 04f4a27..2c61a7c 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -66,7 +66,7 @@ enum FileSig get_kind_mdmp(void) pdw = PRD(0, sizeof(DWORD)); if (!pdw) {printf("Can't get main signature, aborting\n"); return SIG_UNKNOWN;} - if (*pdw == 0x444D /* "MDMP" */) return SIG_MDMP; + if (*pdw == 0x504D444D /* "MDMP" */) return SIG_MDMP; return SIG_UNKNOWN; }

1 0

Alexandre Julliard : ntdll/tests: Fix exception test for CPUs that do segment limit checks differently.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: e4bd0d889eafc11272c4c7f92835e62dc9772a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bd0d889eafc11272c4c7f92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 11:58:16 2007 +0100 ntdll/tests: Fix exception test for CPUs that do segment limit checks differently. --- dlls/ntdll/tests/exception.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 9e729a4..d18f3d2 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -145,9 +145,9 @@ static const struct exception { { 0xa1, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffc,%eax; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffc } }, { { 0xa1, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffd,%eax; ret */ - 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, + 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffd } }, { { 0xa1, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xfffffffe,%eax; ret */ - 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, + 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xfffffffe } }, { { 0xa1, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl 0xffffffff,%eax; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, @@ -155,11 +155,11 @@ static const struct exception { { 0xa3, 0xfc, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffc; ret */ 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffc } }, { { 0xa3, 0xfd, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffd; ret */ - 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, + 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffd } }, { { 0xa3, 0xfe, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xfffffffe; ret */ - 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, + 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xfffffffe } }, { { 0xa3, 0xff, 0xff, 0xff, 0xff, 0xc3 }, /* movl %eax,0xffffffff; ret */ - 0, 5, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, + 0, 5, STATUS_ACCESS_VIOLATION, 2, { 1, 0xffffffff } }, }; static int got_exception; @@ -202,11 +202,21 @@ static DWORD handler( EXCEPTION_RECORD * ok( rec->NumberParameters == except->nb_params, "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); + + /* Most CPUs (except Intel Core apparently) report a segment limit violation */ + /* instead of page faults for accesses beyond 0xffffffff */ + if (except->nb_params == 2 && except->params[1] >= 0xfffffffd) + { + if (rec->ExceptionInformation[0] == 0 && rec->ExceptionInformation[1] == 0xffffffff) + goto skip_params; + } + for (i = 0; i < rec->NumberParameters; i++) ok( rec->ExceptionInformation[i] == except->params[i], "%u: Wrong parameter %d: %lx/%x\n", entry, i, rec->ExceptionInformation[i], except->params[i] ); +skip_params: /* don't handle exception if it's not the address we expected */ if (rec->ExceptionAddress != (char*)code_mem + except->offset) return ExceptionContinueSearch;

1 0

Paul Vriens : ntdll/tests: Skip some tests on Windows Vista.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 06a14de18b75cc63897a8b7fd08ef60151ea06a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a14de18b75cc63897a8b7fd… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jan 9 19:49:26 2007 +0100 ntdll/tests: Skip some tests on Windows Vista. --- dlls/ntdll/tests/rtl.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 8a5611c..cdbf8d7 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -330,9 +330,21 @@ static void test_RtlUniform(void) seed = 2; expected = seed * 0xffffffed + 0x7fffffc3; result = pRtlUniform(&seed); + +/* + * Windows Vista uses different algorithms, so skip the rest of the tests + * until that is figured out. Trace output for the failures is about 10.5 MB! + */ + + if (result == 0x7fffff9f) { + trace("Most likely running on Windows Vista, skipping rest of tests\n"); + return; + } + ok(result == expected, "RtlUniform(&seed (seed == 2)) returns %x, expected %x\n", result, expected); + /* * More tests show that if seed is odd the result must be incremented by 1: */ @@ -616,6 +628,17 @@ static void test_RtlRandom(void) result_expected = 0x320a1743; seed_expected =0x44b; result = pRtlRandom(&seed); + +/* + * Windows Vista uses different algorithms, so skip the rest of the tests + * until that is figured out. Trace output for the failures is about 10.5 MB! + */ + + if (seed == 0x3fc) { + trace("Most likely running on Windows Vista, skipping rest of tests\n"); + return; + } + ok(result == result_expected, "pRtlRandom(&seed (seed == 0)) returns %x, expected %x\n", result, result_expected);

1 0

Francois Gouget : wininet: Consistenly use INTERNET_SetLastError().
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: e66d1cd5e99a546455e4e4481ddeeaebaa8e22bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66d1cd5e99a546455e4e4481… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 9 12:30:45 2007 +0100 wininet: Consistenly use INTERNET_SetLastError(). --- dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 8 ++++---- dlls/wininet/internet.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 7ae70c1..841ae3c 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -370,7 +370,7 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINT if (!lpszDirectory) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend; } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cdf2bff..07dc596 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1464,7 +1464,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && (~lphttpHdr->wFlags & HDR_ISREQUEST))) { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); + INTERNET_SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); return bSuccess; } @@ -1754,7 +1754,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET header = HeapAlloc(GetProcessHeap(),0,headerlen*sizeof(WCHAR)); if (!(BuffersInW.lpcszHeader = header)) { - SetLastError(ERROR_OUTOFMEMORY); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); return FALSE; } BuffersInW.dwHeadersLength = MultiByteToWideChar(CP_ACP, 0, @@ -1848,7 +1848,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); ret = FALSE; } else @@ -1930,7 +1930,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET h /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); r = FALSE; } else diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e064ac1..80ddc24 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -769,7 +769,7 @@ HINTERNET WINAPI InternetConnectW(HINTER if (!lpszServerName) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return NULL; } @@ -778,7 +778,7 @@ HINTERNET WINAPI InternetConnectW(HINTER hIC = (LPWININETAPPINFOW) WININET_GetObject( hInternet ); if ( (hIC == NULL) || (hIC->hdr.htype != WH_HINIT) ) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); goto lend; } @@ -1219,7 +1219,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp if (!lpszUrl_orig || !*lpszUrl_orig) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1777,7 +1777,7 @@ BOOL WINAPI InternetReadFile(HINTERNET h lpwh = WININET_GetObject( hFile ); if (!lpwh) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -1839,14 +1839,14 @@ BOOL WINAPI InternetReadFileExA(HINTERNE if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } lpwh = (LPWININETHANDLEHEADER) WININET_GetObject( hFile ); if (!lpwh) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -1868,7 +1868,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNE retval = INTERNET_AsyncCall(&workRequest); if (!retval) return FALSE; - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); return FALSE; } @@ -1923,7 +1923,7 @@ static BOOL INET_QueryOptionHelper(BOOL lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet ); if (!lpwhh) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1936,7 +1936,7 @@ static BOOL INET_QueryOptionHelper(BOOL if (!lpwhh) { WARN("Invalid hInternet handle\n"); - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } @@ -1976,7 +1976,7 @@ static BOOL INET_QueryOptionHelper(BOOL if (!lpwhh) { WARN("Invalid hInternet handle\n"); - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } if (lpwhh->htype == WH_HHTTPREQ) @@ -2519,7 +2519,7 @@ BOOL WINAPI InternetSetOptionExW(HINTERN FIXME("Flags %08x ignored\n", dwFlags); if( dwFlags & ~ISO_VALID_FLAGS ) { - SetLastError( ERROR_INVALID_PARAMETER ); + INTERNET_SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } return InternetSetOptionW( hInternet, dwOption, lpBuffer, dwBufferLength ); @@ -2760,7 +2760,7 @@ End: HeapFree( GetProcessHeap(), 0, command ); if (rc == FALSE) - SetLastError(ERROR_NOT_CONNECTED); + INTERNET_SetLastError(ERROR_NOT_CONNECTED); return rc; } @@ -2919,7 +2919,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER if (!lpszUrl) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend; } @@ -2949,7 +2949,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); } else { ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext); } @@ -3227,7 +3227,7 @@ BOOL WINAPI InternetQueryDataAvailable( lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hFile ); if (NULL == lpwhr) { - SetLastError(ERROR_NO_MORE_FILES); + INTERNET_SetLastError(ERROR_NO_MORE_FILES); return FALSE; } @@ -3240,7 +3240,7 @@ BOOL WINAPI InternetQueryDataAvailable( min(sizeof(buffer), lpwhr->dwContentLength - lpwhr->dwContentRead), MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) { - SetLastError(ERROR_NO_MORE_FILES); + INTERNET_SetLastError(ERROR_NO_MORE_FILES); retval = FALSE; } else @@ -3459,7 +3459,7 @@ static BOOL calc_url_length(LPURL_COMPON { if (lpUrlComponents->lpszPassword) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } } @@ -3577,7 +3577,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -3647,7 +3647,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -3657,7 +3657,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM if (!lpszUrl || *lpdwUrlLength < dwLen) { *lpdwUrlLength = (dwLen + 1) * sizeof(WCHAR); - SetLastError(ERROR_INSUFFICIENT_BUFFER); + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }

1 0

Francois Gouget : uninstaller: Add a Portuguese translation ( contributed by Americo Jose Melo).
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 205bcc7617626a3896f1e03b212533d13165e694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=205bcc7617626a3896f1e03b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 9 12:42:55 2007 +0100 uninstaller: Add a Portuguese translation (contributed by Americo Jose Melo). --- programs/uninstaller/Pt.rc | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Pt.rc b/programs/uninstaller/Pt.rc index 5797fb1..4df2abd 100644 --- a/programs/uninstaller/Pt.rc +++ b/programs/uninstaller/Pt.rc @@ -18,9 +18,26 @@ * */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Desinstalador de Aplica��es Wine" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Por favor seleccione a aplica��o que deseja desinstalar:",IDC_PLEASESELECT,10,10,250,14 + EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL + LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Desinstalar",IDC_UNINSTALL,270,48,50,14 + PUSHBUTTON "&Acerca",IDC_ABOUT,270,65,50,14 + PUSHBUTTON "&Sair",IDC_EXIT,270,81,50,14 +END STRINGTABLE DISCARDABLE { - IDS_APPNAME, "Desinstalador" + IDS_APPNAME, "Desinstalador de Aplica��es Wine" + IDS_ABOUT, "Desinstalador de Aplica��es Wine (C) 2005 por Andreas Mohr, Hannu Valtonen e Jonathan Ernst." + IDS_ABOUTTITLE, "Acerca do Desinstalador" + IDS_REGISTRYKEYNOTAVAILABLE, "Chave de registo de desinstala��o n�o dispon�vel (ainda), nada a fazer !" + IDS_UNINSTALLFAILED, "Execu��o do comando de desinstala��o '%s' falhado, talvez devido a faltar o execut�vel.\r\nDeseja remover a entrada de desinstala��o do registo ?" }

1 0

Alexandre Julliard : wrc: Added support for utf-8 codepage.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 442243257b949a11f7d1f7e83954b8a5c9d84d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=442243257b949a11f7d1f7e83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 9 22:21:53 2007 +0100 wrc: Added support for utf-8 codepage. --- tools/wrc/parser.l | 3 ++- tools/wrc/utils.c | 32 ++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 11d110f..f9034a5 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -347,12 +347,13 @@ static struct keyword *iskeyword(char *k <pp_pragma>[^\n]* yy_pop_state(); if (pedantic) parser_warning("Unrecognized #pragma directive '%s'",yytext); <pp_code_page>\({ws}*default{ws}*\)[^\n]* current_codepage = -1; yy_pop_state(); +<pp_code_page>\({ws}*utf8{ws}*\)[^\n]* current_codepage = CP_UTF8; yy_pop_state(); <pp_code_page>\({ws}*[0-9]+{ws}*\)[^\n]* { char *p = yytext; yy_pop_state(); while (*p < '0' || *p > '9') p++; current_codepage = strtol( p, NULL, 10 ); - if (current_codepage && !wine_cp_get_table( current_codepage )) + if (current_codepage && current_codepage != CP_UTF8 && !wine_cp_get_table( current_codepage )) { parser_error("Codepage %d not supported", current_codepage); current_codepage = 0; diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 2e1630d..9e736d4 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -244,26 +244,38 @@ string_t *convert_string(const string_t { const union cptable *cptable = codepage ? wine_cp_get_table( codepage ) : NULL; string_t *ret = xmalloc(sizeof(*ret)); + int res; - if (!cptable && str->type != type) - error( "Current language is Unicode only, cannot convert strings" ); + if (!codepage && str->type != type) + parser_error( "Current language is Unicode only, cannot convert string" ); if((str->type == str_char) && (type == str_unicode)) { - ret->type = str_unicode; - ret->size = wine_cp_mbstowcs( cptable, 0, str->str.cstr, str->size, NULL, 0 ); + ret->type = str_unicode; + ret->size = cptable ? wine_cp_mbstowcs( cptable, 0, str->str.cstr, str->size, NULL, 0 ) + : wine_utf8_mbstowcs( 0, str->str.cstr, str->size, NULL, 0 ); ret->str.wstr = xmalloc( (ret->size+1) * sizeof(WCHAR) ); - wine_cp_mbstowcs( cptable, 0, str->str.cstr, str->size, ret->str.wstr, ret->size ); + if (cptable) + res = wine_cp_mbstowcs( cptable, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, + ret->str.wstr, ret->size ); + else + res = wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, str->str.cstr, str->size, + ret->str.wstr, ret->size ); + if (res == -2) + parser_error( "Invalid character in string '%.*s' for codepage %u\n", + str->size, str->str.cstr, codepage ); ret->str.wstr[ret->size] = 0; } else if((str->type == str_unicode) && (type == str_char)) { - ret->type = str_char; - ret->size = wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, - NULL, 0, NULL, NULL ); + ret->type = str_char; + ret->size = cptable ? wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, NULL, 0, NULL, NULL ) + : wine_utf8_wcstombs( str->str.wstr, str->size, NULL, 0 ); ret->str.cstr = xmalloc( ret->size + 1 ); - wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, ret->str.cstr, ret->size, - NULL, NULL ); + if (cptable) + wine_cp_wcstombs( cptable, 0, str->str.wstr, str->size, ret->str.cstr, ret->size, NULL, NULL ); + else + wine_utf8_wcstombs( str->str.wstr, str->size, ret->str.cstr, ret->size ); ret->str.cstr[ret->size] = 0; } else if(str->type == str_unicode)

1 0