March 2006 - Wine-commits - list.winehq.org

Vitaly Lipatov : regedit: Fix Russian translation.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 0bb76d231cb46f0555ac3a8d46a8fce1ca808035 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0bb76d231cb46f0555ac3a8… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Mar 19 21:38:50 2006 +0300 regedit: Fix Russian translation. --- programs/regedit/Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/Ru.rc b/programs/regedit/Ru.rc index 18065b4..01cc028 100644 --- a/programs/regedit/Ru.rc +++ b/programs/regedit/Ru.rc @@ -28,7 +28,7 @@ IDC_REGEDIT MENU DISCARDABLE BEGIN POPUP "&��" BEGIN - MENUITEM "�&��", ID_REGISTRY_EXIT + MENUITEM "�&��", ID_REGISTRY_EXIT END POPUP "&��" BEGIN @@ -46,9 +46,9 @@ BEGIN MENUITEM "&�� ...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED MENUITEM "&�� ...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR - MENUITEM "&��\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM "&��\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "�&��", ID_REGISTRY_EXIT + MENUITEM "�&��", ID_REGISTRY_EXIT END POPUP "&��" BEGIN @@ -153,9 +153,9 @@ BEGIN "�� " ID_REGISTRY_DISCONNECTNETWORKREGISTRY "�� " - ID_REGISTRY_PRINT "�� " + ID_REGISTRY_PRINT "�� " /* ID_HELP_HELPTOPICS "Opens registry editor help" */ - ID_HELP_ABOUT "�� , �� " + ID_HELP_ABOUT "�� , �� " END STRINGTABLE DISCARDABLE

1 0

Vitaly Lipatov : control: Fix datetime name.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: d4c42c0fef0f0fa5531fb3289a3abc9cff79791a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4c42c0fef0f0fa5531fb32… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sun Mar 19 19:48:05 2006 +0300 control: Fix datetime name. --- programs/control/params.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/control/params.h b/programs/control/params.h index dcdb49f..644b597 100644 --- a/programs/control/params.h +++ b/programs/control/params.h @@ -35,7 +35,7 @@ #define szEXEC_ARGS "Shell32.dll,Control_RunDLL " #define szC_COLOR "desk.cpl,,2" -#define szC_DATETIME "datetime.cpl" +#define szC_DATETIME "timedate.cpl" #define szC_DESKTOP "desk.cpl" #define szC_FONTS "main.cpl @3" #define szC_INTERNATIONAL "intl.cpl"

1 0

Milko Krachounov : winecfg: Update Bulgarian translation.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 5d138be46d654a57eb51dec00e204fd82c9ab6cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d138be46d654a57eb51dec… Author: Milko Krachounov <milko(a)3mhz.net> Date: Sun Mar 19 03:39:07 2006 +0200 winecfg: Update Bulgarian translation. --- programs/winecfg/Bg.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 7c57470..b4f1d54 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -179,7 +179,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDAB STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX " �� ",IDC_STATIC,8,4,244,106 LTEXT "��:",IDC_STATIC,15,16,230,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "�� ...",IDC_THEME_INSTALL,152,38,93,14 @@ -187,12 +187,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "��:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " �� ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 - EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + CONTROL "�� :",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,55,13 + EDITTEXT IDC_EDIT_SFPATH,70,195,140,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -206,16 +206,16 @@ 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 configuration for %s" + IDS_WINECFG_TITLE "�� Wine" + IDS_WINECFG_TITLE_APP "�� Wine �� %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " IDS_AUDIO_MISSING "�� .\n\n�� .\n�� .\n\n�� , �� ." - IDS_SHELL_FOLDER "Shell Folder" - IDS_LINKS_TO "Links to" + IDS_SHELL_FOLDER "��" + IDS_LINKS_TO "�� " END STRINGTABLE DISCARDABLE

1 0

Mike McCormack : include: LVSETINFOTIPA does not exist.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 03283bfbc17d8a6dee5e6976ea888bab0d6d2876 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03283bfbc17d8a6dee5e697… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 19 12:06:54 2006 +0900 include: LVSETINFOTIPA does not exist. --- include/commctrl.h | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 3b3501a..305531d 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3243,26 +3243,14 @@ typedef struct tagLVITEMW #define LV_ITEMA LVITEMA #define LV_ITEMW LVITEMW -typedef struct LVSETINFOTIPA -{ - UINT cbSize; - DWORD dwFlags; - LPSTR pszText; - int iItem; - int iSubItem; -} LVSETINFOTIPA, *PLVSETINFOTIPA; - -typedef struct LVSETINFOTIPW +typedef struct LVSETINFOTIP { UINT cbSize; DWORD dwFlags; LPWSTR pszText; int iItem; int iSubItem; -} LVSETINFOTIPW, *PLVSETINFOTIPW; - -#define LVSETINFOTIP WINELIB_NAME_AW(LVSETINFOTIP) -#define PLVSETINFOTIP WINELIB_NAME_AW(PLVSETINFOTIP) +} LVSETINFOTIP, *PLVSETINFOTIP; /* ListView background image structs and constants For _WIN32_IE version 0x400 and later. */

1 0

Jeff Latimer : winedbg: Copy floating point status to the dbgcontext.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 18f5d0abdc64c49ed72d8562e29da72cb09ecb56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18f5d0abdc64c49ed72d856… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Mar 19 12:53:01 2006 +1100 winedbg: Copy floating point status to the dbgcontext. --- programs/winedbg/tgt_active.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a76f193..7c83d85 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -100,7 +100,7 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL static unsigned dbg_fetch_context(void) { dbg_context.ContextFlags = CONTEXT_CONTROL - | CONTEXT_INTEGER + | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT #ifdef CONTEXT_SEGMENTS | CONTEXT_SEGMENTS #endif

1 0

Vitaliy Margolen : gdi: Handle NT style \\.\DISPLAY1 name that we return.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 9bf0080136425ca60d63cf06c518a13ece5ab89b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9bf0080136425ca60d63cf0… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Mar 18 11:20:03 2006 -0700 gdi: Handle NT style \\.\DISPLAY1 name that we return. --- dlls/gdi/driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c index c9ac552..9f40a8d 100644 --- a/dlls/gdi/driver.c +++ b/dlls/gdi/driver.c @@ -365,11 +365,13 @@ BOOL DRIVER_GetDriverName( LPCWSTR devic { static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; static const WCHAR devicesW[] = { 'd','e','v','i','c','e','s',0 }; + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR empty_strW[] = { 0 }; WCHAR *p; /* display is a special case */ - if (!strcmpiW( device, displayW )) + if (!strcmpiW( device, displayW ) || + !strcmpiW( device, display1W )) { lstrcpynW( driver, displayW, size ); return TRUE;

1 0

Robert Shearman : msi: Optimise WHERE operations.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 9f487ba1dee3426b1acd03e3d02e00b79e71aec0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f487ba1dee3426b1acd03e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:12:15 2006 +0000 msi: Optimise WHERE operations. Optimise WHERE operations on matching against strings by adding a new function find_matching_rows to the views, which eliminates the need to examine every record when executing a query. Implement this function in the table using a hash table on the ID stored in the data. --- dlls/msi/delete.c | 11 +++++ dlls/msi/distinct.c | 24 +++++++++++ dlls/msi/insert.c | 11 +++++ dlls/msi/msipriv.h | 16 +++++++ dlls/msi/order.c | 21 +++++++++- dlls/msi/select.c | 21 +++++++++- dlls/msi/table.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/update.c | 10 ++++- dlls/msi/where.c | 63 +++++++++++++++++++++++++++++ 9 files changed, 276 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9f487ba1dee3426b1ac…

1 0

Robert Shearman : msi: Add a test for MsiFormatRecord with integer fields.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: d62aa01ec0a005dc9f8be481a6aef0cedb1191fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d62aa01ec0a005dc9f8be48… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:14:09 2006 +0000 msi: Add a test for MsiFormatRecord with integer fields. --- dlls/msi/tests/format.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 59c6f11..50f0e3c 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -618,6 +618,18 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); ok( sz == 11, "size wrong\n"); ok( 0 == strcmp(buffer,"boo [~] hoo"), "wrong output (%s)\n",buffer); + + r = MsiRecordSetString(hrec, 0, "[1]"); + r = MsiRecordSetInteger(hrec, 1, 123456); + ok( r == ERROR_SUCCESS, "set integer failed\n"); + sz = sizeof buffer; + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok( r == ERROR_SUCCESS, "format failed\n"); + todo_wine{ + ok( sz == 6, "size wrong\n"); + ok( 0 == strcmp(buffer,"123456"), "wrong output (%s)\n",buffer); + } + MsiCloseHandle(hrec); }

1 0

Robert Shearman : wininet: Copy from the start of the cookie name, not the cookie data.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 15a7d3b2b4f486db1705e34bbb778d9723afc0d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15a7d3b2b4f486db1705e34… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:11:35 2006 +0000 wininet: Copy from the start of the cookie name, not the cookie data. Copy from the start of the cookie name, not the cookie data when parsing cookies with a NULL cookie name. --- dlls/wininet/cookie.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 231faca..15c257a 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -426,7 +426,7 @@ BOOL WINAPI InternetSetCookieW(LPCWSTR l ourCookieData += 1; ourCookieName = HeapAlloc(GetProcessHeap(), 0, (ourCookieNameSize + 1)*sizeof(WCHAR)); - memcpy(ourCookieName, ourCookieData, ourCookieNameSize * sizeof(WCHAR)); + memcpy(ourCookieName, lpCookieData, ourCookieNameSize * sizeof(WCHAR)); ourCookieName[ourCookieNameSize] = '\0'; TRACE("setting (hacked) cookie of %s, %s\n", debugstr_w(ourCookieName), debugstr_w(ourCookieData));

1 0

Robert Shearman : include: Add some more defines to wininet.h.
by Alexandre Julliard 20 Mar '06

20 Mar '06

Module: wine Branch: refs/heads/master Commit: 3efe42537aeaefc81f427f2e7f84553e6fe93819 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3efe42537aeaefc81f427f2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Mar 18 16:10:52 2006 +0000 include: Add some more defines to wininet.h. --- include/wininet.h | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index f0a93e4..d9b34db 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1220,6 +1220,17 @@ BOOLAPI InternetEnumPerSiteCookieDecisio BOOLAPI InternetEnumPerSiteCookieDecisionW(LPWSTR,unsigned long *,unsigned long *,unsigned long); #define InternetEnumPerSiteCookieDecision WINELIB_NAME_AW(InternetEnumPerSiteCookieDecision) +#define INTERNET_COOKIE_IS_SECURE 0x00000001 +#define INTERNET_COOKIE_IS_SESSION 0x00000002 +#define INTERNET_COOKIE_THIRD_PARTY 0x00000010 +#define INTERNET_COOKIE_PROMPT_REQUIRED 0x00000020 +#define INTERNET_COOKIE_EVALUATE_P3P 0x00000040 +#define INTERNET_COOKIE_APPLY_P3P 0x00000080 +#define INTERNET_COOKIE_P3P_ENABLED 0x00000100 +#define INTERNET_COOKIE_IS_RESTRICTED 0x00000200 +#define INTERNET_COOKIE_IE6 0x00000400 +#define INTERNET_COOKIE_IS_LEGACY 0x00000800 + BOOLAPI InternetGetCookieExA(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); BOOLAPI InternetGetCookieExW(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID); #define InternetGetCookieEx WINELIB_NAME_AW(InternetGetCookieEx) @@ -1369,11 +1380,12 @@ INTERNETAPI DWORD WINAPI InternetConfirm #define NORMAL_CACHE_ENTRY 0x00000001 +#define STICKY_CACHE_ENTRY 0x00000004 +#define EDITED_CACHE_ENTRY 0x00000008 #define COOKIE_CACHE_ENTRY 0x00100000 #define URLHISTORY_CACHE_ENTRY 0x00200000 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020 -#define STICKY_CACHE_ENTRY 0x00000004 #define SPARSE_CACHE_ENTRY 0x00010000 #define URLCACHE_FIND_DEFAULT_FILTER NORMAL_CACHE_ENTRY \

1 0