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

Marcus Meissner : server: Remove superflous empty region allocation.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: a82455e627757db4547fb580c838e8daa6b50b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82455e627757db4547fb580c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 14 14:44:43 2008 +0200 server: Remove superflous empty region allocation. --- server/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 9530c61..a000cfc 100644 --- a/server/window.c +++ b/server/window.c @@ -1105,7 +1105,7 @@ static int add_update_region( struct window *win, struct region *region ) static void crop_children_update_region( struct window *win, rectangle_t *rect ) { struct window *child; - struct region *tmp = create_empty_region(); + struct region *tmp; rectangle_t child_rect; LIST_FOR_EACH_ENTRY( child, &win->children, struct window, entry )

1 0

Dan Kegel : ws2_32/tests: Cannot reliably detect bad hostnames in "modern" internet.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: 95beaa21b87a6eec19dc788652ee2c87621996ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=95beaa21b87a6eec19dc78865… Author: Dan Kegel <dank(a)kegel.com> Date: Wed May 14 04:03:42 2008 -0700 ws2_32/tests: Cannot reliably detect bad hostnames in "modern" internet. --- dlls/ws2_32/tests/sock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ce75811..13bb705 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1828,9 +1828,14 @@ static void test_gethostbyname_hack(void) } } +#if 0 + /* Can't expect ISPs to behave anymore; many send you to spam sites + * if you type in a bogus URL nowadays. + */ he = NULL; he = gethostbyname("someweirdandbogusname"); ok(he == NULL, "gethostbyname(\"someweirdandbogusname\") succeeded.\n"); +#endif } static void test_inet_addr(void)

1 0

Dan Kegel : kernel32: comm.c: increase time slop.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: fbaf0375815ee68929f0e044c7941c08761eb3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbaf0375815ee68929f0e044c… Author: Dan Kegel <dank(a)kegel.com> Date: Wed May 14 03:53:07 2008 -0700 kernel32: comm.c: increase time slop. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 36e46ad..3c73eb5 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -27,7 +27,7 @@ #define TIMEOUT 1000 /* one second for Timeouts*/ #define SLOWBAUD 150 #define FASTBAUD 115200 -#define TIMEDELTA 100 /* 100 ms uncertainty allowed */ +#define TIMEDELTA 150 /* 150 ms uncertainty allowed */ /* Define the appropriate LOOPBACK(s) TRUE if you have a Loopback cable with * the mentioned shorts connected to your Serial port

1 0

Alexandre Julliard : wgl: Don't call ExtEscape if we don' t have a GL context.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: be7b8be8b8f6d3304c8d71047c2467945f5e2635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7b8be8b8f6d3304c8d71047… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 14 12:46:25 2008 +0200 wgl: Don't call ExtEscape if we don't have a GL context. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 04c2f2a..836a56a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2136,7 +2136,7 @@ static void WINAPI X11DRV_wglFinish(void) sync_context(ctx); pglFinish(); wine_tsx11_unlock(); - ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + if (ctx) ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } static void WINAPI X11DRV_wglFlush(void) @@ -2148,7 +2148,7 @@ static void WINAPI X11DRV_wglFlush(void) sync_context(ctx); pglFlush(); wine_tsx11_unlock(); - ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + if (ctx) ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); } /**

1 0

Alexandre Julliard : wineprefixcreate: Added a deprecation warning.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: d869bd6265f409b8478cc72505cb075db37d2992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d869bd6265f409b8478cc7250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 14 12:24:14 2008 +0200 wineprefixcreate: Added a deprecation warning. --- tools/wineprefixcreate.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 4d5aaf0..afdfc84 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -111,6 +111,10 @@ do esac done +echo "Note: wineprefixcreate is deprecated and shouldn't be needed anymore." 1>&2 +echo " WINEPREFIX creation and updates now happen automatically when needed." 1>&2 +echo 1>&2 + WINEPREFIX="${WINEPREFIX:-$HOME/.wine}" if [ -d "$WINEPREFIX" ] || mkdir "$WINEPREFIX"; then :

1 0

Alexandre Julliard : wineprefixcreate: Avoid redundant update on initial wineprefix creation.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: 87ec7ec5a56004a66c63eb9167e72ce900150b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ec7ec5a56004a66c63eb916… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 14 12:23:22 2008 +0200 wineprefixcreate: Avoid redundant update on initial wineprefix creation. --- tools/wineprefixcreate.in | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index e06f8b6..4d5aaf0 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -122,7 +122,12 @@ fi WINEPREFIX=`cd "$WINEPREFIX" && pwd` export WINEPREFIX -"${WINELOADER:-$bindir/wine}" wineboot.exe --update +if [ -d "$WINEPREFIX/dosdevices" ] +then + "${WINELOADER:-$bindir/wine}" wineboot.exe --update +else + "${WINELOADER:-$bindir/wine}" wineboot.exe +fi # Wait for the wineserver to finish

1 0

Igor Tarasov : comctl32: Fix statusbar text alignment bug.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: fb61856b4534f0b23c5e4d7a498527206cb8634f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb61856b4534f0b23c5e4d7a4… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Wed May 14 05:50:20 2008 +0500 comctl32: Fix statusbar text alignment bug. --- dlls/comctl32/commctrl.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 554eb4d..4ff2075 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -535,18 +535,27 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) if (text) { int oldbkmode = SetBkMode (hdc, TRANSPARENT); UINT align = DT_LEFT; - if (*text == '\t') { - text++; - align = DT_CENTER; - if (*text == '\t') { - text++; - align = DT_RIGHT; - } - } - r.left += 3; + int strCnt = 0; + if (style & SBT_RTLREADING) - FIXME("Unsupported RTL style!\n"); - DrawTextW (hdc, text, -1, &r, align|DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX); + FIXME("Unsupported RTL style!\n"); + r.left += 3; + do { + if (*text == '\t') { + if (strCnt) { + DrawTextW (hdc, text - strCnt, strCnt, &r, align|DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX); + strCnt = 0; + } + if (align==DT_RIGHT) { + break; + } + align = (align==DT_LEFT ? DT_CENTER : DT_RIGHT); + } else { + strCnt++; + } + } while(*text++); + + if (strCnt) DrawTextW (hdc, text - strCnt, -1, &r, align|DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX); SetBkMode(hdc, oldbkmode); } }

1 0

James Hawkins : msi: Set the OutOfDiskSpace property.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: ece5a047de4f1909b1f2ba1c69f0cece9459acc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece5a047de4f1909b1f2ba1c6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 13 20:31:44 2008 -0500 msi: Set the OutOfDiskSpace property. --- dlls/msi/action.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9d8198b..6867e93 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2125,7 +2125,10 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 }; static const WCHAR szlevel[] = {'I','N','S','T','A','L','L','L','E','V','E','L',0}; + static const WCHAR szOutOfDiskSpace[] = + {'O','u','t','O','f','D','i','s','k','S','p','a','c','e',0}; static const WCHAR szOne[] = { '1', 0 }; + static const WCHAR szZero[] = { '0', 0 }; MSICOMPONENT *comp; UINT rc; MSIQUERY * view; @@ -2177,6 +2180,9 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) MSI_SetPropertyW(package,szlevel, szOne); msi_free(level); + /* FIXME: check volume disk space */ + MSI_SetPropertyW(package, szOutOfDiskSpace, szZero); + ACTION_UpdateFeatureInstallStates(package); return MSI_SetFeatureStates(package);

1 0

James Hawkins : msi: Copy the assembly file directly if it's not compressed .
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: 9460ae35b5401e3bdcb4db0cba00c3e3803aa99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9460ae35b5401e3bdcb4db0cb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue May 13 18:24:48 2008 -0500 msi: Copy the assembly file directly if it's not compressed. --- dlls/msi/action.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0c5306c..9d8198b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5659,15 +5659,30 @@ static UINT ITERATE_PublishAssembly( MSIRECORD *rec, LPVOID param ) file = msi_find_file(package, comp->KeyPath); GetTempPathW(MAX_PATH, path); - r = msi_extract_file(package, file, path); - if (r != ERROR_SUCCESS) + + if (file->IsCompressed) { - ERR("Failed to extract temporary assembly\n"); - return r; + r = msi_extract_file(package, file, path); + if (r != ERROR_SUCCESS) + { + ERR("Failed to extract temporary assembly\n"); + return r; + } + + PathAddBackslashW(path); + lstrcatW(path, file->FileName); } + else + { + PathAddBackslashW(path); + lstrcatW(path, file->FileName); - PathAddBackslashW(path); - lstrcatW(path, file->FileName); + if (!CopyFileW(file->SourcePath, path, FALSE)) + { + ERR("Failed to copy temporary assembly: %d\n", GetLastError()); + return ERROR_FUNCTION_FAILED; + } + } r = install_assembly(path); if (r != ERROR_SUCCESS)

1 0

ByeongSik Jeon : comdlg32: Updated Korean translation.
by Alexandre Julliard May 14, 2008

May 14, 2008

Module: wine Branch: master Commit: 47f83635bcffb9b39f190d37e579107a94f2ea0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f83635bcffb9b39f190d37e… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed May 14 05:27:12 2008 +0900 comdlg32: Updated Korean translation. --- dlls/comdlg32/cdlg_Ko.rc | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ko.rc b/dlls/comdlg32/cdlg_Ko.rc index 705e21c..91e8a41 100644 --- a/dlls/comdlg32/cdlg_Ko.rc +++ b/dlls/comdlg32/cdlg_Ko.rc @@ -22,7 +22,7 @@ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -445,16 +445,14 @@ STRINGTABLE DISCARDABLE PD32_PRINTER_STATUS_POWER_SAVE "�� ; " } - STRINGTABLE DISCARDABLE /* Font styles */ { - IDS_FONT_REGULAR "��ַ�" - IDS_FONT_BOLD "��" - IDS_FONT_ITALIC "��ڸ�" - IDS_FONT_BOLD_ITALIC "�� ڸ�" + IDS_FONT_REGULAR "��" + IDS_FONT_BOLD "��" + IDS_FONT_ITALIC "��Ӳ�" + IDS_FONT_BOLD_ITALIC "�� Ӳ�" } - STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "��"

1 0