November 2006 - Wine-commits

Alexandre Julliard : ntdll: Setting the needs_close flag in server_get_unix_fd got lost in the previous change .
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 881095d7200392a57b867893892ee031c4e8d6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881095d7200392a57b8678938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 22:38:51 2006 +0100 ntdll: Setting the needs_close flag in server_get_unix_fd got lost in the previous change. --- dlls/ntdll/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 5dd9c53..68ed969 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -569,7 +569,7 @@ int server_get_unix_fd( obj_handle_t han if ((fd = receive_fd( &fd_handle )) != -1) { assert( fd_handle == handle ); - if (!removable) add_fd_to_cache( handle, fd, reply->type ); + *needs_close = removable || !add_fd_to_cache( handle, fd, reply->type ); } else ret = STATUS_TOO_MANY_OPENED_FILES; }

1 0

appdb/include application.php version.php
by WineHQ 22 Nov '06

22 Nov '06

ChangeSet ID: 29968 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/11/21 19:41:36 Modified files: include : application.php version.php Log message: Include the real name of the user deleting, rejecting and accepting applications and versions Patch: http://cvs.winehq.org/patch.py?id=29968 Old revision New revision Changes Path 1.74 1.75 +3 -3 appdb/include/application.php 1.82 1.83 +3 -3 appdb/include/version.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.74 appdb/include/application.php:1.75 --- appdb/include/application.php:1.74 22 Nov 2006 1:41:36 -0000 +++ appdb/include/application.php 22 Nov 2006 1:41:36 -0000 @@ -342,12 +342,12 @@ class Application { { case "add": $sSubject = "Submitted application accepted"; - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been accepted."; + $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Administrators Responce:\n"; break; case "reject": $sSubject = "Submitted application rejected"; - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been rejected."; + $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. "; $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=application&appId=".$this->iAppId."\n"; @@ -355,7 +355,7 @@ class Application { break; case "delete": $sSubject = "Submitted application deleted"; - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been deleted."; + $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been deleted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Reason given:\n"; break; Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.82 appdb/include/version.php:1.83 --- appdb/include/version.php:1.82 22 Nov 2006 1:41:36 -0000 +++ appdb/include/version.php 22 Nov 2006 1:41:36 -0000 @@ -404,12 +404,12 @@ class Version { { case "add": $sSubject = "Submitted version accepted"; - $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been accepted."; + $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Administrators Responce:\n"; break; case "reject": $sSubject = "Submitted version rejected"; - $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected. "; + $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the version. "; $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; $sMsg .= APPDB_ROOT."appsubmit.php?sSub=view&sAppType=version&iVersionId=".$this->iVersionId."\n"; @@ -417,7 +417,7 @@ class Version { break; case "delete": $sSubject = "Submitted version deleted"; - $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been deleted."; + $sMsg = "The version you submitted (".$oApp->sName." ".$this->sName.") has been deleted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Reason given:\n"; break; }

1 0

Dmitry Timoshkov : user32: Add a rudimentary WM_SETFONT message test for the static control, make it pass under Wine.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: a7c1b0e0c64006e1b3985fe9d0ddc80630e88bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c1b0e0c64006e1b3985fe9d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Nov 21 19:45:07 2006 +0800 user32: Add a rudimentary WM_SETFONT message test for the static control, make it pass under Wine. --- dlls/user32/static.c | 37 +++++++++++++------ dlls/user32/tests/msg.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 12 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index b70754a..1e6c1d9 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -323,13 +323,17 @@ static VOID STATIC_TryPaintFcn(HWND hwnd static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) { - HBRUSH hBrush = (HBRUSH) SendMessageW( GetParent(hwnd), + HBRUSH hBrush; + HWND parent = GetParent(hwnd); + + if (!parent) parent = hwnd; + hBrush = (HBRUSH) SendMessageW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); if (!hBrush) /* did the app forget to call DefWindowProc ? */ { /* FIXME: DefWindowProc should return different colors if a manifest is present */ - hBrush = (HBRUSH)DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC, + hBrush = (HBRUSH)DefWindowProcW( parent, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); } return hBrush; @@ -399,6 +403,10 @@ static LRESULT StaticWndProc_common( HWN else return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : DefWindowProcA(hwnd, uMsg, wParam, lParam); + case WM_ERASEBKGND: + /* do all painting in WM_PAINT like Windows does */ + return 1; + case WM_PRINTCLIENT: case WM_PAINT: { @@ -496,7 +504,7 @@ static LRESULT StaticWndProc_common( HWN { SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); if (LOWORD(lParam)) - STATIC_TryPaintFcn( hwnd, full_style ); + RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; @@ -612,7 +620,7 @@ static void STATIC_PaintTextfn( HWND hwn HBRUSH hBrush; HFONT hFont, hOldFont = NULL; WORD wFormat; - INT len; + INT len, buf_size; WCHAR *text; GetClientRect( hwnd, &rc); @@ -645,7 +653,7 @@ static void STATIC_PaintTextfn( HWND hwn if (style & SS_NOPREFIX) wFormat |= DT_NOPREFIX; - + if ((style & SS_TYPEMASK) != SS_SIMPLE) { if (style & SS_CENTERIMAGE) @@ -666,17 +674,22 @@ static void STATIC_PaintTextfn( HWND hwn /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned brush is not used */ hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - + if ((style & SS_TYPEMASK) != SS_SIMPLE) { FillRect( hdc, &rc, hBrush ); if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); } - if (!(len = SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ))) return; - if (!(text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return; - SendMessageW( hwnd, WM_GETTEXT, len + 1, (LPARAM)text ); - + buf_size = 256; + if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) return; + + while ((len = InternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) + { + buf_size *= 2; + if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) return; + } + if (((style & SS_TYPEMASK) == SS_SIMPLE) && (style & SS_NOPREFIX)) { /* Windows uses the faster ExtTextOut() to draw the text and @@ -689,9 +702,9 @@ static void STATIC_PaintTextfn( HWND hwn { DrawTextW( hdc, text, -1, &rc, wFormat ); } - + HeapFree( GetProcessHeap(), 0, text ); - + if (hFont) SelectObject( hdc, hOldFont ); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bdb156b..8df6839 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4217,6 +4217,98 @@ static void test_button_messages(void) DestroyWindow(hwnd); } +/****************** static message test *************************/ +static const struct message WmSetFontStaticSeq[] = +{ + { WM_SETFONT, sent }, + { WM_PAINT, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|defwinproc }, + { 0 } +}; + +static WNDPROC old_static_proc; + +static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static long defwndproc_counter = 0; + LRESULT ret; + struct message msg; + + trace("static: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + + /* explicitly ignore WM_GETICON message */ + if (message == WM_GETICON) return 0; + + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(&msg); + + + defwndproc_counter++; + ret = CallWindowProcA(old_static_proc, hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static void subclass_static(void) +{ + WNDCLASSA cls; + + if (!GetClassInfoA(0, "static", &cls)) assert(0); + + old_static_proc = cls.lpfnWndProc; + + cls.hInstance = GetModuleHandle(0); + cls.lpfnWndProc = static_hook_proc; + cls.lpszClassName = "my_static_class"; + if (!RegisterClassA(&cls)) assert(0); +} + +static void test_static_messages(void) +{ + /* FIXME: make as comprehensive as the button message test */ + static const struct + { + DWORD style; + DWORD dlg_code; + const struct message *setfont; + } static_ctrl[] = { + { SS_LEFT, DLGC_STATIC, + WmSetFontStaticSeq } + }; + unsigned int i; + HWND hwnd; + DWORD dlg_code; + + subclass_static(); + + for (i = 0; i < sizeof(static_ctrl)/sizeof(static_ctrl[0]); i++) + { + hwnd = CreateWindowExA(0, "my_static_class", "test", static_ctrl[i].style | WS_POPUP, + 0, 0, 50, 14, 0, 0, 0, NULL); + ok(hwnd != 0, "Failed to create static window\n"); + + dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); + ok(dlg_code == static_ctrl[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); + + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + SetFocus(0); + flush_sequence(); + + trace("static style %08x\n", static_ctrl[i].style); + SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), TRUE); + ok_sequence(static_ctrl[i].setfont, "WM_SETFONT on a static", FALSE); + + DestroyWindow(hwnd); + } +} + /************* painting message test ********************/ void dump_region(HRGN hrgn) @@ -8137,6 +8229,7 @@ START_TEST(msg) invisible_parent_tests(); test_mdi_messages(); test_button_messages(); + test_static_messages(); test_paint_messages(); test_interthread_messages(); test_message_conversion();

1 0

Paul Vriens : ntdll: Remove unused variables.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: b75f36595f137372681b29174f73ae6461ce2489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75f36595f137372681b29174… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Nov 21 09:24:38 2006 +0100 ntdll: Remove unused variables. --- dlls/ntdll/tests/string.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index a8a6358..ce5892a 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -733,8 +733,6 @@ static void one_ui64tow_test(int test_nu static void test_ulonglongtow(void) { int test_num; - int pos; - WCHAR expected_wstr[LARGE_STRI_BUFFER_LENGTH + 1]; LPWSTR result; for (test_num = 0; test_num < NB_ULONGLONG2STR; test_num++) { @@ -748,11 +746,6 @@ static void test_ulonglongtow(void) } /* if */ } /* for */ - for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { - expected_wstr[pos] = ulong2str[0].Buffer[pos]; - } /* for */ - expected_wstr[LARGE_STRI_BUFFER_LENGTH] = '\0'; - if (0) { /* Crashes on XP and W2K3 */ result = p_i64tow(ulonglong2str[0].value, NULL, 10); @@ -762,11 +755,6 @@ static void test_ulonglongtow(void) } if (p_ui64tow) { - for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { - expected_wstr[pos] = ulong2str[0].Buffer[pos]; - } /* for */ - expected_wstr[LARGE_STRI_BUFFER_LENGTH] = '\0'; - if (0) { /* Crashes on XP and W2K3 */ result = p_ui64tow(ulonglong2str[0].value, NULL, 10);

1 0

Alexandre Julliard : comctl32: Remove invalid NULL check.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: 10c3a4db67898773fa93cc491b2c133186d05e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c3a4db67898773fa93cc491… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 12:40:39 2006 +0100 comctl32: Remove invalid NULL check. --- dlls/comctl32/tooltips.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index a05d8a5..ea487b7 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1383,12 +1383,10 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPA LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam; TTTOOL_INFO *toolPtr; - if (lpToolInfo == NULL) - return FALSE; - if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE) - return FALSE; - if (lpToolInfo) { + if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE) + return FALSE; + if (infoPtr->nCurrentTool > -1) { toolPtr = &infoPtr->tools[infoPtr->nCurrentTool]; @@ -1419,12 +1417,10 @@ TOOLTIPS_GetCurrentToolW (HWND hwnd, WPA LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam; TTTOOL_INFO *toolPtr; - if (lpToolInfo == NULL) - return FALSE; - if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE) - return FALSE; - if (lpToolInfo) { + if (lpToolInfo->cbSize < TTTOOLINFOW_V1_SIZE) + return FALSE; + if (infoPtr->nCurrentTool > -1) { toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];

1 0

Paul Vriens : ntdll: Use intended variable.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: d2218eb998236c45e2a23c5c01d7e55925860199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2218eb998236c45e2a23c5c0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Nov 21 09:24:31 2006 +0100 ntdll: Use intended variable. --- dlls/ntdll/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index da5f09e..a8a6358 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -755,7 +755,7 @@ static void test_ulonglongtow(void) if (0) { /* Crashes on XP and W2K3 */ - result = p_i64tow(ulong2str[0].value, NULL, 10); + result = p_i64tow(ulonglong2str[0].value, NULL, 10); ok(result == NULL, "(test d): _i64tow(0x%x%08x, NULL, 10) has result %p, expected: NULL\n", (DWORD)(ulonglong2str[0].value >> 32), (DWORD)ulonglong2str[0].value, result); @@ -769,7 +769,7 @@ static void test_ulonglongtow(void) if (0) { /* Crashes on XP and W2K3 */ - result = p_ui64tow(ulong2str[0].value, NULL, 10); + result = p_ui64tow(ulonglong2str[0].value, NULL, 10); ok(result == NULL, "(test e): _ui64tow(0x%x%08x, NULL, 10) has result %p, expected: NULL\n", (DWORD)(ulonglong2str[0].value >> 32), (DWORD)ulonglong2str[0].value, result);

1 0

Paul Vriens : ntdll: Remove unused variables.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: b3df6da4172d558edff243f4a966f3e2f2ca1a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3df6da4172d558edff243f4a… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Nov 21 09:24:18 2006 +0100 ntdll: Remove unused variables. --- dlls/ntdll/tests/string.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 0db37d8..0db96d6 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -391,8 +391,6 @@ static void one_ultow_test(int test_num, static void test_ulongtow(void) { int test_num; - int pos; - WCHAR expected_wstr[LARGE_STRI_BUFFER_LENGTH + 1]; LPWSTR result; for (test_num = 0; test_num < NB_ULONG2STR; test_num++) { @@ -407,11 +405,6 @@ static void test_ulongtow(void) } /* if */ } /* for */ - for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { - expected_wstr[pos] = ulong2str[0].Buffer[pos]; - } /* for */ - expected_wstr[LARGE_STRI_BUFFER_LENGTH] = '\0'; - if (0) { /* Crashes on XP and W2K3 */ result = p_itow(ulong2str[0].value, NULL, 10); @@ -420,11 +413,6 @@ static void test_ulongtow(void) ulong2str[0].value, result); } - for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { - expected_wstr[pos] = ulong2str[0].Buffer[pos]; - } /* for */ - expected_wstr[LARGE_STRI_BUFFER_LENGTH] = '\0'; - if (0) { /* Crashes on XP and W2K3 */ result = p_ltow(ulong2str[0].value, NULL, 10); @@ -433,11 +421,6 @@ static void test_ulongtow(void) ulong2str[0].value, result); } - for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { - expected_wstr[pos] = ulong2str[0].Buffer[pos]; - } /* for */ - expected_wstr[LARGE_STRI_BUFFER_LENGTH] = '\0'; - if (0) { /* Crashes on XP and W2K3 */ result = p_ultow(ulong2str[0].value, NULL, 10);

1 0

Paul Vriens : ntdll: Remove tests that crash on XP and W2K3.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: 8896cb8e378e2658c4e842bd4ca276cccae3906c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8896cb8e378e2658c4e842bd4… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Nov 21 09:24:25 2006 +0100 ntdll: Remove tests that crash on XP and W2K3. --- dlls/ntdll/tests/string.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 0db96d6..da5f09e 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -752,20 +752,28 @@ static void test_ulonglongtow(void) expected_wstr[pos] = ulong2str[0].Buffer[pos]; } /* for */ expected_wstr[LARGE_STRI_BUFFER_LENGTH] = '\0'; - result = p_i64tow(ulong2str[0].value, NULL, 10); - ok(result == NULL, - "(test d): _i64tow(0x%x%08x, NULL, 10) has result %p, expected: NULL\n", - (DWORD)(ulonglong2str[0].value >> 32), (DWORD)ulonglong2str[0].value, result); + + if (0) { + /* Crashes on XP and W2K3 */ + result = p_i64tow(ulong2str[0].value, NULL, 10); + ok(result == NULL, + "(test d): _i64tow(0x%x%08x, NULL, 10) has result %p, expected: NULL\n", + (DWORD)(ulonglong2str[0].value >> 32), (DWORD)ulonglong2str[0].value, result); + } if (p_ui64tow) { for (pos = 0; pos < LARGE_STRI_BUFFER_LENGTH; pos++) { expected_wstr[pos] = ulong2str[0].Buffer[pos]; } /* for */ expected_wstr[LARGE_STRI_BUFFER_LENGTH] = '\0'; - result = p_ui64tow(ulong2str[0].value, NULL, 10); - ok(result == NULL, - "(test e): _ui64tow(0x%x%08x, NULL, 10) has result %p, expected: NULL\n", - (DWORD)(ulonglong2str[0].value >> 32), (DWORD)ulonglong2str[0].value, result); + + if (0) { + /* Crashes on XP and W2K3 */ + result = p_ui64tow(ulong2str[0].value, NULL, 10); + ok(result == NULL, + "(test e): _ui64tow(0x%x%08x, NULL, 10) has result %p, expected: NULL\n", + (DWORD)(ulonglong2str[0].value >> 32), (DWORD)ulonglong2str[0].value, result); + } } /* if */ }

1 0

Vitaliy Margolen : winecfg: Update Russian translation.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: 05777166b8b70fe4606b9f8ada4fc8ebbc77f076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05777166b8b70fe4606b9f8ad… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 19 19:22:59 2006 -0700 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 2991b4c..73fbf70 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -68,11 +68,10 @@ BEGIN CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,235,8 CONTROL "�� ",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8 - CONTROL "�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 + CONTROL "�� Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 - /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "�� , �� '�� ', �� , �� .", - IDC_STATIC,15,125,228,28 + LTEXT "�� , �� '�� ' �� . �� , �� , �� .", + IDC_STATIC,15,117,228,36 LTEXT "�� :",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED CONTROL "�� ",IDC_ENABLE_DESKTOP,"Button", @@ -214,13 +213,14 @@ BEGIN IDS_SHOW_ADVANCED "�� " IDS_NOTHEME "(�� )" IDS_TAB_GRAPHICS "��" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "�� " IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "� ��" IDS_WINECFG_TITLE "�� Wine" IDS_WINECFG_TITLE_APP "�� Wine �� %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " + IDS_AUDIO_MISSING "�� .\n\n�� . �� , �� .\n\n�� ." IDS_SHELL_FOLDER "�� " IDS_LINKS_TO "�� " END

1 0

Vitaliy Margolen : winecfg: Remove some old dead code and associated language resources.
by Alexandre Julliard 21 Nov '06

21 Nov '06

Module: wine Branch: master Commit: 8b7661bdd8acb890f178553f79ca62e393583792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7661bdd8acb890f178553f7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 19 19:23:18 2006 -0700 winecfg: Remove some old dead code and associated language resources. --- programs/winecfg/Cs.rc | 29 --------------------------- programs/winecfg/It.rc | 29 --------------------------- programs/winecfg/Pt.rc | 33 ------------------------------ programs/winecfg/driveui.c | 46 ------------------------------------------- programs/winecfg/resource.h | 2 - 5 files changed, 0 insertions(+), 139 deletions(-) diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 0218920..cb13bab 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -123,35 +123,6 @@ BEGIN LTEXT "Varov�n�: Vypad� to, �e disk C nen� definov�n. Klikn�te na 'P�idat...' a vytvo�te ho.", IDS_DRIVE_NO_C, 7,223,250,110 END -IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Konfigurace disk�" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Ok",ID_BUTTON_OK,145,150,50,16 - LTEXT "P�smeno:",IDC_STATIC,5,23,26,9 - EDITTEXT IDC_EDIT_LABEL,63,108,78,13,ES_AUTOHSCROLL - LTEXT "Jmenovka:",IDC_STATIC_LABEL,33,111,29,12 - LTEXT "S�riov� ��slo:",IDC_STATIC_SERIAL,33,127,29,12 - EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL - LTEXT "Typ:",IDC_STATIC_TYPE,5,39,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL - LTEXT "Cesta:",IDC_STATIC,5,8,20,9 - COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Proch�zet...",IDC_BUTTON_BROWSE_PATH,154,5,40,13 - COMBOBOX IDC_COMBO_TYPE,31,36,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Pokro�il� zobrazen�",IDC_BUTTON_SHOW_HIDE_ADVANCED,134,34,60,16 - CONTROL "Detekovat ze za��zen�:",IDC_RADIO_AUTODETECT,"Button", - BS_AUTORADIOBUTTON,21,69,93,10 - EDITTEXT IDC_EDIT_DEVICE,33,79,108,13,ES_AUTOHSCROLL - PUSHBUTTON "Proch�zet...",IDC_BUTTON_BROWSE_DEVICE,148,79,40,13 - CONTROL "P�i�adit ru�n�:",IDC_RADIO_ASSIGN,"Button", - BS_AUTORADIOBUTTON,21,98,69,10 - GROUPBOX "Jmenovka a s�riov� ��slo",IDC_BOX_LABELSERIAL,6,58,189,85 -END - IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 4a587d7..befa3d4 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -118,35 +118,6 @@ BEGIN LTEXT "ATTENZIONE: Non � stato definito un driver C. Clicca su 'Aggiungi Driver' per aggiungerne uno.", IDS_DRIVE_NO_C, 7,223,250,110 END -IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configurazone dei Drive" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Ok",ID_BUTTON_OK,145,150,50,16 - LTEXT "Lettera:",IDC_STATIC,5,23,26,9 - EDITTEXT IDC_EDIT_LABEL,63,108,78,13,ES_AUTOHSCROLL - LTEXT "Etichetta:",IDC_STATIC_LABEL,33,111,29,12 - LTEXT "Seriale:",IDC_STATIC_SERIAL,33,127,29,12 - EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL - LTEXT "Tipo:",IDC_STATIC_TYPE,5,39,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL - LTEXT "Percorso:",IDC_STATIC,5,8,20,9 - COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Sfoglia...",IDC_BUTTON_BROWSE_PATH,154,5,40,13 - COMBOBOX IDC_COMBO_TYPE,31,36,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Mostra Avanzate",IDC_BUTTON_SHOW_HIDE_ADVANCED,134,34,60,16 - CONTROL "Rileva automaticamente dal dispositivo:",IDC_RADIO_AUTODETECT,"Button", - BS_AUTORADIOBUTTON,21,69,93,10 - EDITTEXT IDC_EDIT_DEVICE,33,79,108,13,ES_AUTOHSCROLL - PUSHBUTTON "Sfoglia...",IDC_BUTTON_BROWSE_DEVICE,148,79,40,13 - CONTROL "Assegna manualmente:",IDC_RADIO_ASSIGN,"Button", - BS_AUTORADIOBUTTON,21,98,69,10 - GROUPBOX "Etichetta e numero seriale",IDC_BOX_LABELSERIAL,6,58,189,85 -END - IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index 0938fe9..5d7d25b 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -151,39 +151,6 @@ BEGIN END -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Configura��o de unidade" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&OK",ID_BUTTON_OK,145,150,50,13 - LTEXT "Letra:",IDC_STATIC,5,23,26,9 - EDITTEXT IDC_EDIT_LABEL,63,114,78,13,ES_AUTOHSCROLL - LTEXT "R�tulo:",IDC_STATIC_LABEL,33,117,29,12 - LTEXT "S�rie:",IDC_STATIC_SERIAL,33,127,29,12 - EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL - LTEXT "Tipo:",IDC_STATIC,5,54,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL - LTEXT "Caminho:",IDC_STATIC,5,10,20,9 - COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Procurar...",IDC_BUTTON_BROWSE_PATH,154,5,40,13 - COMBOBOX IDC_COMBO_TYPE,31,36,77,60,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Mostrar Avan�ado",IDC_BUTTON_SHOW_HIDE_ADVANCED,134,34,60,16 - CONTROL "Autodetectar do dispositivo:",IDC_RADIO_AUTODETECT,"Button", - BS_AUTORADIOBUTTON,21,79,93,10 - EDITTEXT IDC_EDIT_DEVICE,33,89,108,13,ES_AUTOHSCROLL - PUSHBUTTON "Procurar...",IDC_BUTTON_BROWSE_DEVICE,148,89,40,13 - CONTROL "Associar manualmente:",IDC_RADIO_ASSIGN,"Button", - BS_AUTORADIOBUTTON,21,104,69,10 - GROUPBOX "R�tulo e n�mero de s�rie",IDC_BOX_LABELSERIAL,6,68,189,79 - -END - - LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index c4a400d..b412c78 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -168,48 +168,6 @@ static const struct drive_typemap type_p #define DRIVE_TYPE_DEFAULT 0 -static void fill_drive_droplist(long mask, char curletter, HWND dialog) -{ - int i; - int selection; - int count; - int next_letter; - char sName[4]; - - strcpy(sName, "A:"); - for (i = 0, count = 0, selection = -1, next_letter = -1; i <= 'Z'-'A'; ++i) - { - if (mask & DRIVE_MASK_BIT('A' + i)) - { - int index; - - sName[0] = 'A' + i; - index = SendDlgItemMessage(dialog, IDC_COMBO_LETTER, CB_ADDSTRING, 0, (LPARAM) sName); - - if (toupper(curletter) == 'A' + i) - { - selection = count; - } - - if (i >= 2 && next_letter == -1) - { - /* default drive is first one of C-Z */ - next_letter = count; - } - - count++; - } - } - - if (selection == -1) - { - selection = next_letter; - } - - SendDlgItemMessage(dialog, IDC_COMBO_LETTER, CB_SETCURSEL, selection, 0); -} - - static void enable_labelserial_box(HWND dialog, int mode) { WINE_TRACE("mode=%d\n", mode); @@ -444,9 +402,6 @@ static void update_controls(HWND dialog) WINE_TRACE("Updating sheet for drive %c\n", current_drive->letter); - /* Drive letters */ - fill_drive_droplist(drive_available_mask(current_drive->letter), current_drive->letter, dialog); - /* path */ path = current_drive->unixpath; WINE_TRACE("set path control text to '%s'\n", path); @@ -770,7 +725,6 @@ DriveDlgProc (HWND dialog, UINT msg, WPA if (HIWORD(wParam) != BN_CLICKED) break; item = SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETCURSEL, 0, 0); drive = (struct drive *) SendMessage(GetDlgItem(dialog, IDC_LIST_DRIVES), LB_GETITEMDATA, item, 0); - /*DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_DRIVE_EDIT), NULL, (DLGPROC) DriveEditDlgProc, (LPARAM) drive); */ break; case IDC_BUTTON_AUTODETECT: diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 4d4fdd1..f9d6450 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -50,7 +50,6 @@ #define IDD_GRAPHCFG 110 #define IDD_DLLCFG 111 #define IDD_DRIVECFG 112 -#define IDD_DRIVE_EDIT 114 #define IDD_DESKTOP_INTEGRATION 115 #define IDB_WINE_LOGO 200 #define IDC_TABABOUT 1001 @@ -114,7 +113,6 @@ #define IDC_EDIT_LABEL 1060 #define IDC_EDIT_PATH 1061 #define IDC_EDIT_SERIAL 1062 -#define IDC_COMBO_LETTER 1063 #define IDC_COMBO_TYPE 1065 #define IDC_EDIT_DEVICE 1066 #define IDC_BUTTON_BROWSE_PATH 1067

1 0