November 2005 - Wine-Commits

wine/dlls/shell32 tests/shlexec.c shlexec.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21081 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:33:57 Modified files: dlls/shell32/tests: shlexec.c dlls/shell32 : shlexec.c Log message: Mike McCormack <mike(a)codeweavers.com> Invoke shortcuts through IContextMenu, rather than trying to access them directly. Patch: http://cvs.winehq.org/patch.py?id=21081 Old revision New revision Changes Path 1.7 1.8 +2 -2 wine/dlls/shell32/tests/shlexec.c 1.74 1.75 +262 -138 wine/dlls/shell32/shlexec.c

1 0

wine/tools wine.inf
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21080 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:33:43 Modified files: tools : wine.inf Log message: Mike McCormack <mike(a)codeweavers.com> Add the ContextMenuHandlers key for shortcuts so the new context menu code can work. Patch: http://cvs.winehq.org/patch.py?id=21080 Old revision New revision Changes Path 1.45 1.46 +1 -0 wine/tools/wine.inf Index: wine/tools/wine.inf diff -u -p wine/tools/wine.inf:1.45 wine/tools/wine.inf:1.46 --- wine/tools/wine.inf:1.45 3 Nov 2005 11:33:43 -0000 +++ wine/tools/wine.inf 3 Nov 2005 11:33:43 -0000 @@ -78,6 +78,7 @@ HKCR,lnkfile,"NeverShowExt",,"" HKCR,lnkfile,"IsShortcut",,"yes" HKCR,lnkfile\CLSID,,,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\IconHandler,,,"{00021401-0000-0000-C000-000000000046}" +HKCR,lnkfile\shellex\ContextMenuHandlers\\{00021401-0000-0000-C000-000000000046},,, HKCR,Msi.Package\DefaultIcon,,,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,,"msiexec /i %1" HKCR,Msi.Package\shell\Repair\command,,,"msiexec /f %1"

1 0

wine/dlls/riched20 paint.c editstr.h editor.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21079 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:33:24 Modified files: dlls/riched20 : paint.c editstr.h editor.c Log message: Phil Krylov <phil(a)newstar.rinet.ru> Cache background color brush instead of recreating it at each screen update. Patch: http://cvs.winehq.org/patch.py?id=21079 Old revision New revision Changes Path 1.15 1.16 +1 -4 wine/dlls/riched20/paint.c 1.16 1.17 +1 -0 wine/dlls/riched20/editstr.h 1.66 1.67 +12 -5 wine/dlls/riched20/editor.c Index: wine/dlls/riched20/paint.c diff -u -p wine/dlls/riched20/paint.c:1.15 wine/dlls/riched20/paint.c:1.16 --- wine/dlls/riched20/paint.c:1.15 3 Nov 2005 11:33:24 -0000 +++ wine/dlls/riched20/paint.c 3 Nov 2005 11:33:24 -0000 @@ -78,14 +78,11 @@ void ME_PaintContent(ME_TextEditor *edit } if (ye>ys) { - HBRUSH hbr; - hbr = CreateSolidBrush(ME_GetBackColor(c.editor)); rc.left = xs; rc.top = ys; rc.right = xe; rc.bottom = ye; - FillRect(hDC, &rc, hbr); - DeleteObject(hbr); + FillRect(hDC, &rc, c.editor->hbrBackground); } if (ys == c.pt.y) /* don't overwrite the top bar */ ys++; Index: wine/dlls/riched20/editstr.h diff -u -p wine/dlls/riched20/editstr.h:1.16 wine/dlls/riched20/editstr.h:1.17 --- wine/dlls/riched20/editstr.h:1.16 3 Nov 2005 11:33:24 -0000 +++ wine/dlls/riched20/editstr.h 3 Nov 2005 11:33:24 -0000 @@ -270,6 +270,7 @@ typedef struct tagME_TextEditor int nSequence; int nOldSelFrom, nOldSelTo; COLORREF rgbBackColor; + HBRUSH hbrBackground; BOOL bCaretAtEnd; int nEventMask; int nModifyStep; Index: wine/dlls/riched20/editor.c diff -u -p wine/dlls/riched20/editor.c:1.66 wine/dlls/riched20/editor.c:1.67 --- wine/dlls/riched20/editor.c:1.66 3 Nov 2005 11:33:24 -0000 +++ wine/dlls/riched20/editor.c 3 Nov 2005 11:33:24 -0000 @@ -821,6 +821,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ed->nUDArrowX = -1; ed->nSequence = 0; ed->rgbBackColor = -1; + ed->hbrBackground = GetSysColorBrush(COLOR_WINDOW); ed->bCaretAtEnd = FALSE; ed->nEventMask = 0; ed->nModifyStep = 0; @@ -926,7 +927,8 @@ void ME_DestroyEditor(ME_TextEditor *edi if (editor->pFontCache[i].hFont) DeleteObject(editor->pFontCache[i].hFont); } - + DeleteObject(editor->hbrBackground); + FREE_OBJ(editor); } @@ -1265,10 +1267,18 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case EM_SETBKGNDCOLOR: { LRESULT lColor = ME_GetBackColor(editor); + if (editor->rgbBackColor != -1) + DeleteObject(editor->hbrBackground); if (wParam) + { editor->rgbBackColor = -1; + editor->hbrBackground = GetSysColorBrush(COLOR_WINDOW); + } else + { editor->rgbBackColor = lParam; + editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); + } if (editor->bRedraw) { InvalidateRect(hWnd, NULL, TRUE); @@ -1792,12 +1802,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND { HDC hDC = (HDC)wParam; RECT rc; - COLORREF rgbBG = ME_GetBackColor(editor); if (GetUpdateRect(hWnd,&rc,TRUE)) { - HBRUSH hbr = CreateSolidBrush(rgbBG); - FillRect(hDC, &rc, hbr); - DeleteObject(hbr); + FillRect(hDC, &rc, editor->hbrBackground); } } return 1;

1 0

wine/programs/winedbg break.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21078 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:33:04 Modified files: programs/winedbg: break.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Fixed 'break NN' command (using dbghelp.SymEnumLines). Patch: http://cvs.winehq.org/patch.py?id=21078 Old revision New revision Changes Path 1.13 1.14 +32 -32 wine/programs/winedbg/break.c Index: wine/programs/winedbg/break.c diff -u -p wine/programs/winedbg/break.c:1.13 wine/programs/winedbg/break.c:1.14 --- wine/programs/winedbg/break.c:1.13 3 Nov 2005 11:33: 4 -0000 +++ wine/programs/winedbg/break.c 3 Nov 2005 11:33: 4 -0000 @@ -255,6 +255,25 @@ void break_add_break_from_id(const char dbg_curr_process->delayed_bp[dbg_curr_process->num_delayed_bp - 1].u.symbol.lineno = lineno; } +struct cb_break_lineno +{ + int lineno; + ADDRESS addr; +}; + +static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) +{ + struct cb_break_lineno* bkln = user; + + if (bkln->lineno == sci->LineNumber) + { + bkln->addr.Mode = AddrModeFlat; + bkln->addr.Offset = sci->Address; + return FALSE; + } + return TRUE; +} + /*********************************************************************** * break_add_break_from_lineno * @@ -262,48 +281,29 @@ void break_add_break_from_id(const char */ void break_add_break_from_lineno(int lineno) { - ADDRESS addr; + struct cb_break_lineno bkln; - memory_get_current_pc(&addr); + memory_get_current_pc(&bkln.addr); if (lineno != -1) { IMAGEHLP_LINE il; - IMAGEHLP_LINE iil; - BOOL found = FALSE; + + DWORD disp; + DWORD linear = (DWORD)memory_to_linear_addr(&bkln.addr); il.SizeOfStruct = sizeof(il); - if (!SymGetLineFromAddr(dbg_curr_process->handle, - (DWORD)memory_to_linear_addr(&addr), &disp, &il)) - { - dbg_printf("Unable to add breakpoint (unknown address)\n"); - return; - } + if (!SymGetLineFromAddr(dbg_curr_process->handle, linear, &disp, &il)) - iil = il; - while (SymGetLinePrev(dbg_curr_process->handle, &iil)) - { - if (lineno == iil.LineNumber && !strcmp(il.FileName, iil.FileName)) - { - addr.Mode = AddrModeFlat; - addr.Offset = iil.Address; - found = TRUE; - break; - } - } - iil = il; - if (!found) while (SymGetLineNext(dbg_curr_process->handle, &iil)) { - if (lineno == iil.LineNumber && !strcmp(il.FileName, iil.FileName)) - { - addr.Mode = AddrModeFlat; - addr.Offset = iil.Address; - found = TRUE; - break; - } + dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); + return; } - if (!found) + bkln.addr.Offset = 0; + bkln.lineno = lineno; + SymEnumLines(dbg_curr_process->handle, linear, NULL, il.FileName, line_cb, &bkln); + if (!bkln.addr.Offset) { dbg_printf("Unknown line number\n" "(either out of file, or no code at given line number)\n"); @@ -311,7 +311,7 @@ void break_add_break_from_lineno(int lin } } - break_add_break(&addr, TRUE); + break_add_break(&bkln.addr, TRUE); } /***********************************************************************

1 0

wine/programs/wineconsole wineconsole.c wineco ...
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21077 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 05:32:52 Modified files: programs/wineconsole: wineconsole.c winecon_private.h dialog.c Log message: Eric Pouech <eric.pouech(a)wanadoo.fr> Fixed wineconsole startup when restoring registry settings. Patch: http://cvs.winehq.org/patch.py?id=21077 Old revision New revision Changes Path 1.38 1.39 +55 -13 wine/programs/wineconsole/wineconsole.c 1.13 1.14 +1 -1 wine/programs/wineconsole/winecon_private.h 1.22 1.23 +1 -1 wine/programs/wineconsole/dialog.c Index: wine/programs/wineconsole/wineconsole.c diff -u -p wine/programs/wineconsole/wineconsole.c:1.38 wine/programs/wineconsole/wineconsole.c:1.39 --- wine/programs/wineconsole/wineconsole.c:1.38 3 Nov 2005 11:32:52 -0000 +++ wine/programs/wineconsole/wineconsole.c 3 Nov 2005 11:32:52 -0000 @@ -372,10 +372,9 @@ int WINECON_GrabChanges(struct inner_dat * of server side equivalent and visual parts. * If force is FALSE, only the changed items are modified. */ -void WINECON_SetConfig(struct inner_data* data, - const struct config_data* cfg, BOOL force) +void WINECON_SetConfig(struct inner_data* data, const struct config_data* cfg) { - if (force || data->curcfg.cursor_size != cfg->cursor_size || + if (data->curcfg.cursor_size != cfg->cursor_size || data->curcfg.cursor_visible != cfg->cursor_visible) { CONSOLE_CURSOR_INFO cinfo; @@ -390,23 +389,23 @@ void WINECON_SetConfig(struct inner_ /* this shall update (through notif) curcfg */ SetConsoleCursorInfo(data->hConOut, &cinfo); } - if (force || data->curcfg.history_size != cfg->history_size) + if (data->curcfg.history_size != cfg->history_size) { data->curcfg.history_size = cfg->history_size; WINECON_SetHistorySize(data->hConIn, cfg->history_size); } - if (force || data->curcfg.history_nodup != cfg->history_nodup) + if (data->curcfg.history_nodup != cfg->history_nodup) { data->curcfg.history_nodup = cfg->history_nodup; WINECON_SetHistoryMode(data->hConIn, cfg->history_nodup); } data->curcfg.menu_mask = cfg->menu_mask; data->curcfg.quick_edit = cfg->quick_edit; - if (force || 1 /* FIXME: font info has changed */) + if (1 /* FIXME: font info has changed */) { data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); } - if (force || data->curcfg.def_attr != cfg->def_attr) + if (data->curcfg.def_attr != cfg->def_attr) { data->curcfg.def_attr = cfg->def_attr; SetConsoleTextAttribute(data->hConOut, cfg->def_attr); @@ -420,8 +419,8 @@ void WINECON_SetConfig(struct inner_ * for <B> (window / ScreenBuffer) * The Change<A><B> actually modify the <B> dimension of <A>. */ -#define TstSBfWidth() (force || data->curcfg.sb_width != cfg->sb_width) -#define TstWinWidth() (force || data->curcfg.win_width != cfg->win_width) +#define TstSBfWidth() (data->curcfg.sb_width != cfg->sb_width) +#define TstWinWidth() (data->curcfg.win_width != cfg->win_width) #define ChgSBfWidth() do {c.X = cfg->sb_width; \ c.Y = data->curcfg.sb_height;\ @@ -432,8 +431,8 @@ void WINECON_SetConfig(struct inner_ pos.Bottom = 0; \ SetConsoleWindowInfo(data->hConOut, FALSE, &pos);\ } while (0) -#define TstSBfHeight() (force || data->curcfg.sb_height != cfg->sb_height) -#define TstWinHeight() (force || data->curcfg.win_height != cfg->win_height) +#define TstSBfHeight() (data->curcfg.sb_height != cfg->sb_height) +#define TstWinHeight() (data->curcfg.win_height != cfg->win_height) /* since we're going to apply height after width is done, we use width as defined * in cfg, and not in data->curcfg because if won't be updated yet */ @@ -495,7 +494,7 @@ void WINECON_SetConfig(struct inner_ #undef ChgWinHeight data->curcfg.exit_on_die = cfg->exit_on_die; - if (force || data->curcfg.edition_mode != cfg->edition_mode) + if (data->curcfg.edition_mode != cfg->edition_mode) { data->curcfg.edition_mode = cfg->edition_mode; WINECON_SetEditionMode(data->hConIn, cfg->edition_mode); @@ -524,6 +523,48 @@ static void WINECON_Delete(struct inner_ } /****************************************************************** + * WINECON_GetServerConfig + * + * Fills data->curcfg with the actual configuration running in the server + * (getting real information on the server, and not relying on cached + * information in data) + */ +static BOOL WINECON_GetServerConfig(struct inner_data* data) +{ + BOOL ret; + + SERVER_START_REQ(get_console_input_info) + { + req->handle = data->hConIn; + ret = !wine_server_call_err( req ); + data->curcfg.history_size = reply->history_size; + data->curcfg.history_nodup = reply->history_mode; + data->curcfg.edition_mode = reply->edition_mode; + } + SERVER_END_REQ; + if (!ret) return FALSE; + SERVER_START_REQ(get_console_output_info) + { + req->handle = data->hConOut; + ret = !wine_server_call_err( req ); + data->curcfg.cursor_size = reply->cursor_size; + data->curcfg.cursor_visible = reply->cursor_visible; + data->curcfg.def_attr = reply->attr; + data->curcfg.sb_width = reply->width; + data->curcfg.sb_height = reply->height; + data->curcfg.win_width = reply->win_right - reply->win_left + 1; + data->curcfg.win_height = reply->win_bottom - reply->win_top + 1; + } + SERVER_END_REQ; + WINECON_DumpConfig("first cfg: ", &data->curcfg); + data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); + if (!data->cells) WINECON_Fatal("OOM\n"); + + return ret; +} + +/****************************************************************** * WINECON_Init * * Initialisation part I. Creation of server object (console input and @@ -613,7 +654,8 @@ static struct inner_data* WINECON_Init(H switch ((*backend)(data)) { case init_success: - WINECON_SetConfig(data, &cfg, TRUE); + WINECON_GetServerConfig(data); + WINECON_SetConfig(data, &cfg); data->curcfg.registry = cfg.registry; WINECON_DumpConfig("fint", &data->curcfg); return data; Index: wine/programs/wineconsole/winecon_private.h diff -u -p wine/programs/wineconsole/winecon_private.h:1.13 wine/programs/wineconsole/winecon_private.h:1.14 --- wine/programs/wineconsole/winecon_private.h:1.13 3 Nov 2005 11:32:52 -0000 +++ wine/programs/wineconsole/winecon_private.h 3 Nov 2005 11:32:52 -0000 @@ -85,7 +85,7 @@ extern BOOL WINECON_GetConsoleTitle(HAND extern void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm); extern int WINECON_GrabChanges(struct inner_data* data); extern VOID WINECON_SetConfig(struct inner_data* data, - const struct config_data* cfg, BOOL force); + const struct config_data* cfg); /* from registry.c */ extern void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg); extern void WINECON_RegSave(const struct config_data* cfg); Index: wine/programs/wineconsole/dialog.c diff -u -p wine/programs/wineconsole/dialog.c:1.22 wine/programs/wineconsole/dialog.c:1.23 --- wine/programs/wineconsole/dialog.c:1.22 3 Nov 2005 11:32:52 -0000 +++ wine/programs/wineconsole/dialog.c 3 Nov 2005 11:32:52 -0000 @@ -844,7 +844,7 @@ BOOL WCUSER_GetProperties(struct inner_d } } - if (modify_session) WINECON_SetConfig(data, &di.config, FALSE); + if (modify_session) WINECON_SetConfig(data, &di.config); if (save) WINECON_RegSave(&di.config); return TRUE;

1 0

wine/dlls/msi helpers.c files.c classes.c action.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21076 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:56:29 Modified files: dlls/msi : helpers.c files.c classes.c action.c Log message: Mike McCormack <mike(a)codeweavers.com> Remove some redundant null pointer checks. Patch: http://cvs.winehq.org/patch.py?id=21076 Old revision New revision Changes Path 1.35 1.36 +2 -5 wine/dlls/msi/helpers.c 1.29 1.30 +0 -9 wine/dlls/msi/files.c 1.23 1.24 +0 -12 wine/dlls/msi/classes.c 1.228 1.229 +7 -35 wine/dlls/msi/action.c

1 0

wine/dlls/shell32 tests/shlfolder.c shlfolder. ...
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21075 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:56:07 Modified files: dlls/shell32/tests: shlfolder.c dlls/shell32 : shlfolder.c shfldr_unixfs.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Michael Jung <mjung(a)iss.tu-darmstadt.de> Set all capability flags supported by the shellfolder, disregarding the flag mask given to GetAttributesOf. Unit tests to demonstrate this behaviour. Patch: http://cvs.winehq.org/patch.py?id=21075 Old revision New revision Changes Path 1.39 1.40 +17 -9 wine/dlls/shell32/tests/shlfolder.c 1.105 1.106 +15 -8 wine/dlls/shell32/shlfolder.c 1.57 1.58 +5 -5 wine/dlls/shell32/shfldr_unixfs.c Index: wine/dlls/shell32/tests/shlfolder.c diff -u -p wine/dlls/shell32/tests/shlfolder.c:1.39 wine/dlls/shell32/tests/shlfolder.c:1.40 --- wine/dlls/shell32/tests/shlfolder.c:1.39 3 Nov 2005 9:56: 7 -0000 +++ wine/dlls/shell32/tests/shlfolder.c 3 Nov 2005 9:56: 7 -0000 @@ -163,14 +163,15 @@ static void test_EnumObjects(IShellFolde { 1, 1, 1, 1, 0} }; - /* Just test SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR for now */ +#define SFGAO_testfor SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR | SFGAO_CAPABILITYMASK + /* Don't test for SFGAO_HASSUBFOLDER since we return real state and native cached */ static const ULONG attrs[5] = { - SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_FILESYSTEM, - SFGAO_FILESYSTEM, - SFGAO_FILESYSTEM, + SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, + SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, + SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, }; hr = IShellFolder_EnumObjects(iFolder, NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &iEnumList); @@ -206,11 +207,18 @@ static void test_EnumObjects(IShellFolde for (i = 0; i < 5; i++) { SFGAOF flags; - flags = SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR; + /* Native returns all flags no matter what we ask for */ + flags = SFGAO_CANCOPY; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); - flags &= SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR; + flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08lx\n", hr); - ok(flags == attrs[i], "GetAttributesOf gets attrs %08lx, expects %08lx\n", flags, attrs[i]); + ok(flags == (attrs[i]), "GetAttributesOf[%i] got %08lx, expected %08lx\n", i, flags, attrs[i]); + + flags = SFGAO_testfor; + hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); + flags &= SFGAO_testfor; + ok(hr == S_OK, "GetAttributesOf returns %08lx\n", hr); + ok(flags == attrs[i], "GetAttributesOf[%i] got %08lx, expected %08lx\n", i, flags, attrs[i]); } for (i=0;i<5;i++) Index: wine/dlls/shell32/shlfolder.c diff -u -p wine/dlls/shell32/shlfolder.c:1.105 wine/dlls/shell32/shlfolder.c:1.106 --- wine/dlls/shell32/shlfolder.c:1.105 3 Nov 2005 9:56: 7 -0000 +++ wine/dlls/shell32/shlfolder.c 3 Nov 2005 9:56: 7 -0000 @@ -419,16 +419,23 @@ HRESULT SHELL32_GetItemAttributes (IShel } else if (_ILGetDataPointer (pidl)) { dwAttributes = _ILGetFileAttributes (pidl, NULL, 0); - if ((SFGAO_FILESYSANCESTOR & *pdwAttributes) && !(dwAttributes & FILE_ATTRIBUTE_DIRECTORY)) - *pdwAttributes &= ~SFGAO_FILESYSANCESTOR; - - if ((SFGAO_FOLDER & *pdwAttributes) && !(dwAttributes & FILE_ATTRIBUTE_DIRECTORY)) - *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER); - - if ((SFGAO_HIDDEN & *pdwAttributes) && !(dwAttributes & FILE_ATTRIBUTE_HIDDEN)) + /* Set common attributes */ + *pdwAttributes |= SFGAO_FILESYSTEM | SFGAO_DROPTARGET | SFGAO_HASPROPSHEET | SFGAO_CANDELETE | + SFGAO_CANRENAME | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANCOPY; + + if (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) + *pdwAttributes |= (SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + else + *pdwAttributes &= ~(SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR); + + if (dwAttributes & FILE_ATTRIBUTE_HIDDEN) + *pdwAttributes |= SFGAO_HIDDEN; + else *pdwAttributes &= ~SFGAO_HIDDEN; - if ((SFGAO_READONLY & *pdwAttributes) && !(dwAttributes & FILE_ATTRIBUTE_READONLY)) + if (dwAttributes & FILE_ATTRIBUTE_READONLY) + *pdwAttributes |= SFGAO_READONLY; + else *pdwAttributes &= ~SFGAO_READONLY; if (SFGAO_LINK & *pdwAttributes) { Index: wine/dlls/shell32/shfldr_unixfs.c diff -u -p wine/dlls/shell32/shfldr_unixfs.c:1.57 wine/dlls/shell32/shfldr_unixfs.c:1.58 --- wine/dlls/shell32/shfldr_unixfs.c:1.57 3 Nov 2005 9:56: 7 -0000 +++ wine/dlls/shell32/shfldr_unixfs.c 3 Nov 2005 9:56: 7 -0000 @@ -828,12 +828,12 @@ static HRESULT WINAPI UnixFolder_IShellF char szAbsolutePath[FILENAME_MAX], *pszRelativePath; UINT i; - *rgfInOut &= SFGAO_FOLDER|SFGAO_HASSUBFOLDER|SFGAO_FILESYSANCESTOR|SFGAO_CANRENAME| - SFGAO_FILESYSTEM; + *rgfInOut = SFGAO_CANCOPY|SFGAO_CANMOVE|SFGAO_CANLINK|SFGAO_CANRENAME|SFGAO_CANDELETE| + SFGAO_HASPROPSHEET|SFGAO_DROPTARGET|SFGAO_FILESYSTEM; lstrcpyA(szAbsolutePath, This->m_pszPath); pszRelativePath = szAbsolutePath + lstrlenA(szAbsolutePath); for (i=0; i<cidl; i++) { - if ((*rgfInOut & SFGAO_FILESYSTEM) && !(This->m_dwAttributes & SFGAO_FILESYSTEM)) { + if (!(This->m_dwAttributes & SFGAO_FILESYSTEM)) { struct stat fileStat; char *pszName = _ILGetTextPointer(apidl[i]); if (!pszName) return E_INVALIDARG; @@ -841,8 +841,8 @@ static HRESULT WINAPI UnixFolder_IShellF if (stat(szAbsolutePath, &fileStat) || !UNIXFS_is_dos_device(&fileStat)) *rgfInOut &= ~SFGAO_FILESYSTEM; } - if (!_ILIsFolder(apidl[i])) - *rgfInOut &= ~(SFGAO_FOLDER|SFGAO_HASSUBFOLDER|SFGAO_FILESYSANCESTOR); + if (_ILIsFolder(apidl[i])) + *rgfInOut |= SFGAO_FOLDER|SFGAO_HASSUBFOLDER|SFGAO_FILESYSANCESTOR; } }

1 0

wine/dlls/msi cond.y
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21074 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:55:30 Modified files: dlls/msi : cond.y Log message: Mike McCormack <mike(a)codeweavers.com> Add missing semicolons that caused compile trouble on FreeBSD. Patch: http://cvs.winehq.org/patch.py?id=21074 Old revision New revision Changes Path 1.24 1.25 +18 -18 wine/dlls/msi/cond.y Index: wine/dlls/msi/cond.y diff -u -p wine/dlls/msi/cond.y:1.24 wine/dlls/msi/cond.y:1.25 --- wine/dlls/msi/cond.y:1.24 3 Nov 2005 9:55:30 -0000 +++ wine/dlls/msi/cond.y 3 Nov 2005 9:55:30 -0000 @@ -207,24 +207,24 @@ boolean_factor: operator: /* common functions */ - COND_EQ { $$ = COND_EQ } - | COND_NE { $$ = COND_NE } - | COND_LT { $$ = COND_LT } - | COND_GT { $$ = COND_GT } - | COND_LE { $$ = COND_LE } - | COND_GE { $$ = COND_GE } - | COND_SS { $$ = COND_SS } - | COND_IEQ { $$ = COND_IEQ } - | COND_INE { $$ = COND_INE } - | COND_ILT { $$ = COND_ILT } - | COND_IGT { $$ = COND_IGT } - | COND_ILE { $$ = COND_ILE } - | COND_IGE { $$ = COND_IGE } - | COND_ISS { $$ = COND_ISS } - | COND_LHS { $$ = COND_LHS } - | COND_RHS { $$ = COND_RHS } - | COND_ILHS { $$ = COND_ILHS } - | COND_IRHS { $$ = COND_IRHS } + COND_EQ { $$ = COND_EQ; } + | COND_NE { $$ = COND_NE; } + | COND_LT { $$ = COND_LT; } + | COND_GT { $$ = COND_GT; } + | COND_LE { $$ = COND_LE; } + | COND_GE { $$ = COND_GE; } + | COND_SS { $$ = COND_SS; } + | COND_IEQ { $$ = COND_IEQ; } + | COND_INE { $$ = COND_INE; } + | COND_ILT { $$ = COND_ILT; } + | COND_IGT { $$ = COND_IGT; } + | COND_ILE { $$ = COND_ILE; } + | COND_IGE { $$ = COND_IGE; } + | COND_ISS { $$ = COND_ISS; } + | COND_LHS { $$ = COND_LHS; } + | COND_RHS { $$ = COND_RHS; } + | COND_ILHS { $$ = COND_ILHS; } + | COND_IRHS { $$ = COND_IRHS; } ; value_s:

1 0

wine/dlls/shell32 shelllink.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21073 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:55:22 Modified files: dlls/shell32 : shelllink.c Log message: Mike McCormack <mike(a)codeweavers.com> Pass the correct verb. Add a space between extra parameters. Wait for ShellExecute to complete. Patch: http://cvs.winehq.org/patch.py?id=21073 Old revision New revision Changes Path 1.109 1.110 +15 -1 wine/dlls/shell32/shelllink.c Index: wine/dlls/shell32/shelllink.c diff -u -p wine/dlls/shell32/shelllink.c:1.109 wine/dlls/shell32/shelllink.c:1.110 --- wine/dlls/shell32/shelllink.c:1.109 3 Nov 2005 9:55:22 -0000 +++ wine/dlls/shell32/shelllink.c 3 Nov 2005 9:55:22 -0000 @@ -2466,6 +2466,7 @@ static HRESULT WINAPI ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) { IShellLinkImpl *This = impl_from_IContextMenu(iface); + static const WCHAR szOpen[] = { 'O','p','e','n',0 }; SHELLEXECUTEINFOW sei; HWND hwnd = NULL; /* FIXME: get using interface set from IObjectWithSite */ LPWSTR args = NULL; @@ -2500,7 +2501,7 @@ ShellLink_InvokeCommand( IContextMenu* i ( lpici->fMask & CMIC_MASK_UNICODE ) ) { LPCMINVOKECOMMANDINFOEX iciex = (LPCMINVOKECOMMANDINFOEX) lpici; - DWORD len = 0; + DWORD len = 2; if ( This->sArgs ) len += lstrlenW( This->sArgs ); @@ -2512,19 +2513,32 @@ ShellLink_InvokeCommand( IContextMenu* i if ( This->sArgs ) lstrcatW( args, This->sArgs ); if ( iciex->lpParametersW ) + { + static const WCHAR space[] = { ' ', 0 }; + lstrcatW( args, space ); lstrcatW( args, iciex->lpParametersW ); + } } memset( &sei, 0, sizeof sei ); sei.cbSize = sizeof sei; + sei.fMask = SEE_MASK_UNICODE | SEE_MASK_NOCLOSEPROCESS; sei.lpFile = path; sei.nShow = This->iShowCmd; sei.lpIDList = This->pPidl; sei.lpDirectory = This->sWorkDir; sei.lpParameters = args; + sei.lpVerb = szOpen; if( ShellExecuteExW( &sei ) ) + { + if ( sei.hProcess ) + { + WaitForSingleObject( sei.hProcess, 10000 ); + CloseHandle( sei.hProcess ); + } r = S_OK; + } else r = E_FAIL;

1 0

wine/dlls/advpack advpack.spec advpack.c
by Alexandre Julliard Nov. 3, 2005

Nov. 3, 2005

ChangeSet ID: 21072 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/03 03:54:56 Modified files: dlls/advpack : advpack.spec advpack.c Log message: Steven Edwards <winehacker(a)gmail.com> Add a real stub for Advpack.extract. Patch: http://cvs.winehq.org/patch.py?id=21072 Old revision New revision Changes Path 1.10 1.11 +1 -1 wine/dlls/advpack/advpack.spec 1.12 1.13 +15 -0 wine/dlls/advpack/advpack.c Index: wine/dlls/advpack/advpack.spec diff -u -p wine/dlls/advpack/advpack.spec:1.10 wine/dlls/advpack/advpack.spec:1.11 --- wine/dlls/advpack/advpack.spec:1.10 3 Nov 2005 9:54:56 -0000 +++ wine/dlls/advpack/advpack.spec 3 Nov 2005 9:54:56 -0000 @@ -6,7 +6,7 @@ @ stdcall -private DllMain(long long ptr) @ stdcall DoInfInstall(ptr) @ stdcall ExecuteCab(ptr ptr ptr) -@ stub ExtractFiles +@ stdcall ExtractFiles(str str long ptr ptr long) @ stub FileSaveMarkNotExist @ stub FileSaveRestore @ stub FileSaveRestoreOnINF Index: wine/dlls/advpack/advpack.c diff -u -p wine/dlls/advpack/advpack.c:1.12 wine/dlls/advpack/advpack.c:1.13 --- wine/dlls/advpack/advpack.c:1.12 3 Nov 2005 9:54:56 -0000 +++ wine/dlls/advpack/advpack.c 3 Nov 2005 9:54:56 -0000 @@ -393,6 +393,21 @@ HRESULT WINAPI ExecuteCab( HWND hwnd, PC } /*********************************************************************** + * ExtractFiles (ADVPACK.@) + * + * BUGS + * Unimplemented + */ + +HRESULT WINAPI ExtractFiles ( LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, + LPCSTR FileList, LPVOID LReserved, DWORD Reserved) +{ + FIXME("(%p %p 0x%08lx %p %p 0x%08lx): stub\n", CabName, ExpandDir, Flags, + FileList, LReserved, Reserved); + return E_FAIL; +} + +/*********************************************************************** * TranslateInfString (ADVPACK.@) * * BUGS

1 0