January 2006 - Wine-Commits

Vitaliy Margolen : shell32: Create Local AppData for user profile.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: c99880d9558bd8b7db1d183de3c9eacd500a8784 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c99880d9558bd8b7db1d183… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Jan 4 14:48:59 2006 +0100 shell32: Create Local AppData for user profile. Move history and internet tmp files to Local Settings. --- dlls/shell32/shell32_Bg.rc | 4 ++-- dlls/shell32/shell32_De.rc | 4 ++-- dlls/shell32/shell32_En.rc | 4 ++-- dlls/shell32/shell32_Es.rc | 4 ++-- dlls/shell32/shell32_Fi.rc | 4 ++-- dlls/shell32/shell32_Fr.rc | 4 ++-- dlls/shell32/shell32_No.rc | 4 ++-- dlls/shell32/shell32_Pt.rc | 4 ++-- dlls/shell32/shellpath.c | 2 ++ 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shell32_Bg.rc b/dlls/shell32/shell32_Bg.rc index 3f64a49..22fe6b5 100644 --- a/dlls/shell32/shell32_Bg.rc +++ b/dlls/shell32/shell32_Bg.rc @@ -190,9 +190,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "My Documents\\My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index b14a3c4..39b2467 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -190,9 +190,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Anwendungsdaten" IDS_PRINTHOOD "Druckumgebung" IDS_LOCAL_APPDATA "Lokale Einstellungen\\Anwendungsdaten" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Lokale Einstellungen\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Verlauf" + IDS_HISTORY "Lokale Einstellungen\\Verlauf" IDS_PROGRAM_FILES "Programme" IDS_MYPICTURES "Eigene Dateien\\Eigene Bilder" IDS_PROGRAM_FILES_COMMON "Programme\\Gemeinsame Dateien" diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 3bcf385..785e8fd 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -189,9 +189,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "My Documents\\My Pictures" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc index 2780263..a6f0c81 100644 --- a/dlls/shell32/shell32_Es.rc +++ b/dlls/shell32/shell32_Es.rc @@ -207,9 +207,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Configuraci�n local\\Datos de programa" - IDS_INTERNET_CACHE "Archivos temporales de Internet" + IDS_INTERNET_CACHE "Configuraci�n local\\Archivos temporales de Internet" IDS_COOKIES "Cookies" - IDS_HISTORY "Historial" + IDS_HISTORY "Configuraci�n local\\Historial" IDS_PROGRAM_FILES "Archivos de programa" IDS_MYPICTURES "Mis documentos\\Mis im�genes" IDS_PROGRAM_FILES_COMMON "Archivos de programa\\Archivos comunes" diff --git a/dlls/shell32/shell32_Fi.rc b/dlls/shell32/shell32_Fi.rc index 4247227..26987f2 100644 --- a/dlls/shell32/shell32_Fi.rc +++ b/dlls/shell32/shell32_Fi.rc @@ -189,9 +189,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Ohjelmien Tiedot" IDS_PRINTHOOD "Tulostinymp�rist�" IDS_LOCAL_APPDATA "Paikalliset Asetukset\\Ohjelmien Tiedot" - IDS_INTERNET_CACHE "V�liaikaiset Internet-tiedostot" + IDS_INTERNET_CACHE "Paikalliset Asetukset\\V�liaikaiset Internet-tiedostot" IDS_COOKIES "Ev�steet" - IDS_HISTORY "Historia" + IDS_HISTORY "Paikalliset Asetukset\\Historia" IDS_PROGRAM_FILES "Ohjelmat" IDS_MYPICTURES "Omat tiedostot\\Omat kuvatiedostot" IDS_PROGRAM_FILES_COMMON "Ohjelmat\\Yhteiset Tiedostot" diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 182ccc1..fa5b4fc 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -209,9 +209,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Application Data" IDS_PRINTHOOD "Voisinage d'impression" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Historique" + IDS_HISTORY "Local Settings\\Historique" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mes documents\\Mes images" IDS_PROGRAM_FILES_COMMON "Program Files\\Fichiers communs" diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index e22a1ca..c565dfe 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -189,9 +189,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "History" + IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mine dokumenter\\Mine bilder" IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" diff --git a/dlls/shell32/shell32_Pt.rc b/dlls/shell32/shell32_Pt.rc index a3ad204..0f022cd 100644 --- a/dlls/shell32/shell32_Pt.rc +++ b/dlls/shell32/shell32_Pt.rc @@ -190,9 +190,9 @@ STRINGTABLE DISCARDABLE IDS_APPDATA "Application Data" IDS_PRINTHOOD "PrintHood" IDS_LOCAL_APPDATA "Configura��es locais\\Dados de aplicativos" - IDS_INTERNET_CACHE "Temporary Internet Files" + IDS_INTERNET_CACHE "Configura��es locais\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Hist�rico" + IDS_HISTORY "Configura��es locais\\Hist�rico" IDS_PROGRAM_FILES "Arquivos de programas" IDS_MYPICTURES "Meus Documentos\\Minhas Imagens" IDS_PROGRAM_FILES_COMMON "Arquivos de programas\\Arquivos comuns" diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e706dd9..215e5ed 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1929,6 +1929,8 @@ static HRESULT _SHRegisterUserShellFolde CSIDL_NETHOOD, CSIDL_TEMPLATES, CSIDL_PRINTHOOD, + CSIDL_LOCAL_APPDATA, + CSIDL_INTERNET_CACHE, CSIDL_COOKIES, CSIDL_HISTORY, CSIDL_MYPICTURES

1 0

Vitaliy Margolen : shell32: Update Russian resources.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 5e3df98294f3961707a7d8acfee3dcc5a94ccc0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e3df98294f3961707a7d8a… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Jan 4 14:48:28 2006 +0100 shell32: Update Russian resources. --- dlls/shell32/shell32_Ru.rc | 159 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 159 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 7ac39be..bad07d5 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2006 Vitaliy Margolen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,92 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN + MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON + MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&��", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&��", FCIDM_SHVIEW_REPORTVIEW +END + +/* + shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + POPUP "&��" + BEGIN + MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON + MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&��", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&��", FCIDM_SHVIEW_REPORTVIEW + END + MENUITEM SEPARATOR + POPUP "Arrange &Icons" + BEGIN + MENUITEM "�� &��", 0x30 /* column 0 */ + MENUITEM "�� &��", 0x32 /* column 2 */ + MENUITEM "�� &��", 0x31 /* ... */ + MENUITEM "�� &��", 0x33 + MENUITEM SEPARATOR + MENUITEM "&��", FCIDM_SHVIEW_AUTOARRANGE + END + MENUITEM "�&�� ", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM SEPARATOR + MENUITEM "�&��", FCIDM_SHVIEW_REFRESH + MENUITEM SEPARATOR + MENUITEM "&��", FCIDM_SHVIEW_INSERT + MENUITEM "�� &��", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + POPUP "��" + BEGIN + MENUITEM "&��", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "&��", FCIDM_SHVIEW_NEWLINK + MENUITEM SEPARATOR + END + MENUITEM SEPARATOR + MENUITEM "��&��", FCIDM_SHVIEW_PROPERTIES + END +END + +/* + shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&��", FCIDM_SHVIEW_EXPLORE + MENUITEM "&��", FCIDM_SHVIEW_OPEN + MENUITEM SEPARATOR + MENUITEM "&��", FCIDM_SHVIEW_CUT + MENUITEM "&��", FCIDM_SHVIEW_COPY + MENUITEM SEPARATOR + MENUITEM "�� &��", FCIDM_SHVIEW_CREATELINK + MENUITEM "&��", FCIDM_SHVIEW_DELETE + MENUITEM "��&��", FCIDM_SHVIEW_RENAME + MENUITEM SEPARATOR + MENUITEM "��&��", FCIDM_SHVIEW_PROPERTIES + END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "��" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "��", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + LTEXT "", IDD_TITLE, 4, 4, 180, 12 + LTEXT "", IDD_STATUS, 4, 25, 180, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "� %s" @@ -44,3 +131,75 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "��&��...", 12288, 170, 63, 50, 14, WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + /* columns in the shellview */ + IDS_SHV_COLUMN1 "��" + IDS_SHV_COLUMN2 "��" + IDS_SHV_COLUMN3 "��" + IDS_SHV_COLUMN4 "��" + IDS_SHV_COLUMN5 "��" + IDS_SHV_COLUMN6 "�� " + IDS_SHV_COLUMN7 "��" + IDS_SHV_COLUMN8 "��" + IDS_SHV_COLUMN9 "��" + IDS_SHV_COLUMN10 "��" + IDS_SHV_COLUMN11 "��" + + /* special folders */ + IDS_DESKTOP "�� " + IDS_MYCOMPUTER "�� " + + /* context menus */ + IDS_VIEW_LARGE "&�� " + IDS_VIEW_SMALL "&�� " + IDS_VIEW_LIST "&��" + IDS_VIEW_DETAILS "&��" + IDS_SELECT "&��" + IDS_OPEN "&��" + + IDS_CREATEFOLDER_DENIED "�� - �� ." + IDS_CREATEFOLDER_CAPTION "�� " + IDS_DELETEITEM_CAPTION "�� " + IDS_DELETEFOLDER_CAPTION "�� " + IDS_DELETEITEM_TEXT "�� '%1'?" + IDS_DELETEMULTIPLE_TEXT "�� (%1?" + IDS_OVERWRITEFILE_TEXT "�� (�) %1?" + IDS_OVERWRITEFILE_CAPTION "�� " + + /* message box strings */ + IDS_RESTART_TITLE "��" + IDS_RESTART_PROMPT "�� Windows?" + IDS_SHUTDOWN_TITLE "�� " + IDS_SHUTDOWN_PROMPT "�� Wine?" + + /* shell folder path default values */ + IDS_PROGRAMS "�� \\��" + IDS_PERSONAL "�� " + IDS_FAVORITES "��" + IDS_STARTUP "�� \\��\\��" + IDS_RECENT "Recent" + IDS_SENDTO "��" + IDS_STARTMENU "�� " + IDS_MYMUSIC "�� \\�� " + IDS_MYVIDEO "�� \\�� " + IDS_DESKTOPDIRECTORY "�� " + IDS_NETHOOD "NetHood" + IDS_TEMPLATES "��" + IDS_APPDATA "Application Data" + IDS_PRINTHOOD "PrintHood" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\History" + IDS_PROGRAM_FILES "Program Files" + IDS_MYPICTURES "�� \\�� " + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_COMMON_DOCUMENTS "�� " + IDS_ADMINTOOLS "�� \\��\\Administrative Tools" + IDS_COMMON_MUSIC "�� \\�� " + IDS_COMMON_PICTURES "�� \\�� " + IDS_COMMON_VIDEO "�� \\�� " + IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" +}

1 0

Rein Klazes : user32: Menu tracing improvements.
by Alexandre Julliard Jan. 4, 2006

Jan. 4, 2006

Module: wine Branch: refs/heads/master Commit: 1d4b52c25414c4cd9c5454b4eca7a2862ca9431c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d4b52c25414c4cd9c5454b… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Wed Jan 4 14:48:07 2006 +0100 user32: Menu tracing improvements. --- dlls/user/menu.c | 149 ++++++++++++++++++++++++------------------------------ 1 files changed, 65 insertions(+), 84 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index a6e5742..0152ede 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -210,74 +210,64 @@ const struct builtin_class_descr MENU_bu static void do_debug_print_menuitem(const char *prefix, MENUITEM * mp, const char *postfix) { + static const char * const hbmmenus[] = { "HBMMENU_CALLBACK", "", "HBMMENU_SYSTEM", + "HBMMENU_MBAR_RESTORE", "HBMMENU_MBAR_MINIMIZE", "HBMMENU_MBAR_CLOSE", + "HBMMENU_MBAR_CLOSE_D", "HBMMENU_MBAR_MINIMIZE_D", "HBMMENU_POPUP_CLOSE", + "HBMMENU_POPUP_RESTORE", "HBMMENU_POPUP_MAXIMIZE", "HBMMENU_POPUP_MINIMIZE"}; TRACE("%s ", prefix); if (mp) { - UINT flags = mp->fType; - int type = MENU_ITEM_TYPE(flags); - TRACE( "{ ID=0x%x", mp->wID); - if (flags & MF_POPUP) - TRACE( ", Sub=%p", mp->hSubMenu); - if (flags) { - int count = 0; - TRACE( ", Type="); - if (type == MFT_STRING) - /* Nothing */ ; - else if (type == MFT_SEPARATOR) - MENUOUT("sep"); - else if (type == MFT_OWNERDRAW) - MENUOUT("own"); - else if (type == MFT_BITMAP) - MENUOUT("bit"); - else - MENUOUT("???"); - flags -= type; - - MENUFLAG(MF_POPUP, "pop"); - MENUFLAG(MFT_MENUBARBREAK, "barbrk"); - MENUFLAG(MFT_MENUBREAK, "brk"); - MENUFLAG(MFT_RADIOCHECK, "radio"); - MENUFLAG(MFT_RIGHTORDER, "rorder"); - MENUFLAG(MF_SYSMENU, "sys"); - MENUFLAG(MFT_RIGHTJUSTIFY, "right"); /* same as MF_HELP */ - - if (flags) - TRACE( "+0x%x", flags); - } - flags = mp->fState; - if (flags) { - int count = 0; - TRACE( ", State="); - MENUFLAG(MFS_GRAYED, "grey"); - MENUFLAG(MFS_DEFAULT, "default"); - MENUFLAG(MFS_DISABLED, "dis"); - MENUFLAG(MFS_CHECKED, "check"); - MENUFLAG(MFS_HILITE, "hi"); - MENUFLAG(MF_USECHECKBITMAPS, "usebit"); - MENUFLAG(MF_MOUSESELECT, "mouse"); - if (flags) - TRACE( "+0x%x", flags); - } - if (mp->hCheckBit) - TRACE( ", Chk=%p", mp->hCheckBit); - if (mp->hUnCheckBit) - TRACE( ", Unc=%p", mp->hUnCheckBit); - - if (type == MFT_STRING) { - if (mp->text) - TRACE( ", Text=%s", debugstr_w(mp->text)); - else - TRACE( ", Text=Null"); - } else if (mp->text == NULL) - /* Nothing */ ; - else - TRACE( ", Text=%p", mp->text); - if (mp->dwItemData) - TRACE( ", ItemData=0x%08lx", mp->dwItemData); - TRACE( " }"); - } else { - TRACE( "NULL"); - } - + UINT flags = mp->fType; + TRACE( "{ ID=0x%x", mp->wID); + if ( mp->hSubMenu) + TRACE( ", Sub=%p", mp->hSubMenu); + if (flags) { + int count = 0; + TRACE( ", fType="); + MENUFLAG( MFT_SEPARATOR, "sep"); + MENUFLAG( MFT_OWNERDRAW, "own"); + MENUFLAG( MFT_BITMAP, "bit"); + MENUFLAG(MF_POPUP, "pop"); + MENUFLAG(MFT_MENUBARBREAK, "barbrk"); + MENUFLAG(MFT_MENUBREAK, "brk"); + MENUFLAG(MFT_RADIOCHECK, "radio"); + MENUFLAG(MFT_RIGHTORDER, "rorder"); + MENUFLAG(MF_SYSMENU, "sys"); + MENUFLAG(MFT_RIGHTJUSTIFY, "right"); /* same as MF_HELP */ + if (flags) + TRACE( "+0x%x", flags); + } + flags = mp->fState; + if (flags) { + int count = 0; + TRACE( ", State="); + MENUFLAG(MFS_GRAYED, "grey"); + MENUFLAG(MFS_DEFAULT, "default"); + MENUFLAG(MFS_DISABLED, "dis"); + MENUFLAG(MFS_CHECKED, "check"); + MENUFLAG(MFS_HILITE, "hi"); + MENUFLAG(MF_USECHECKBITMAPS, "usebit"); + MENUFLAG(MF_MOUSESELECT, "mouse"); + if (flags) + TRACE( "+0x%x", flags); + } + if (mp->hCheckBit) + TRACE( ", Chk=%p", mp->hCheckBit); + if (mp->hUnCheckBit) + TRACE( ", Unc=%p", mp->hUnCheckBit); + if (mp->text) + TRACE( ", Text=%s", debugstr_w(mp->text)); + if (mp->dwItemData) + TRACE( ", ItemData=0x%08lx", mp->dwItemData); + if (mp->hbmpItem) + { + if( IS_MAGIC_BITMAP(mp->hbmpItem)) + TRACE( ", hbitmap=%s", hbmmenus[ (INT_PTR)mp->hbmpItem + 1]); + else + TRACE( ", hbitmap=%p", mp->hbmpItem); + } + TRACE( " }"); + } else + TRACE( "NULL"); TRACE(" %s\n", postfix); } @@ -965,7 +955,7 @@ static void MENU_CalcItemSize( HDC hdc, - arrow_bitmap_width; } } - TRACE("(%ld,%ld)-(%ld,%ld)\n", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom); + TRACE("%s\n", wine_dbgstr_rect( &lpitem->rect)); } @@ -1059,8 +1049,7 @@ static void MENU_MenuBarCalcSize( HDC hd if ((lprect == NULL) || (lppop == NULL)) return; if (lppop->nItems == 0) return; - TRACE("left=%ld top=%ld right=%ld bottom=%ld\n", - lprect->left, lprect->top, lprect->right, lprect->bottom); + TRACE("lprect %p %s\n", lprect, wine_dbgstr_rect( lprect)); lppop->Width = lprect->right - lprect->left; lppop->Height = 0; maxY = lprect->top+1; @@ -1081,8 +1070,7 @@ static void MENU_MenuBarCalcSize( HDC hd if ((i != start) && (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break; - TRACE("calling MENU_CalcItemSize org=(%d, %d)\n", - orgX, orgY ); + TRACE("calling MENU_CalcItemSize org=(%d, %d)\n", orgX, orgY ); debug_print_menuitem (" item: ", lpitem, ""); MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, TRUE, lppop ); @@ -1192,16 +1180,14 @@ static void MENU_DrawMenuItem( HWND hwnd dis.hDC = hdc; dis.rcItem = lpitem->rect; TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " - "hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", hwndOwner, + "hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, - dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right, - dis.rcItem.bottom); + dis.hDC, wine_dbgstr_rect( &dis.rcItem)); SendMessageW( hwndOwner, WM_DRAWITEM, 0, (LPARAM)&dis ); /* Fall through to draw popup-menu arrow */ } - TRACE("rect={%ld,%ld,%ld,%ld}\n", lpitem->rect.left, lpitem->rect.top, - lpitem->rect.right,lpitem->rect.bottom); + TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect)); if (menuBar && (lpitem->fType & MF_SEPARATOR)) return; @@ -2656,9 +2642,8 @@ static BOOL MENU_TrackMenu( HMENU hmenu, mt.pt.x = x; mt.pt.y = y; - TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p (%ld,%ld)-(%ld,%ld)\n", - hmenu, wFlags, x, y, hwnd, (lprect) ? lprect->left : 0, (lprect) ? lprect->top : 0, - (lprect) ? lprect->right : 0, (lprect) ? lprect->bottom : 0); + TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p %s\n", + hmenu, wFlags, x, y, hwnd, wine_dbgstr_rect( lprect)); fEndMenu = FALSE; if (!(menu = MENU_GetMenu( hmenu ))) @@ -2989,7 +2974,7 @@ void MENU_TrackMouseMenuBar( HWND hWnd, HMENU hMenu = (ht == HTSYSMENU) ? get_win_sys_menu( hWnd ) : GetMenu( hWnd ); UINT wFlags = TPM_ENTERIDLEEX | TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON; - TRACE("wnd=%p ht=0x%04x (%ld,%ld)\n", hWnd, ht, pt.x, pt.y); + TRACE("wnd=%p ht=0x%04x %s\n", hWnd, ht, wine_dbgstr_point( &pt)); if (IsMenu(hMenu)) { @@ -3543,13 +3528,9 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UI MENUITEM *item; if (IS_STRING_ITEM(flags)) - { TRACE("%p %d %04x %04x %s\n", hMenu, pos, flags, id, debugstr_w(str) ); - } else - { TRACE("%p %d %04x %04x %p\n", hMenu, pos, flags, id, str ); - } if (!(item = MENU_FindItem( &hMenu, &pos, flags ))) return FALSE; MENU_GetMenu(hMenu)->Height = 0; /* force size recalculate */

1 0

lostwages/wwn wn20051211_301.xml wn20051223_30 ...
by Jeremy Newman Jan. 3, 2006

Jan. 3, 2006

ChangeSet ID: 22074 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/03 16:02:04 Modified files: wwn : wn20051211_301.xml wn20051223_302.xml Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. Patch: http://cvs.winehq.org/patch.py?id=22074 Old revision New revision Changes Path 1.3 1.4 +7 -7 lostwages/wwn/wn20051211_301.xml 1.2 1.3 +13 -13 lostwages/wwn/wn20051223_302.xml Index: lostwages/wwn/wn20051211_301.xml diff -u -p lostwages/wwn/wn20051211_301.xml:1.3 lostwages/wwn/wn20051211_301.xml:1.4 --- lostwages/wwn/wn20051211_301.xml:1.3 3 Jan 2006 22: 2: 4 -0000 +++ lostwages/wwn/wn20051211_301.xml 3 Jan 2006 22: 2: 4 -0000 @@ -137,7 +137,7 @@ handle 8bit paletted which is used by ga support this by default. The second patch which I attached as well adds support for this. On cards (at least all nvidia cards from geforce 1 to the fx) that support the opengl paletted texture extension this extension is -used. It makes StarCraft very fast atleast on my Athlon XP2000 system with a +used. It makes StarCraft very fast at least on my Athlon XP2000 system with a GeforceFX where the game was slow before. As not all cards support paletted textures I emulated this using a simple fragment shader. (a 1D texture containing the palette is used as a lookup table) @@ -185,7 +185,7 @@ using Mesa, I could try that soon using slower than the current code as Mesa uses Xlib too in the indirect case. In general about all cards these days have some form of opengl support (intel, via, ati, nvidia, ..) perhaps only the latest S3 GPUs and perhaps some SIS -ones (thought some have drivers) lack support. Note that cards don't need +ones (though some have drivers) lack support. Note that cards don't need much functionality at all as OpenGL is only for the uploading of textures and the rendering of them. @@ -201,7 +201,7 @@ directly access the framebuffer of the v render 2D images on the screen. Games like StarCraft, Total Annihilation, C&C and lots of others use DirectDraw in this way. Second there's another class of games like Age Of Empires2, Heroes of Might and Magic IV and others -which mix ddraw with GDI. They for instance render a image using ddraw and +which mix ddraw with GDI. They for instance render an image using ddraw and then use GetDC/ReleaseDC to get a device context so that they can draw in the surface. (directly into the video memory) @@ -273,7 +273,7 @@ WineD3D in any case. Then WineD3D could or OpenGL for 2D rendering. :) Maybe we should have a close look at the details of such a thing. I do not -really recommend a ad-hoc attempt, as d3d7->WineD3D was nearly too much. +really recommend an ad-hoc attempt, as d3d7->WineD3D was nearly too much. </quote> Lionel liked the idea: @@ -312,7 +312,7 @@ So what's the point of this mail? While by wrapping D3D7 only and leave DirectDraw in ddraw.dll, it has a few ugly drawbacks: <ul> -<li> Device initialization: In D3D7, the first step is to create a IDirectDraw +<li> Device initialization: In D3D7, the first step is to create an IDirectDraw Device, set up the device, create a surface and then create a Direct3D Device. When creating the WineD3DDevice in the last step, I have to do some ugly things to wrap the already existing Surface to a newly created @@ -525,7 +525,7 @@ don't always provide *.so symlinks for 3 The script creates all missing links in one directory (/usr/local/lib is the default). Not only was libcups found next time, but also the old workaround with imake has become unneeded. The configure script runs -out-of-box and finds X11 libraries. +out-of-the-box and finds X11 libraries. I'm posting the script here in hope that it will be useful for some Wine users. I'm not sure it it merits inclusion in Wine, but I would not @@ -538,7 +538,7 @@ Pavel replied with more details: <quote who="Pavel Roskin"> They are provided for some basic libraries, such as zlib and ncurses. -Other libraries, such as cups, as missing, but my script can remedy it, +Other libraries, such as cups, are missing, but my script can remedy it, because the only missing file is the symlink to *.so for the linker. Unfortunately, openssl support cannot be fixed by the script Index: lostwages/wwn/wn20051223_302.xml diff -u -p lostwages/wwn/wn20051223_302.xml:1.2 lostwages/wwn/wn20051223_302.xml:1.3 --- lostwages/wwn/wn20051223_302.xml:1.2 3 Jan 2006 22: 2: 5 -0000 +++ lostwages/wwn/wn20051223_302.xml 3 Jan 2006 22: 2: 5 -0000 @@ -154,11 +154,11 @@ to be following. Tony wrote: <Rant> Well that is a real sore spot with me. You know that I am a strong supporter of wine but it really concerns me that we have gone beta and -not addressed preventing regessions from getting into our releases in +not addressed preventing regressions from getting into our releases in any way. We currently have no freeze or notification of exactly when the next release is going to go out. Sure we had the one big code freeze just before 0.9 but then we went back to releasing without any -notification. At his point even if our application maintainers test +notification. At this point even if our application maintainers test their app every day there is no way for them to prevent that regression going into the next release. @@ -192,17 +192,17 @@ progressing: <quote who="Tony Lambregts"> Perhaps it's partly a matter of perception then. -If I understand you 0.9 was a major release then, and 0.9.1 and +If I understand you, 0.9 was a major release then, and 0.9.1 and company are minor releases, with the next major release being 1.0. So I anticipate that we will have a major freeze before 1.0 just like we had before 0.9? -Since I'm pretty sure we do not have the resources to do nightly's +Since I'm pretty sure we do not have the resources to do nightlies like they did for Mozilla, then once certainly every two weeks is better than once a month. If we could count on a release every two weeks that would be ideal. -That way people like me who use CVS ( or GIT) could help prevent +That way people like me who use CVS (or GIT) could help prevent regressions even getting into the minor releases, which in turn would encourage more people to use the minor releases. I would prefer to see that releases were done on a Tuesday, myself, since I have more free @@ -268,7 +268,7 @@ and report problems. > <topic>Project Management</topic> We mentioned a few weeks ago (WWN -<a href="http://www.winehq.com/?issue=299#Desktop%20Summit">#299</a>) there +<a href="http://www.winehq.com/?issue=299#Desktop%20Summit">#299</a>) that there was a desktop summit being sponsored by OSDL. Well, Jeremy White and Dan Kegel both attended the event and Jeremy wrote the following over on OSDL's <a href="http://lists.osdl.org/pipermail/desktop_architects/2005-December/000354.html">desktop_architects</a> @@ -343,7 +343,7 @@ need the cash; Microsoft doesn't. That's it; didn't have that much to say; but now I feel better <grin> -And the honest truth is that I didn't really need to +And the honest truth is that I didn't really need to be present in Portland; we didn't have any major gaps that group could have addressed. While Wine certainly depends on a range of other projects, we've actually found folks @@ -402,14 +402,14 @@ team, notably Eric Frias and Juraj Herce <a href="http://news.inq7.net/infotech/index.php?index=1&story_id=60585">Apparently</a> SpecOpsLabs has released a product based on their Project David stuff. What is that? Well, we don't really know. The last time it came up it was -determined they had simply stolen CodeWeaver's CrossOver product. They +determined they had simply stolen CodeWeavers CrossOver product. They haven't bothered to engage in any dialog with the community, so it's unknown what their intentions are. Tom Wickline pointed out the link above and Willie Sippel followed up by -mentioning it was a part of TurboLinux FUJI. Tom ask if anyone knew where +mentioning it was a part of TurboLinux FUJI. Tom asked if anyone knew where the source code to the Wine changes were and Jeremy White reminded him: <quote who="Jeremy White"> -In fact, the only person that can demand anything with regart to the LGPL is +In fact, the only person that can demand anything with regard to the LGPL is someone that is running their software. So if someone has bought a copy of TurboLinux 11 in Japan, they have the right to demand a copy of the source code to the Wine bits in Project David; presumably @@ -444,7 +444,7 @@ their product: <li> That was followed shortly thereafter by Mike McCormack discovering a CrossOver only hack was visible in a screenshot. So they basically ripped off CodeWeavers. SpecOpsLabs never had an explanation for why -a CrossOver specific bug some how made it into their tree. In fact, +a CrossOver specific bug somehow made it into their tree. In fact, they specifically denied using CXO: <ul><li><a href="http://www.osviews.com/modules.php?op=modload&name=News&file=articl…">OSViews</a></li> </ul> @@ -540,10 +540,10 @@ is the right one, but it works quite nic posts="4" > <topic>Debugging</topic> -With Wine you can easily generate debugging logs that trace the API's +With Wine you can easily generate debugging logs that trace the APIs called by a program. Corey McClymonds asked if there was a way to do that on Windows, apparently to be able to compare the code paths used -by Windows DLL's and Wine's: +by Windows' DLLs and Wine's: <quote who="Corey McClymonds"> There is a game, known as Continuum, that has a very complicated setup before it actually starts the game, to prevent cheating. Due to this, the

1 0

lostwages/wwn wn20051211_301.xml
by Jeremy Newman Jan. 3, 2006

Jan. 3, 2006

ChangeSet ID: 22073 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/03 16:01:16 Modified files: wwn : wn20051211_301.xml Log message: Francois Gouget <fgouget(a)free.fr> Fix broken XML in WWN 301 Patch: http://cvs.winehq.org/patch.py?id=22073 Old revision New revision Changes Path 1.2 1.3 +1 -1 lostwages/wwn/wn20051211_301.xml Index: lostwages/wwn/wn20051211_301.xml diff -u -p lostwages/wwn/wn20051211_301.xml:1.2 lostwages/wwn/wn20051211_301.xml:1.3 --- lostwages/wwn/wn20051211_301.xml:1.2 3 Jan 2006 22: 1:16 -0000 +++ lostwages/wwn/wn20051211_301.xml 3 Jan 2006 22: 1:16 -0000 @@ -484,7 +484,7 @@ the troublesome patch:<ul> <section title="Feedback on aRTs, ESounD, and JACK Drivers" subject="feedback wanted from arts, esound and jack sound driver users." - archive="http://www.winehq.com/pipermail/wine-devel/2005-December/043219.html"> + archive="http://www.winehq.com/pipermail/wine-devel/2005-December/043219.html" posts="1" > <topic>Multimedia</topic>

1 0

lostwages/templates/en acknowledgement.templat ...
by Jeremy Newman Jan. 3, 2006

Jan. 3, 2006

ChangeSet ID: 22072 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/03 15:58:34 Modified files: templates/en : acknowledgement.template download.template myths.template press.template Log message: Tom Wickline <twickline(a)gmail.com> site updates Patch: http://cvs.winehq.org/patch.py?id=22072 Old revision New revision Changes Path 1.5 1.6 +66 -66 lostwages/templates/en/acknowledgement.template 1.70 1.71 +2 -2 lostwages/templates/en/download.template 1.11 1.12 +3 -10 lostwages/templates/en/myths.template 1.33 1.34 +29 -4 lostwages/templates/en/press.template

1 0

lostwages/templates/en developer-cheatsheet.te ...
by Jeremy Newman Jan. 3, 2006

Jan. 3, 2006

ChangeSet ID: 22071 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/03 15:57:14 Modified files: templates/en : developer-cheatsheet.template Log message: Neil Skrypuch <ns03ja(a)brocku.ca> Fix config file reference Patch: http://cvs.winehq.org/patch.py?id=22071 Old revision New revision Changes Path 1.5 1.6 +4 -3 lostwages/templates/en/developer-cheatsheet.template Index: lostwages/templates/en/developer-cheatsheet.template diff -u -p lostwages/templates/en/developer-cheatsheet.template:1.5 lostwages/templates/en/developer-cheatsheet.template:1.6 --- lostwages/templates/en/developer-cheatsheet.template:1.5 3 Jan 2006 21:57:14 -0000 +++ lostwages/templates/en/developer-cheatsheet.template 3 Jan 2006 21:57:14 -0000 @@ -71,9 +71,10 @@ aren't sure what's going wrong. It shows you each call into and out of Wine modules at the DLL boundaries. This includes calls between Wine DLLs: for instance, from GDI32 to - KERNEL32. Investigate the RelayInclude and RelayExclude keys - in the [Debug] section if you're being overwhelmed by certain - functions. A good initial value for RelayExclude is: + KERNEL32. Investigate the RelayInclude and RelayExclude string + values in [HKCU\Software\Wine\Debug] if you're being + overwhelmed by certain functions. A good initial value for + RelayExclude is: <code> RtlEnterCriticalSection;RtlLeaveCriticalSection;_EnterSysLevel;_LeaveSysLevel; _CheckNotSysLevel;RtlAllocateHeap;RtlFreeHeap;LOCAL_Lock;LOCAL_Unlock

1 0

Marcus Meissner : msi: Report the commandline that failed to start in ERR()s.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 73b7900b8babb0386b7c8e0184b0a4a2ffc04a37 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73b7900b8babb0386b7c8e0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jan 3 17:35:41 2006 +0100 msi: Report the commandline that failed to start in ERR()s. --- dlls/msi/custom.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1c66953..2ed4b81 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -548,13 +548,14 @@ static UINT HANDLE_CustomType2(MSIPACKAG rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(cmd); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(cmd)); + msi_free(cmd); return ERROR_SUCCESS; } + msi_free(cmd); prc = process_handle(package, type, info.hThread, info.hProcess, action, &finished); @@ -609,13 +610,14 @@ static UINT HANDLE_CustomType18(MSIPACKA rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(cmd); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(cmd)); + msi_free(cmd); return ERROR_SUCCESS; } + msi_free(cmd); prc = process_handle(package, type, info.hThread, info.hProcess, action, NULL); @@ -694,13 +696,14 @@ static UINT HANDLE_CustomType50(MSIPACKA rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(cmd); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(cmd)); + msi_free(cmd); return ERROR_SUCCESS; } + msi_free(cmd); return process_handle(package, type, info.hThread, info.hProcess, action, NULL); } @@ -733,13 +736,14 @@ static UINT HANDLE_CustomType34(MSIPACKA rc = CreateProcessW(NULL, deformated, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); - msi_free(deformated); if ( !rc ) { - ERR("Unable to execute command\n"); + ERR("Unable to execute command %s\n", debugstr_w(deformated)); + msi_free(deformated); return ERROR_SUCCESS; } + msi_free(deformated); prc = process_handle(package, type, info.hThread, info.hProcess, action, NULL);

1 0

Alexandre Julliard : ntdll: Check file size when mapping image sections to avoid SIGBUS errors.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 67f29999a36ce3725a52b79ed618964244cc96ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67f29999a36ce3725a52b79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 3 17:39:23 2006 +0100 ntdll: Check file size when mapping image sections to avoid SIGBUS errors. --- dlls/ntdll/virtual.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 922c1b3..912f5c4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -35,6 +35,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif @@ -835,6 +836,7 @@ static NTSTATUS map_image( HANDLE hmappi NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; off_t pos; + struct stat st; struct file_view *view = NULL; char *ptr; @@ -857,7 +859,13 @@ static NTSTATUS map_image( HANDLE hmappi /* map the header */ + if (fstat( fd, &st ) == -1) + { + status = FILE_GetNtStatus(); + goto error; + } status = STATUS_INVALID_IMAGE_FORMAT; /* generic error */ + if (header_size > st.st_size) goto error; if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ, removable ) != STATUS_SUCCESS) goto error; dos = (IMAGE_DOS_HEADER *)ptr; @@ -996,7 +1004,9 @@ static NTSTATUS map_image( HANDLE hmappi /* Note: if the section is not aligned properly map_file_into_view will magically * fall back to read(), so we don't need to check anything here. */ - if (map_file_into_view( view, fd, sec->VirtualAddress, file_size, sec->PointerToRawData, + end = sec->PointerToRawData + file_size; + if (sec->PointerToRawData >= st.st_size || end > st.st_size || end < sec->PointerToRawData || + map_file_into_view( view, fd, sec->VirtualAddress, file_size, sec->PointerToRawData, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, removable ) != STATUS_SUCCESS) {

1 0

Eric Pouech : kernel32: Implemented atoms query function on top of ntdll ones.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 70342dbc615b02496fba19e08e8d6b6048039ddd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70342dbc615b02496fba19e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Jan 3 17:35:01 2006 +0100 kernel32: Implemented atoms query function on top of ntdll ones. --- dlls/kernel/atom.c | 177 +++++++++++++++++++++------------------------- dlls/kernel/tests/atom.c | 23 ++---- 2 files changed, 87 insertions(+), 113 deletions(-)

1 0