June 2010 - Wine-commits - list.winehq.org

Matijn Woudt : msi/tests: Testcases for CREATE TABLE.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 1a159dfddc90fb5a734f58014ef5600dc1f3d78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a159dfddc90fb5a734f58014… Author: Matijn Woudt <tijnema(a)gmail.com> Date: Thu Jun 3 15:21:31 2010 +0200 msi/tests: Testcases for CREATE TABLE. --- dlls/msi/tests/db.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5571a71..56fa0f0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8845,6 +8845,112 @@ static void test_columnorder(void) DeleteFileA(msifile); } +static void test_createtable(void) +{ + MSIHANDLE hdb, htab = 0, hrec = 0; + LPCSTR query; + UINT res; + DWORD size; + char buffer[0x20]; + + hdb = create_db(); + ok(hdb, "failed to create db\n"); + + query = "CREATE TABLE `blah` (`foo` CHAR(72) NOT NULL PRIMARY KEY `foo`)"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if(res == ERROR_SUCCESS ) + { + res = MsiViewExecute( htab, hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); + todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(buffer); + res = MsiRecordGetString(hrec, 1, buffer, &size ); + todo_wine ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + query = "CREATE TABLE `a` (`b` INT PRIMARY KEY `b`)"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + if(res == ERROR_SUCCESS ) + { + res = MsiViewExecute( htab, 0 ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + query = "SELECT * FROM `a`"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(buffer); + res = MsiRecordGetString(hrec, 1, buffer, &size ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiDatabaseCommit(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiOpenDatabase(msifile, MSIDBOPEN_TRANSACT, &hdb ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + query = "SELECT * FROM `a`"; + res = MsiDatabaseOpenView( hdb, query, &htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewGetColumnInfo( htab, MSICOLINFO_NAMES, &hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = sizeof(buffer); + res = MsiRecordGetString(hrec, 1, buffer, &size ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + todo_wine ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + + res = MsiCloseHandle( hrec ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiViewClose( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle( htab ); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + res = MsiDatabaseCommit(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = MsiCloseHandle(hdb); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + DeleteFileA(msifile); +} + + START_TEST(db) { test_msidatabase(); @@ -8896,4 +9002,5 @@ START_TEST(db) test_insertorder(); test_columnorder(); test_suminfo_import(); + test_createtable(); }

1 0

Sylvain Petreolle : mshtml: Allow either REG_SZ or REG_EXPAND_SZ for GeckoCabDir.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: cf7de41edc4735819c932bbf719dfc9918851b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7de41edc4735819c932bbf7… Author: Sylvain Petreolle <spetreolle(a)yahoo.fr> Date: Wed Jun 2 09:44:41 2010 -0700 mshtml: Allow either REG_SZ or REG_EXPAND_SZ for GeckoCabDir. --- dlls/mshtml/install.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 4122194..65faa5a 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -235,13 +235,13 @@ static BOOL install_from_registered_dir(void) return FALSE; file_name = heap_alloc(size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); if(res == ERROR_MORE_DATA) { file_name = heap_realloc(file_name, size+sizeof(GECKO_FILE_NAME)); - res = RegQueryValueExA(hkey, "GeckoCabDir", NULL, &type, (PBYTE)file_name, &size); + res = RegGetValueA(hkey, NULL, "GeckoCabDir", RRF_RT_ANY, &type, (PBYTE)file_name, &size); } RegCloseKey(hkey); - if(res != ERROR_SUCCESS || type != REG_SZ) { + if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { heap_free(file_name); return FALSE; }

1 0

Joel Holdsworth : winecfg: Moved about panel code into about.c.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 7342bce80d2863813255dad7869f1574a90f18bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7342bce80d2863813255dad78… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Jun 2 23:56:00 2010 +0100 winecfg: Moved about panel code into about.c. --- programs/winecfg/Makefile.in | 1 + programs/winecfg/about.c | 92 ++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/main.c | 60 --------------------------- programs/winecfg/winecfg.h | 1 + 4 files changed, 94 insertions(+), 60 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index ae8fbd0..73ec486 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -7,6 +7,7 @@ APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32 C_SRCS = \ + about.c \ appdefaults.c \ audio.c \ drive.c \ diff --git a/programs/winecfg/about.c b/programs/winecfg/about.c new file mode 100644 index 0000000..7a88e4f --- /dev/null +++ b/programs/winecfg/about.c @@ -0,0 +1,92 @@ +/* + * WineCfg about panel + * + * Copyright 2002 Jaco Greeff + * Copyright 2003 Dimitrie O. Paun + * Copyright 2003 Mike Hearn + * Copyright 2010 Joel Holdsworth + * + * This library 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. + * + * This library 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. + * + * 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 + * + */ + +#include <windows.h> +#include <commctrl.h> +#include <wine/debug.h> + +#include "resource.h" +#include "winecfg.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winecfg); + +INT_PTR CALLBACK +AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + char *owner, *org; + + switch (uMsg) + { + case WM_NOTIFY: + switch(((LPNMHDR)lParam)->code) + { + case PSN_APPLY: + /*save registration info to registry */ + owner = get_text(hDlg, IDC_ABT_OWNER); + org = get_text(hDlg, IDC_ABT_ORG); + + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + "RegisteredOwner", owner ? owner : ""); + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", + "RegisteredOrganization", org ? org : ""); + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOwner", owner ? owner : ""); + set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOrganization", org ? org : ""); + apply(); + + HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, org); + break; + } + break; + + case WM_INITDIALOG: + /* read owner and organization info from registry, load it into text box */ + owner = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOwner", ""); + org = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", + "RegisteredOrganization", ""); + + SetDlgItemText(hDlg, IDC_ABT_OWNER, owner); + SetDlgItemText(hDlg, IDC_ABT_ORG, org); + + SendMessage(GetParent(hDlg), PSM_UNCHANGED, 0, 0); + + HeapFree(GetProcessHeap(), 0, owner); + HeapFree(GetProcessHeap(), 0, org); + break; + + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case EN_CHANGE: + /* enable apply button */ + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + break; + } + break; + } + return FALSE; +} diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 83a5f05..fdefefb 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -60,66 +60,6 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) return 0; } -static INT_PTR CALLBACK -AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - char *owner, *org; - - switch (uMsg) { - - case WM_NOTIFY: - switch(((LPNMHDR)lParam)->code) - { - case PSN_APPLY: - /*save registration info to registry */ - owner = get_text(hDlg, IDC_ABT_OWNER); - org = get_text(hDlg, IDC_ABT_ORG); - - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", - "RegisteredOwner", owner ? owner : ""); - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", - "RegisteredOrganization", org ? org : ""); - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOwner", owner ? owner : ""); - set_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOrganization", org ? org : ""); - apply(); - - HeapFree(GetProcessHeap(), 0, owner); - HeapFree(GetProcessHeap(), 0, org); - break; - } - break; - - case WM_INITDIALOG: - /* read owner and organization info from registry, load it into text box */ - owner = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOwner", ""); - org = get_reg_key(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion", - "RegisteredOrganization", ""); - - SetDlgItemText(hDlg, IDC_ABT_OWNER, owner); - SetDlgItemText(hDlg, IDC_ABT_ORG, org); - - SendMessage(GetParent(hDlg), PSM_UNCHANGED, 0, 0); - - HeapFree(GetProcessHeap(), 0, owner); - HeapFree(GetProcessHeap(), 0, org); - break; - - case WM_COMMAND: - switch(HIWORD(wParam)) - { - case EN_CHANGE: - /* enable apply button */ - SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); - break; - } - break; - } - return FALSE; -} - #define NUM_PROPERTY_PAGES 7 static INT_PTR diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index d730d84..4d4a92f 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -87,6 +87,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* Drive management */ BOOL load_drives(void);

1 0

Alexander Scott-Johns : msvcrt/test: Add some simple _vsnwprintf_s tests.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: d313c0b98285fa43fd679dc4d6f9d3d1ab60eafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d313c0b98285fa43fd679dc4d… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jun 7 03:04:53 2010 +0100 msvcrt/test: Add some simple _vsnwprintf_s tests. --- dlls/msvcrt/tests/printf.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index eaf248b..b48db51 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -812,6 +812,9 @@ static void test_vsnwprintf(void) static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist); static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer, + size_t count, const wchar_t *format, + __ms_va_list valist); static int __cdecl _vscprintf_wrapper(const char *format, ...) { @@ -852,6 +855,58 @@ static void test_vscwprintf(void) ok( ret == 8, "got %d expected 8\n", ret ); } +static int __cdecl _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer, + size_t count, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf_s(str, sizeOfBuffer, count, format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vsnwprintf_s(void) +{ + const wchar_t format[] = { 'A','B','%','u','C',0 }; + const wchar_t out7[] = { 'A','B','1','2','3','C',0 }; + const wchar_t out6[] = { 'A','B','1','2','3',0 }; + const wchar_t out2[] = { 'A',0 }; + const wchar_t out1[] = { 0 }; + wchar_t buffer[14] = { 0 }; + int exp, got; + + /* Enough room. */ + exp = wcslen(out7); + + got = _vsnwprintf_s_wrapper(buffer, 14, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 12, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 7, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + /* Not enough room. */ + exp = -1; + + got = _vsnwprintf_s_wrapper(buffer, 6, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out6, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 2, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out2, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 1, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); +} + START_TEST(printf) { test_sprintf(); @@ -863,6 +918,7 @@ START_TEST(printf) p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf"); p__vscwprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscwprintf"); + p__vsnwprintf_s = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vsnwprintf_s"); if (p__vscprintf) test_vscprintf(); @@ -873,4 +929,9 @@ START_TEST(printf) test_vscwprintf(); else win_skip("_vscwprintf not available\n"); + + if (p__vsnwprintf_s) + test_vsnwprintf_s(); + else + win_skip("_vsnwprintf_s not available\n"); }

1 0

Alexander Scott-Johns : msvcrt: Fix spec file.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: d3c00aab839e4042095f86f5079906bb9d611bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c00aab839e4042095f86f50… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 15:51:45 2010 +0100 msvcrt: Fix spec file. --- dlls/msvcrt/msvcrt.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0cc51f5..604a5ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -986,9 +986,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) MSVCRT_vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) MSVCRT_vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf -@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnprintf_l -@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnprintf_s -@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnwprintf_s_l # stub _vsprintf_l # stub _vsprintf_p # stub _vsprintf_p_l

1 0

Nikolay Sivov : comctl32/rebar: Fix index check condition for RB_SHOWBAND.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 60e467a6cd1f1f0936e0979d925495d6bde23981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e467a6cd1f1f0936e0979d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 7 01:15:43 2010 +0400 comctl32/rebar: Fix index check condition for RB_SHOWBAND. --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tests/rebar.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cd3abad..7a2995c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2779,7 +2779,7 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT iBand, BOOL show) { REBAR_BAND *lpBand; - if (iBand < 0 || iBand > infoPtr->uNumBands) + if (iBand < 0 || iBand >= infoPtr->uNumBands) return FALSE; lpBand = REBAR_GetBand(infoPtr, iBand); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index a75a064..d5f27b9 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -925,6 +925,36 @@ static HWND create_parent_window(void) return hwnd; } +static void test_showband(void) +{ + HWND hRebar; + REBARBANDINFOA rbi; + BOOL ret; + + hRebar = create_rebar_control(); + + /* no bands */ + ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE); + ok(ret == FALSE, "got %d\n", ret); + + rbi.cbSize = REBARBANDINFOA_V6_SIZE; + rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; + rbi.cx = 200; + rbi.cxMinChild = 100; + rbi.cyMinChild = 30; + rbi.hwndChild = NULL; + SendMessageA(hRebar, RB_INSERTBAND, -1, (LPARAM)&rbi); + + /* index out of range */ + ret = SendMessageA(hRebar, RB_SHOWBAND, 1, TRUE); + ok(ret == FALSE, "got %d\n", ret); + + ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE); + ok(ret == TRUE, "got %d\n", ret); + + DestroyWindow(hRebar); +} + START_TEST(rebar) { HMODULE hComctl32; @@ -948,6 +978,7 @@ START_TEST(rebar) test_bandinfo(); test_colors(); + test_showband(); if(!is_font_installed("System") || !is_font_installed("Tahoma")) {

1 0

Jose Rostagno : shell32: Update Spanish translation.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 26e4154629f297c4469bc1824cdb24fda5c58db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26e4154629f297c4469bc1824… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Sun Jun 6 13:36:58 2010 -0300 shell32: Update Spanish translation. --- dlls/shell32/shell32_Es.rc | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc index 06580d1..176c677 100644 --- a/dlls/shell32/shell32_Es.rc +++ b/dlls/shell32/shell32_Es.rc @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2003,2004,2007,2008 Jos� Manuel Ferrer Ortiz + * Copyright 2010 Jos� Rostagno * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -95,13 +96,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Archivo" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "S&alir", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Ver" BEGIN MENUITEM "Iconos &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Iconos &peque�os", FCIDM_SHVIEW_SMALLICON @@ -109,9 +110,9 @@ BEGIN MENUITEM "&Detalles", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Ayuda" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Acerca de Panel de Control...", IDM_CPANEL_ABOUT END END @@ -206,12 +207,16 @@ STRINGTABLE IDS_SHV_COLUMN11 "Grupo" IDS_SHV_COLUMN_DELFROM "Lugar original" IDS_SHV_COLUMN_DELDATE "Fecha de borrado" + IDS_SHV_COL_DOCS "Documentos" + IDS_SHV_COL_STATUS "Estado" + IDS_SHV_COL_LOCATION "Ubicaci�n" + IDS_SHV_COL_MODEL "Modelo" /* special folders */ IDS_DESKTOP "Escritorio" IDS_MYCOMPUTER "Mi PC" IDS_RECYCLEBIN_FOLDER_NAME "Papelera de reciclaje" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Panel de Control" /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" @@ -245,6 +250,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Apagar" IDS_SHUTDOWN_PROMPT "�Desea terminar su sesi�n de Wine?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "No se puede mostrar el cuadro de di�logo ejecutar archivo (error interno)" + IDS_RUNDLG_BROWSE_ERROR "No se puede mostrar el cuadro de di�logo Examinar (error interno)" + IDS_RUNDLG_BROWSE_CAPTION "Examinar" + IDS_RUNDLG_BROWSE_FILTER "Archivos ejecutables\0*.exe\0Todos los archivos\0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "Men� Inicio\\Programas" IDS_PERSONAL "Mis documentos"

1 0

Alexander Scott-Johns : msvcrt: Fix comments.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 19bff6bda561a14766cd95a6d632dccef4aaf781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bff6bda561a14766cd95a6d… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 15:19:14 2010 +0100 msvcrt: Fix comments. --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c26809c..b9ac8f7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1103,7 +1103,7 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* - * vsnwsprintf_internal (INTERNAL) + * vsnwprintf_internal (INTERNAL) */ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, BOOL valid, @@ -1120,7 +1120,7 @@ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, } /********************************************************************* - * _vsnwsprintf (MSVCRT.@) + * _vsnwprintf (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist) @@ -1129,7 +1129,7 @@ int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, } /********************************************************************* - * _vsnwsprintf_l (MSVCRT.@) + * _vsnwprintf_l (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, @@ -1139,7 +1139,7 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, } /********************************************************************* - * _vsnwsprintf_s_l (MSVCRT.@) + * _vsnwprintf_s_l (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const MSVCRT_wchar_t *format, @@ -1168,7 +1168,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer } /********************************************************************* - * _vsnwsprintf_s (MSVCRT.@) + * _vsnwprintf_s (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const MSVCRT_wchar_t *format, __ms_va_list valist) @@ -1520,7 +1520,7 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ } /********************************************************************* - * _wctoi64_l (MSVCRT.@) + * _wcstoi64_l (MSVCRT.@) * * FIXME: locale parameter is ignored */

1 0

Alexander Scott-Johns : msvcrt/tests: Properly skip if functions are not available.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: b205fd8108eca2fd29705875e53ed852f56a6b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b205fd8108eca2fd29705875e… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 15:27:47 2010 +0100 msvcrt/tests: Properly skip if functions are not available. --- dlls/msvcrt/tests/printf.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index cea4db3..eaf248b 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -864,6 +864,13 @@ START_TEST(printf) p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf"); p__vscwprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscwprintf"); - if (p__vscprintf) test_vscprintf(); - if (p__vscwprintf) test_vscwprintf(); + if (p__vscprintf) + test_vscprintf(); + else + win_skip("_vscprintf not available\n"); + + if (p__vscwprintf) + test_vscwprintf(); + else + win_skip("_vscwprintf not available\n"); }

1 0

Alexander Scott-Johns : msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE.
by Alexandre Julliard 07 Jun '10

07 Jun '10

Module: wine Branch: master Commit: 2663079c6036f07053f4627f4dbf1193b579e148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2663079c6036f07053f4627f4… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 16:11:09 2010 +0100 msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE. --- dlls/msvcrt/heap.c | 4 ++-- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/wcs.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ad6bb37..b1d4076 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -578,7 +578,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, return MSVCRT_EINVAL; } - if(count!=_TRUNCATE && count<numberOfElements) + if(count!=MSVCRT__TRUNCATE && count<numberOfElements) end = count; else end = numberOfElements-1; @@ -586,7 +586,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, for(i=0; i<end && src[i]; i++) dest[i] = src[i]; - if(!src[i] || end==count || count==_TRUNCATE) { + if(!src[i] || end==count || count==MSVCRT__TRUNCATE) { dest[i] = '\0'; return 0; } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 8fca06d..76d562c 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1783,7 +1783,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, return MSVCRT_EINVAL; } - if(count==_TRUNCATE || size<count) + if(count==MSVCRT__TRUNCATE || size<count) conv = size; else conv = count; @@ -1791,7 +1791,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale); if(conv<size) wcstr[conv++] = '\0'; - else if(conv==size && (count==_TRUNCATE || wcstr[conv-1]=='\0')) + else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0')) wcstr[conv-1] = '\0'; else { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8dd8881..f68790b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -709,7 +709,7 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define _MB_CP_ANSI -3 #define _MB_CP_LOCALE -4 -#define _TRUNCATE ((MSVCRT_size_t)-1) +#define MSVCRT__TRUNCATE ((MSVCRT_size_t)-1) void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b9ac8f7..90bc3b8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -304,7 +304,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, return MSVCRT_EINVAL; } - if(count==_TRUNCATE || size<count) + if(count==MSVCRT__TRUNCATE || size<count) conv = size; else conv = count; @@ -312,7 +312,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, conv = MSVCRT__wcstombs_l(mbstr, wcstr, conv, locale); if(conv<size) mbstr[conv++] = '\0'; - else if(conv==size && (count==_TRUNCATE || mbstr[conv-1]=='\0')) + else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) mbstr[conv-1] = '\0'; else { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -1043,7 +1043,7 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, ret = vsnprintf_internal(str, len, format, locale, TRUE, valist); if(ret<0 || ret==len) { - if(count!=_TRUNCATE && count>sizeOfBuffer) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer); @@ -1154,7 +1154,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); if(ret<0 || ret==len) { - if(count!=_TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer);

1 0