May 2008 - Wine-commits - list.winehq.org

James Hawkins : gdi32: Fix two tests that fail in win2k3.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 617d8fee03f99610a3947d9213236183feb59b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=617d8fee03f99610a3947d921… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 19 02:24:06 2008 -0500 gdi32: Fix two tests that fail in win2k3. --- dlls/gdi32/tests/font.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d4abc8c..93f45d5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1823,7 +1823,9 @@ static void test_nonexistent_font(void) GetTextFaceA(hdc, sizeof(buf), buf); todo_wine /* Wine uses Arial for all substitutions */ ok(!lstrcmpiA(buf, "Nonexistent font") /* XP, Vista */ || - !lstrcmpiA(buf, "MS Serif") /* Win9x */, "Got %s\n", buf); + !lstrcmpiA(buf, "MS Serif") || /* Win9x */ + !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ + "Got %s\n", buf); cs = GetTextCharset(hdc); ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs); DeleteObject(SelectObject(hdc, hfont)); @@ -1850,7 +1852,9 @@ todo_wine /* Wine uses Arial for all substitutions */ GetTextFaceA(hdc, sizeof(buf), buf); todo_wine /* Wine uses Arial for all substitutions */ ok(!lstrcmpiA(buf, "Times New Roman CE") /* XP, Vista */ || - !lstrcmpiA(buf, "MS Serif") /* Win9x */, "Got %s\n", buf); + !lstrcmpiA(buf, "MS Serif") /* Win9x */ || + !lstrcmpiA(buf, "MS Sans Serif"), /* win2k3 */ + "Got %s\n", buf); cs = GetTextCharset(hdc); ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs); DeleteObject(SelectObject(hdc, hfont));

1 0

Alexander Nicolaysen Sørnes : regedit: Add Export option to context menu.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 96653ca60acde7fdc1c793c59ec5458b25bde240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96653ca60acde7fdc1c793c59… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat May 17 22:20:55 2008 +0200 regedit: Add Export option to context menu. --- programs/regedit/En.rc | 1 + programs/regedit/No.rc | 1 + programs/regedit/framewnd.c | 11 +++++++---- programs/regedit/resource.h | 1 + 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index c8c497f..c11345b 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -175,6 +175,7 @@ BEGIN MENUITEM "&Delete\tDel", ID_EDIT_DELETE MENUITEM "&Rename\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export . . .", ID_EDIT_EXPORT MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Find\tCtrl+F", ID_EDIT_FIND, GRAYED diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index ee57f2a..e487ab4 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -106,6 +106,7 @@ BEGIN MENUITEM "&Slett\tDel", ID_EDIT_DELETE MENUITEM "&Gi nytt navn\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Eksporter . . .", ID_EDIT_EXPORT MENUITEM "&Kopier n�kkelnavn", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Finn\tCtrl+F", ID_EDIT_FIND, GRAYED diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 3dd9d96..b1f8a56 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -277,7 +277,7 @@ static UINT CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, WPARA path = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); SendDlgItemMessage(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)path); HeapFree(GetProcessHeap(), 0, path); - CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, IDC_EXPORT_ALL); + CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, pOpenFileName->lCustData ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL); break; case CDN_FILEOK: ExportRegistryFile_StoreSelection(hdlg, pOpenFileName); @@ -332,7 +332,7 @@ static BOOL ImportRegistryFile(HWND hWnd) } -static BOOL ExportRegistryFile(HWND hWnd) +static BOOL ExportRegistryFile(HWND hWnd, BOOL export_branch) { OPENFILENAME ofn; TCHAR ExportKeyPath[_MAX_PATH]; @@ -342,7 +342,7 @@ static BOOL ExportRegistryFile(HWND hWnd) InitOpenFileName(hWnd, &ofn); LoadString(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, COUNT_OF(title)); ofn.lpstrTitle = title; - ofn.lCustData = 0; + ofn.lCustData = export_branch; ofn.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORT_TEMPLATE); @@ -635,8 +635,11 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_REGISTRY_IMPORTREGISTRYFILE: ImportRegistryFile(hWnd); break; + case ID_EDIT_EXPORT: + ExportRegistryFile(hWnd, TRUE); + break; case ID_REGISTRY_EXPORTREGISTRYFILE: - ExportRegistryFile(hWnd); + ExportRegistryFile(hWnd, FALSE); break; case ID_REGISTRY_CONNECTNETWORKREGISTRY: break; diff --git a/programs/regedit/resource.h b/programs/regedit/resource.h index 8e703fb..711dada 100644 --- a/programs/regedit/resource.h +++ b/programs/regedit/resource.h @@ -133,6 +133,7 @@ #define ID_FAVORITE_FIRST 33000 #define ID_FAVORITE_LAST 33099 #define ID_EDIT_NEW_MULTI_STRINGVALUE 33100 +#define ID_EDIT_EXPORT 33101 #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001

1 0

Dmitry Timoshkov : user32: Make ChangeDisplaySettingsA/ W reset dmDriverExtra to 0 like XP and Vista do.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 47b496012938917f7bb37feb7e971a442456feda URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b496012938917f7bb37feb7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun May 18 18:47:14 2008 +0900 user32: Make ChangeDisplaySettingsA/W reset dmDriverExtra to 0 like XP and Vista do. --- dlls/user32/sysparams.c | 4 +++ dlls/user32/tests/monitor.c | 53 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 71e846d..b2fe627 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2975,6 +2975,8 @@ HPEN SYSCOLOR_GetPen( INT index ) */ LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags ) { + if (devmode) devmode->dmDriverExtra = 0; + return ChangeDisplaySettingsExA(NULL,devmode,NULL,flags,NULL); } @@ -2984,6 +2986,8 @@ LONG WINAPI ChangeDisplaySettingsA( LPDEVMODEA devmode, DWORD flags ) */ LONG WINAPI ChangeDisplaySettingsW( LPDEVMODEW devmode, DWORD flags ) { + if (devmode) devmode->dmDriverExtra = 0; + return ChangeDisplaySettingsExW(NULL,devmode,NULL,flags,NULL); } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index a723dd1..0de9bff 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -131,7 +131,9 @@ static const struct vid_mode vid_modes_test[] = { { 0, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, {640, 0, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT, 0}, - {0, 0, 0, 0, DM_DISPLAYFREQUENCY, 0}, + /* the following test succeeds under XP SP3 + {0, 0, 0, 0, DM_DISPLAYFREQUENCY, 0} + */ }; #define vid_modes_cnt (sizeof(vid_modes_test) / sizeof(vid_modes_test[0])) @@ -155,6 +157,44 @@ static void test_ChangeDisplaySettingsEx(void) width = dm.dmPelsWidth; + dm.dmDriverExtra = 1; + res = ChangeDisplaySettingsA(&dm, CDS_TEST); + ok(res == DISP_CHANGE_SUCCESSFUL, + "ChangeDisplaySettingsA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); + ok(dm.dmDriverExtra == 0, "ChangeDisplaySettingsA didn't reset dmDriverExtra to 0\n"); + + /* crashes under XP SP3 for large dmDriverExtra values */ + dm.dmDriverExtra = 1; + res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + ok(dm.dmDriverExtra == 1, "ChangeDisplaySettingsExA shouldn't reset dmDriverExtra to 0\n"); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmSize = sizeof(dmW); + dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + dmW.dmPelsWidth = dm.dmPelsWidth; + dmW.dmPelsHeight = dm.dmPelsHeight; + dmW.dmDriverExtra = 1; + SetLastError(0xdeadbeef); + res = ChangeDisplaySettingsW(&dmW, CDS_TEST); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + ok(res == DISP_CHANGE_SUCCESSFUL, + "ChangeDisplaySettingsW returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); + ok(dmW.dmDriverExtra == 0, "ChangeDisplaySettingsW didn't reset dmDriverExtra to 0\n"); + } + + /* Apparently XP treats dmDriverExtra being != 0 as an error */ + dmW.dmDriverExtra = 1; + res = pChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + ok(res == DISP_CHANGE_SUCCESSFUL, + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_BADMODE\n", res); + ok(dmW.dmDriverExtra == 1, "ChangeDisplaySettingsExW shouldn't reset dmDriverExtra to 0\n"); + } + /* the following 2 tests show that dm.dmSize being 0 is invalid, but * ChangeDisplaySettingsExA still reports success. */ @@ -171,8 +211,9 @@ static void test_ChangeDisplaySettingsEx(void) SetLastError(0xdeadbeef); res = pChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - ok(res == DISP_CHANGE_FAILED, - "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_FAILED\n", res); + ok(res == DISP_CHANGE_FAILED || + res == DISP_CHANGE_BADMODE /* XP SP3 */, + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_FAILED or DISP_CHANGE_BADMODE\n", res); memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -184,7 +225,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmBitsPerPel = vid_modes_test[i].bpp; dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; - res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_FULLSCREEN, NULL); + res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(vid_modes_test[i].success ? (res == DISP_CHANGE_SUCCESSFUL) : (res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), @@ -243,8 +284,8 @@ START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); - if (winetest_interactive) - test_ChangeDisplaySettingsEx(); + test_ChangeDisplaySettingsEx(); + if (pMonitorFromPoint && pMonitorFromWindow) test_monitors(); else

1 0

Hans Leidekker : wininet: INTERNET_STATUS_REQUEST_COMPLETE callback must supply a handle.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: e1b889830de6da326d6e89c1845c0fb952d352b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b889830de6da326d6e89c18… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 16 13:50:36 2008 +0200 wininet: INTERNET_STATUS_REQUEST_COMPLETE callback must supply a handle. --- dlls/wininet/http.c | 2 +- dlls/wininet/tests/http.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d24bc43..24918fc 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3397,7 +3397,7 @@ lend: /* TODO: send notification for P3P header */ - iar.dwResult = (DWORD)bSuccess; + iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; iar.dwError = bSuccess ? ERROR_SUCCESS : INTERNET_GetLastError(); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 0a02dfe..b946d3b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1801,6 +1801,62 @@ static void test_bogus_accept_types_array(void) InternetCloseHandle(ses); } +struct context +{ + HANDLE event; + HINTERNET req; +}; + +static void WINAPI cb(HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID info, DWORD size) +{ + trace("%p 0x%08lx %u %p 0x%08x\n", handle, context, status, info, size); + + if (status == INTERNET_STATUS_REQUEST_COMPLETE) + { + INTERNET_ASYNC_RESULT *result = info; + struct context *ctx = (struct context *)context; + + trace("request handle: 0x%08lx\n", result->dwResult); + + ctx->req = (HINTERNET)result->dwResult; + SetEvent(ctx->event); + } +} + +static void test_open_url_async(void) +{ + BOOL ret; + HINTERNET ses, req; + DWORD size; + struct context ctx; + ULONG type; + + ctx.req = NULL; + ctx.event = CreateEvent(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1"); + + ses = InternetOpen("AdvancedInstaller", 0, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(ses != NULL, "InternetOpen failed\n"); + + InternetSetStatusCallback(ses, cb); + ResetEvent(ctx.event); + + req = InternetOpenUrl(ses, "http://www.winehq.org", NULL, 0, 0, (DWORD_PTR)&ctx); + ok(!req && GetLastError() == ERROR_IO_PENDING, "InternetOpenUrl failed\n"); + + WaitForSingleObject(ctx.event, INFINITE); + + type = 0; + size = sizeof(type); + ret = InternetQueryOption(ctx.req, INTERNET_OPTION_HANDLE_TYPE, &type, &size); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); + ok(type == INTERNET_HANDLE_TYPE_HTTP_REQUEST, + "expected INTERNET_HANDLE_TYPE_HTTP_REQUEST, got %u\n", type); + + CloseHandle(ctx.event); + InternetCloseHandle(ctx.req); + InternetCloseHandle(ses); +} + #define STATUS_STRING(status) \ memcpy(status_string[status], #status, sizeof(CHAR) * \ (strlen(#status) < MAX_STATUS_NAME ? \ @@ -1877,4 +1933,5 @@ START_TEST(http) test_http_connection(); test_user_agent_header(); test_bogus_accept_types_array(); + test_open_url_async(); }

1 0

Dan Kegel : d3d9/tests: Add missing skip().
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 480297336b13ce86236148c80ed073e09fc52483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480297336b13ce86236148c80… Author: Dan Kegel <dank(a)kegel.com> Date: Fri May 16 07:54:55 2008 -0700 d3d9/tests: Add missing skip(). --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 978e4f3..2add48e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9117,7 +9117,7 @@ START_TEST(visual) hr = IDirect3DDevice9_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); if(FAILED(hr)) { - trace("Clear failed, can't assure correctness of the test results, skipping\n"); + skip("Clear failed, can't assure correctness of the test results, skipping\n"); goto cleanup; } IDirect3DDevice9_Present(device_ptr, NULL, NULL, NULL, NULL); @@ -9125,14 +9125,14 @@ START_TEST(visual) color = getPixelColor(device_ptr, 1, 1); if(color !=0x00ff0000) { - trace("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); + skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); goto cleanup; } hr = IDirect3DDevice9_Clear(device_ptr, 0, NULL, D3DCLEAR_TARGET, 0xff00ddee, 0.0, 0); if(FAILED(hr)) { - trace("Clear failed, can't assure correctness of the test results, skipping\n"); + skip("Clear failed, can't assure correctness of the test results, skipping\n"); goto cleanup; } IDirect3DDevice9_Present(device_ptr, NULL, NULL, NULL, NULL); @@ -9140,7 +9140,7 @@ START_TEST(visual) color = getPixelColor(device_ptr, 639, 479); if(color != 0x0000ddee) { - trace("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); + skip("Sanity check returned an incorrect color(%08x), can't assure the correctness of the tests, skipping\n", color); goto cleanup; }

1 0

Eric Pouech : dbghelp: Protect dwarf parsing against NULL function names.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: fd20b1be8a0d84c11f967cf020bfcc53681ffdb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd20b1be8a0d84c11f967cf02… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun May 18 09:43:39 2008 +0200 dbghelp: Protect dwarf parsing against NULL function names. --- dlls/dbghelp/dwarf.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ec4c351..5f6458f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1571,7 +1571,11 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) + { + WARN("No name for function... dropping function\n"); + return NULL; + } /* if it's an abstract representation of an inline function, there should be * a concrete object that we'll handle */

1 0

Rob Shearman : wininet: Fix a typo in is_basic_auth_value.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 6021fa09f3e3a3b3f37c9e3ded83cbcd0b6dedd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6021fa09f3e3a3b3f37c9e3de… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 15 21:05:21 2008 +0100 wininet: Fix a typo in is_basic_auth_value. This fixes basic authentication when the server uses a realm string. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 0118d7b..d24bc43 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -394,7 +394,7 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue ) { static const WCHAR szBasic[] = {'B','a','s','i','c'}; /* Note: not nul-terminated */ return !strncmpiW(pszAuthValue, szBasic, ARRAYSIZE(szBasic)) && - ((pszAuthValue[ARRAYSIZE(szBasic)] != ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); + ((pszAuthValue[ARRAYSIZE(szBasic)] == ' ') || !pszAuthValue[ARRAYSIZE(szBasic)]); } static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue,

1 0

Dmitry Timoshkov : cabinet: Fix the regression caused by 4046075462c00f4479f185d1c0514584ff851223.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 5ddd35f493f40ecd447fa8d0a4591e92a8e91306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddd35f493f40ecd447fa8d0a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 15 19:53:36 2008 +0900 cabinet: Fix the regression caused by 4046075462c00f4479f185d1c0514584ff851223. --- dlls/cabinet/fdi.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 3194d67..47e36e8 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -1178,8 +1178,9 @@ static cab_LONG fdi_Zipinflate_codes(const struct Ziphuft *tl, const struct Ziph ZIPDUMPBITS(e) do { - d = max(d & (ZIPWSIZE - 1), w); - e = min(ZIPWSIZE - d, n); + d &= ZIPWSIZE - 1; + e = ZIPWSIZE - max(d, w); + e = min(e, n); n -= e; do {

1 0

Mikołaj Zalewski : Update Polish translation.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: d85ac9d989885d5d75e34a9932cbaca4b7d2d7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85ac9d989885d5d75e34a993… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu May 15 13:56:59 2008 +0200 Update Polish translation. --- dlls/shell32/shell32_Pl.rc | 17 +++++++++++++++++ programs/start/Pl.rc | 2 ++ programs/winecfg/Pl.rc | 38 +++++++++++++++++++------------------- programs/winhlp32/Pl.rc | 24 ++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shell32_Pl.rc b/dlls/shell32/shell32_Pl.rc index bab035c..4d29d6f 100644 --- a/dlls/shell32/shell32_Pl.rc +++ b/dlls/shell32/shell32_Pl.rc @@ -251,3 +251,20 @@ STRINGTABLE IDS_NEWFOLDER "Nowy Folder" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "Licencja Wine" +IDS_LICENSE, +"Wine is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\n\ +Wine is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." +} diff --git a/programs/start/Pl.rc b/programs/start/Pl.rc index 28fc7d9..8fab790 100644 --- a/programs/start/Pl.rc +++ b/programs/start/Pl.rc @@ -62,4 +62,6 @@ See the COPYING.LIB file for license information. \n\ " STRING_EXECFAIL "Nie uda�o si� uruchomi� aplikacji lub nie ma aplikacji skojarzonej z danym plikiem.\nShellExecuteEx nie powiod�o si�" + +STRING_UNIXFAIL "Nie da si� przet�umaczy� danej �cie�ki Unix na �cie�k� DOS." } diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index fe1c61b..794010d 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -63,27 +63,27 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Ustawienia okna ",IDC_STATIC,8,4,244,84 - CONTROL "Zezwalaj aplikacjom DirectX na zablokowanie opuszczania okna przez kursor myszki",IDC_DX_MOUSE_GRAB,"Button",BS_MULTILINE|BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 - CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Pozw�j mened�erowi okien zarz�dza� oknami Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "Emuluj wirtualny pulpit",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 - LTEXT "Rozmiar pulpitu:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED - EDITTEXT IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + GROUPBOX " Ustawienia okna ",IDC_STATIC,8,4,244,92 + CONTROL "Zezwalaj aplikacjom DirectX na zablokowanie opuszczania okna przez kursor &myszki",IDC_DX_MOUSE_GRAB,"Button",BS_MULTILINE|BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,16 + CONTROL "Pozw�l mened�erowi okien &dekorowa� okna",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 + CONTROL "Pozw�l mened�erowi okien &zarz�dza� oknami Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,52,230,8 + CONTROL "Emuluj wirtualny &pulpit",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,64,230,8 + LTEXT "&Rozmiar pulpitu:",IDC_DESKTOP_SIZE,15,78,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,109,78,8,8,WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,76,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,76,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Obs�uga Vertex Shader: ",IDC_STATIC,15,110,80,32 - COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Obs�uguj Pixel Shader (je�eli s� obs�ugiwane przez kart� graficzn�)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 + GROUPBOX " Direct3D ",IDC_STATIC,8,101,244,49 + LTEXT "Obs�uga Vertex Shader: ",IDC_STATIC,15,116,80,32 + COMBOBOX IDC_D3D_VSHADER_MODE,100,114,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Obs�uguj Pixel Shader (je�eli s� obs�ugiwane przez kart� graficzn�)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,10 - GROUPBOX " Rozdzielczo�� ",IDC_STATIC,8,151,244,93 - CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 - EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP - LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 + GROUPBOX " Rozdzielczo�� ",IDC_STATIC,8,155,244,93 + CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,165,187,15 + EDITTEXT IDC_RES_DPIEDIT,204,165,23,13,ES_NUMBER|WS_TABSTOP + LTEXT "dpi",IDC_STATIC,235,167,10,8 + LTEXT "Oto przyk�ad zastosowania 10-punktowej czcionki Tahoma",IDC_RES_FONT_PREVIEW,15,185,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 diff --git a/programs/winhlp32/Pl.rc b/programs/winhlp32/Pl.rc index f1004a5..2c20de4 100644 --- a/programs/winhlp32/Pl.rc +++ b/programs/winhlp32/Pl.rc @@ -80,3 +80,27 @@ STID_HELP_FILES_HLP, "Pliki pomocy (*.hlp)" STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" } + + +CONTEXT_MENU MENU LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +BEGIN + POPUP "" + BEGIN + MENUITEM "Adnotacja...", MNID_CTXT_ANNOTATE + MENUITEM "Kopiuj", MNID_CTXT_COPY + MENUITEM "Drukuj...", MNID_CTXT_PRINT + POPUP "Czcionka" + BEGIN + MENUITEM "Ma�a", MNID_CTXT_FONTS_SMALL + MENUITEM "Normalna", MNID_CTXT_FONTS_NORMAL + MENUITEM "Du�a", MNID_CTXT_FONTS_LARGE + END + POPUP "Pomoc zawsze widoczna" + BEGIN + MENUITEM "Domy�lnie", MNID_CTXT_HELP_DEFAULT + MENUITEM "Widoczna", MNID_CTXT_HELP_VISIBLE + MENUITEM "Niewidoczna", MNID_CTXT_HELP_NONVISIBLE + END + MENUITEM "U�yj kolor�w systemowych", MNID_CTXT_SYSTEM_COLORS + END +END

1 0

Huw Davies : gdiplus: Add some notes about the format of the data blob returned by GdipGetRegionData .
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: a576c40372e55c251a39988f8d39d85437adf36b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a576c40372e55c251a39988f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 15 13:47:47 2008 +0100 gdiplus: Add some notes about the format of the data blob returned by GdipGetRegionData. --- dlls/gdiplus/region.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4286b47..46e9919 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -30,6 +30,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +/********************************************************** + * + * Data returned by GdipGetRegionData (for rectangle based regions) + * looks something like this: + * + * struct region_data_header + * { + * DWORD size; size in bytes of the data - 8. + * DWORD magic1; probably a checksum. + * DWORD magic2; always seems to be 0xdbc01001 - version? + * DWORD num_ops; number of combining ops * 2 + * }; + * + * Then follows a sequence of combining ops and RECTFs. + * + * Combining ops are just stored as their CombineMode value. + * + * Each RECTF is preceded by the DWORD 0x10000000. An empty rect is + * stored as 0x10000002 (with no following RECTF) and an infinite rect + * is stored as 0x10000003 (again with no following RECTF). + * + * The combining ops are stored in the reverse order to the RECTFs and in the + * reverse order to which the region was constructed. + * + * When two or more complex regions (ie those with more than one rect) + * are combined, the combining op for the two regions comes first, + * then the combining ops for the rects in region 1, followed by the + * rects for region 1, then follows the combining ops for region 2 and + * finally region 2's rects. Presumably you're supposed to use the + * 0x10000000 rect header to find the end of the op list (the count of + * the rects in each region is not stored). + * + * When a simple region (1 rect) is combined, it's treated as if a single rect + * is being combined. + * + */ + GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) { FIXME("(%p): stub\n", region);

1 0