March 2006 - wine-commits

Alexandre Julliard : Release 0.9.9.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: a2bc9df948883ee531a59bb514795b6e3a63a9bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2bc9df948883ee531a59bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:16:27 2006 +0100 Release 0.9.9. --- ANNOUNCE | 18 - ChangeLog | 1574 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1594 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a2bc9df948883ee531a…

1 0

Alexandre Julliard : Fixed some compiler warnings on old gcc versions.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: c9cc7e33ffaaf9b359d6bccf778e34d1b955a517 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9cc7e33ffaaf9b359d6bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 18:03:32 2006 +0100 Fixed some compiler warnings on old gcc versions. --- dlls/dxdiagn/container.c | 2 +- dlls/ole32/ole2.c | 2 +- dlls/ole32/oleobj.c | 2 +- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 12 +++--------- dlls/shell32/tests/shlfolder.c | 2 +- include/ddk/wdm.h | 2 +- server/change.c | 2 +- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index aa15d10..1810269 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -150,7 +150,7 @@ HRESULT WINAPI IDxDiagContainerImpl_GetC hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (!SUCCEEDED(hr) || NULL == pContainer) goto on_error; - *cur++; /* go after '.' (just replaced by \0) */ + cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = strchrW(tmp, '.'); } diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index beb485e..1c61ff9 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -801,7 +801,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( rgelt->grfAttribs = atolW(pwszAttribs); if (pceltFetched) - *pceltFetched++; + (*pceltFetched)++; This->index++; } return hr; diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 78e1ebc..68cc8b8 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -129,7 +129,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Ne rgelt->dwConnection = This->index; if (pceltFetched) - *pceltFetched++; + (*pceltFetched)++; This->index++; } return hr; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a07f086..506c706 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2552,7 +2552,7 @@ int ME_AutoURLDetect(ME_TextEditor *edit int sel_min, sel_max; int car_pos = 0; int text_pos=-1; - int URLmin, URLmax; + int URLmin, URLmax = 0; CHARRANGE url; FINDTEXTA ft; CHARFORMAT2W cur_format; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8835f08..95cf705 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -621,15 +621,9 @@ static void test_EM_SCROLL() SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "a");/* one line of text */ expr = 0x00010000; for (i = 0; i < 4; i++) { - int cmd; - switch (i) { - case 0: cmd = SB_PAGEDOWN; break; - case 1: cmd = SB_PAGEUP; break; - case 2: cmd = SB_LINEDOWN; break; - case 3: cmd = SB_LINEUP; break; - } - - r = SendMessage(hwndRichEdit, EM_SCROLL, cmd, 0); + static const int cmd[4] = { SB_PAGEDOWN, SB_PAGEUP, SB_LINEDOWN, SB_LINEUP }; + + r = SendMessage(hwndRichEdit, EM_SCROLL, cmd[i], 0); y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); ok(expr == r, "EM_SCROLL improper return value returned (i == %d). " "Got 0x%08x, expected 0x%08x\n", i, r, expr); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index ce638e0..25bac9d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -858,7 +858,7 @@ static void test_SHGetPathFromIDList(voi /* Test if we can get the path from the start menu "program files" PIDL. */ hShell32 = GetModuleHandleA("shell32"); - pSHGetSpecialFolderLocation = (HRESULT(WINAPI*)(HWND,int,LPITEMIDLIST*))GetProcAddress(hShell32, "SHGetSpecialFolderLocation"); + pSHGetSpecialFolderLocation = (void *)GetProcAddress(hShell32, "SHGetSpecialFolderLocation"); hr = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidlPrograms); ok(SUCCEEDED(hr), "SHGetFolderLocation failed: 0x%08lx\n", hr); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b10a6f1..7c5160c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -833,7 +833,7 @@ typedef struct _KUSER_SHARED_DATA { union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; - }; + } DUMMYUNIONNAME; } KSHARED_USER_DATA, *PKSHARED_USER_DATA; NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); diff --git a/server/change.c b/server/change.c index cef1c3e..4349d7e 100644 --- a/server/change.c +++ b/server/change.c @@ -942,7 +942,7 @@ static char *get_basename( const char *l while (1) { buffer = malloc( n ); - if (!buffer) break; + if (!buffer) return NULL; r = readlink( link, buffer, n ); if (r < 0)

1 0

Alexandre Julliard : dlls: Remove 16-bit files on make clean.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: ca21f1541f2df7b7e69f6c19c6b4756c62e6551a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca21f1541f2df7b7e69f6c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 2 16:16:31 2006 +0100 dlls: Remove 16-bit files on make clean. --- dlls/Makefile.in | 2 +- dlls/make_dlls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 0e7c6ad..3dafd6c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -1766,7 +1766,7 @@ uninstall:: -rmdir $(DESTDIR)$(dlldir) clean:: - $(RM) $(IMPORT_SYMLINKS) + $(RM) $(IMPORT_SYMLINKS) $(WIN16_FILES) check test:: $(BUILDSUBDIRS:%=%/__test__) diff --git a/dlls/make_dlls b/dlls/make_dlls index 0f2bc5b..0a9012b 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -351,7 +351,7 @@ uninstall:: -rmdir \$(DESTDIR)\$(dlldir) clean:: - \$(RM) \$(IMPORT_SYMLINKS) + \$(RM) \$(IMPORT_SYMLINKS) \$(WIN16_FILES) check test:: \$(BUILDSUBDIRS:%=%/__test__)

1 0

Roderick Colenbrander : wined3d: Opengl 2.x compile fix.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: f8ed06ea3dbdf0e45786712de0bfc65ef215e364 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8ed06ea3dbdf0e45786712… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Mar 2 13:27:13 2006 +0100 wined3d: Opengl 2.x compile fix. --- dlls/wined3d/device.c | 15 +++++++++++---- include/wine/wined3d_gl.h | 7 ++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd72818..7d8e4f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3767,8 +3767,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { - glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass); - checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + if(GL_EXTCALL(glStencilOpSeparate)) { + GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + } else { + WARN("Unsupported in local OpenGL implementation: glStencilOpSeparate\n"); + } } else { glStencilOp(stencilFail, depthFail, stencilPass); checkGLcall("glStencilOp(...)"); @@ -3796,8 +3800,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } This->stencilfunc = func; if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { - glStencilFuncSeparate(GL_BACK, func, ref, mask); - checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); + if(GL_EXTCALL(glStencilFuncSeparate)) { + GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); + checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + } else + WARN("Unsupported in local OpenGL implementation: glStencilFuncSeparate\n"); } else { glStencilFunc(func, ref, mask); checkGLcall("glStencilFunc(...)"); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 200bba1..fa391ba 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -803,7 +803,9 @@ typedef void (APIENTRY * PGLFNBEGINOCCLU typedef void (APIENTRY * PGLFNENDOCCLUSIONQUERYNVPROC) (void); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); - +/* OpenGL 2.0 */ +typedef void (APIENTRY * PGLFNSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); +typedef void (APIENTRY * PGLFNSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask); /**************************************************** * OpenGL Official Version @@ -1032,6 +1034,9 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \ USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \ USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \ + /* OpenGL 2.0 */ \ + USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ + USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEPROC, glStencilFuncSeparate); \ #define GLX_EXT_FUNCS_GEN \ /** GLX_VERSION_1_3 **/ \

1 0

Vitaly Lipatov : user: Fix uninitialized rectangle in menu arrow painting.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: e96f03a1d7780985aa7ad27e4b00ce60643c9ba3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e96f03a1d7780985aa7ad27… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Mar 1 20:56:47 2006 +0300 user: Fix uninitialized rectangle in menu arrow painting. --- dlls/user/menu.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 673fcc4..a1a1c04 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -1375,6 +1375,10 @@ static void MENU_DrawMenuItem( HWND hwnd SetBkColor( hdc, GetSysColor( bkgnd ) ); } + TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect)); + rect = lpitem->rect; + MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect); + if (lpitem->fType & MF_OWNERDRAW) { /* @@ -1399,8 +1403,7 @@ static void MENU_DrawMenuItem( HWND hwnd dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */ dis.hwndItem = (HWND)hmenu; dis.hDC = hdc; - dis.rcItem = lpitem->rect; - MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &dis.rcItem); + dis.rcItem = rect; TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " "hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, @@ -1413,13 +1416,8 @@ static void MENU_DrawMenuItem( HWND hwnd return; } - TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect)); - if (menuBar && (lpitem->fType & MF_SEPARATOR)) return; - rect = lpitem->rect; - MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect); - if (lpitem->fState & MF_HILITE) { if (flat_menu)

1 0

Mike McCormack : wine.inf: Add a default RelayExclude.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: af9288d5917f745e7294e42c2f6a6bec8dccdab1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af9288d5917f745e7294e42… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 1 00:21:52 2006 +0900 wine.inf: Add a default RelayExclude. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index b94a3a5..a86ab58 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -152,6 +152,7 @@ HKLM,Software\Microsoft\Windows NT\Curre [Debugger] HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Auto",2,"1" +HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.97;kernel32.98" [Desktop] HKCU,%Desktop%,"FontSmoothing",2,"0"

1 0

Eric Pouech : winedbg: Bring usage() and .man up to date.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 81198f3971ffc60a5742705330daf89ce72b26cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81198f3971ffc60a5742705… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:39 2006 +0100 winedbg: Bring usage() and .man up to date. --- programs/winedbg/winedbg.c | 31 +++++++++++++--- programs/winedbg/winedbg.man.in | 75 ++++++++++++++++++++++++++++----------- 2 files changed, 79 insertions(+), 27 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 99f04ef..6f2fdea 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -450,9 +450,25 @@ static void dbg_init_console(void) SetConsoleTitle("Wine Debugger"); } -static int dbg_winedbg_usage(void) +static int dbg_winedbg_usage(BOOL advanced) { - dbg_printf("Usage: winedbg [--command cmd|--file file|--auto] [--gdb [--no-start] [--with-xterm]] cmdline\n"); + if (advanced) + { + dbg_printf("Usage:\n" + " winedbg cmdline launch process 'cmdline' (as if you were starting\n" + " it with wine) and run WineDbg on it\n" + " winedbg <num> attach to running process of pid <num> and run\n" + " WineDbg on it\n" + " winedbg --gdb cmdline launch process 'cmdline' (as if you were starting\n" + " wine) and run gdb (proxied) on it\n" + " winedbg --gdb <num> attach to running process of pid <num> and run\n" + " gdb (proxied) on it\n" + " winedbg file.mdmp reload the minidump file.mdmp into memory and run\n" + " WineDbg on it\n" + " winedbg --help prints advanced options\n"); + } + else + dbg_printf("Usage:\n\twinedbg [ [ --gdb ] [ prog-name [ prog-args ] | <num> | file.mdmp | --help ]\n"); return -1; } @@ -491,10 +507,13 @@ int main(int argc, char** argv) /* as we don't care about exec name */ argc--; argv++; + if (argc && !strcmp(argv[0], "--help")) + return dbg_winedbg_usage(TRUE); + if (argc && !strcmp(argv[0], "--gdb")) { retv = gdb_main(argc, argv); - if (retv == -1) dbg_winedbg_usage(); + if (retv == -1) dbg_winedbg_usage(FALSE); return retv; } dbg_init_console(); @@ -510,7 +529,7 @@ int main(int argc, char** argv) switch (dbg_active_auto(argc, argv)) { case start_ok: return 0; - case start_error_parse: return dbg_winedbg_usage(); + case start_error_parse: return dbg_winedbg_usage(FALSE); case start_error_init: return -1; } } @@ -547,7 +566,7 @@ int main(int argc, char** argv) argc--; argv++; break; } - return dbg_winedbg_usage(); + return dbg_winedbg_usage(FALSE); } if (!argc) ds = start_ok; else if ((ds = dbg_active_attach(argc, argv)) == start_error_parse && @@ -556,7 +575,7 @@ int main(int argc, char** argv) switch (ds) { case start_ok: break; - case start_error_parse: return dbg_winedbg_usage(); + case start_error_parse: return dbg_winedbg_usage(FALSE); case start_error_init: return -1; } diff --git a/programs/winedbg/winedbg.man.in b/programs/winedbg/winedbg.man.in index 9934547..a064b5c 100644 --- a/programs/winedbg/winedbg.man.in +++ b/programs/winedbg/winedbg.man.in @@ -3,17 +3,32 @@ .SH NAME winedbg \- Wine's debugger .SH SYNOPSIS -.BR "winedbg [" -.RI "[ " " options " "]" -.BR "| --auto |" +.BR "winedbg " +.RI "[" " options " "] [" +.BI "program name" +.RI "[ program arguments ] |" +.BI "pid" +.RI "]" +.PP +.BR "winedbg " .BI "--gdb" -.RI "[" " options " "] ] [" +.RI "[" " options " "] [" .BI "program name" -.RI "[" -.BI "program arguments" -.RI "] |" +.RI "[ program arguments ] |" .BI "pid" .RI "]" +.PP +.BR "winedbg " +.BI "--auto " +.BI "pid" +.PP +.BR "winedbg " +.BI "--minidump " +.RI "[ file.mdmp ]" +.BI "pid" +.PP +.BR "winedbg" +.BI "file.mdmp" .SH DESCRIPTION .B winedbg is a debugger for Wine. It allows: @@ -27,21 +42,32 @@ is a debugger for Wine. It allows: .PP .SH MODES -\fBwinedbg\fR can be used in three modes. The first argument to the +\fBwinedbg\fR can be used in five modes. The first argument to the program determines the mode winedbg will run in. .IP \fBdefault\fR Without any explicit mode, this is standard \fBwinedbg\fR operating mode. \fBwinedbg\fR will act as the front end for the user. +.IP \fB--gdb\fR +\fBwinedbg\fR will be used as a proxy for \fBgdb\fR. \fBgdb\fR will be +the front end for command handling, and \fBwinedbg\fR will proxy all +debugging requests from \fBgdb\fR to the Win32 APIs. .IP \fB--auto\fR -This mode is used when \fBwinedbg\fR is setup in \fIAeDebug\fR +This mode is used when \fBwinedbg\fR is set up in \fIAeDebug\fR registry entry as the default debugger. \fBwinedbg\fR will then display basic information about a crash. This is useful for users who don't want to debug a crash, but rather gather relevant information about the crash to be sent to developers. -.IP \fB--gdb\fR -\fBwinedbg\fR will be used as a proxy for \fBgdb\fR. \fBgdb\fR will be -the front end for command handling, and \fBwinedbg\fR will proxy all -debugging requests from \fBgdb\fR to the Win32 APIs. +.IP \fB--minidump\fR +This mode is similar to the \fB--auto\fR one, except that instead of +printing the information on the screen (as \fB--auto\fR does), it's +saved into a minidump file. The name of the file is either passed on +the command line, or generated by \fBWineDbg\fR when none is given. +This file could later on be reloaded into \fBwinedbg\fR for further +examination. +.IP \fBfile.mdmp\fR +This mode allows to reload into \fBwinedbg\fR the state of a debuggee +which has been saved into a minidump file. See either the \fBminidump\fR +command below, or the \fB--minidump mode\fR. .SH OPTIONS When in \fBdefault\fR mode, the following options are available: @@ -58,7 +84,8 @@ will exit. When in \fBgdb\fR proxy mode, the following options are available: .PP -.IP \fI--no-start\fR \fBgdb\fR will not be automatically +.IP \fI--no-start\fR +\fBgdb\fR will not be automatically started. Relevant information for starting \fBgdb\fR are printed on screen. This is somehow useful when not directly using \fBgdb\fR but some graphical front-ends, like \fBddd\fR or \fBkgbd\fR. @@ -82,7 +109,7 @@ If nothing is specified, you will enter nor attached process. You'll have to do the job yourself. .SH COMMANDS -.SS Default mode: +.SS Default mode, and while reloading a minidump file: .PP Most of commands used in \fBwinedbg\fR are similar to the ones from \fBgdb\fR. Please refer to the \fBgdb\fR documentations for some more @@ -147,7 +174,7 @@ breakpoint isn't triggered. Adds a breakpoint at address \fBN\fR .IP \fBbreak\ <id>\fR Adds a breakpoint at the address of symbol \fB<id>\fR -.IP \fBbreak <id> N\fR +.IP \fBbreak\ <id>\ N\fR Adds a breakpoint at the line \fBN\fR inside symbol \fB<id>\fR. .IP \fBbreak\ N\fR Adds a breakpoint at line \fBN\fR of current source file. @@ -183,7 +210,7 @@ Goes up \fBN\fR frames in current thread Goes down one frame in current thread's stack .IP \fBdn\ N\fR Goes down \fBN\fR frames in current thread's stack -.IP \fBframe N\fR +.IP \fBframe\ N\fR Sets \fBN\fR as the current frame for current thread's stack. .IP \fBinfo\ locals\fR Prints information on local variables for current function frame. @@ -303,6 +330,12 @@ When specifying an identifier \fB<id>\fR this name exist, the debugger will prompt for the symbol you want to use. Pick up the one you want from its number. .PP +\fIMisc.\fR +.PP +.IP \fBminidump\ file.mdmp\fR +saves the debugging context of the debuggee into a minidump file called +file.mdmp +.PP \fIInformation on Wine's internals\fR .IP \fBinfo\ class\fR Lists all Windows' class registered in Wine @@ -317,7 +350,7 @@ Prints information on module at address Prints the value of the CPU registers .IP \fBinfo\ segment\fR Lists all allocated segments (i386 only) -.IP \fBinfo\ segment N\fR +.IP \fBinfo\ segment\ N\fR Prints information on segment \fBN\fR (i386 only) .IP \fBinfo\ stack\fR Prints the values on top of the stack @@ -355,12 +388,12 @@ However, a few Wine's extension are avai \fBmonitor\fR command: .IP \fBmonitor\ wnd\fR Lists all window in the Wine session -.IP \fBmonitor proc\fR +.IP \fBmonitor\ proc\fR Lists all processes in the Wine session -.IP \fBmonitor mem \fR +.IP \fBmonitor\ mem\fR Displays memory mapping of debugged process .PP -.SS Auto mode: +.SS Auto and minidump modes: .PP Since no user input is possible, no commands are available.

1 0

Eric Pouech : winedbg: Add ability to reload a minidump.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 348067a9bf2e7b2fe1bfceddf0302da8e3c1c041 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=348067a9bf2e7b2fe1bfced… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:35 2006 +0100 winedbg: Add ability to reload a minidump. - now recognize winedbg foo.mdmp on command line - fleshed out tgt_minidump to reload information from minidump --- programs/winedbg/debugger.h | 3 programs/winedbg/stack.c | 11 + programs/winedbg/tgt_minidump.c | 358 +++++++++++++++++++++++++++++++++++++++ programs/winedbg/winedbg.c | 16 ++ 4 files changed, 385 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=348067a9bf2e7b2fe1b…

1 0

Eric Pouech : winedbg: process_io
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: c918e80ed2fded210cdc2766058067e452ee3341 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c918e80ed2fded210cdc276… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:31 2006 +0100 winedbg: process_io - added ability to specify process_io at process creation/attachment time - created a process_io structure for gdbproxy --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/gdbproxy.c | 11 ++++++++++- programs/winedbg/tgt_active.c | 9 +++++---- programs/winedbg/winedbg.c | 8 +++----- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 68cf2a6..5114138 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -375,6 +375,7 @@ extern void dbg_wait_next_ex extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); +extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe, BOOL wfe); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); @@ -401,9 +402,8 @@ extern int dbg_printf(const char extern int dbg_printf(const char* format, ...); #endif extern const struct dbg_internal_var* dbg_get_internal_var(const char*); -extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe, BOOL wfe); extern BOOL dbg_interrupt_debuggee(void); -extern struct dbg_process* dbg_add_process(DWORD pid, HANDLE h); +extern struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, HANDLE h); extern void dbg_set_process_name(struct dbg_process* p, const char* name); extern struct dbg_process* dbg_get_process(DWORD pid); extern void dbg_del_process(struct dbg_process* p); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ade801c..76496ca 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -102,6 +102,8 @@ struct gdb_context unsigned long wine_segs[3]; /* load addresses of the ELF wine exec segments (text, bss and data) */ }; +static struct be_process_io be_process_gdbproxy_io; + /* =============================================== * * B A S I C M A N I P U L A T I O N S * * =============================================== * @@ -444,7 +446,7 @@ static void handle_debug_event(struct gd switch (de->dwDebugEventCode) { case CREATE_PROCESS_DEBUG_EVENT: - gdbctx->process = dbg_add_process(de->dwProcessId, + gdbctx->process = dbg_add_process(&be_process_gdbproxy_io, de->dwProcessId, de->u.CreateProcessInfo.hProcess); if (!gdbctx->process) break; memory_get_string_indirect(gdbctx->process, @@ -2278,3 +2280,10 @@ int gdb_main(int argc, char* argv[]) return gdb_remote(gdb_flags); return -1; } + +static struct be_process_io be_process_gdbproxy_io = +{ + NULL, /* we shouldn't use close_process() in gdbproxy */ + ReadProcessMemory, + WriteProcessMemory +}; diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index a52d902..d4eaade 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedbg); static char* dbg_last_cmd_line; +static struct be_process_io be_process_active_io; static void dbg_init_current_process(void) { @@ -72,7 +73,7 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL { DEBUG_EVENT de; - if (!(dbg_curr_process = dbg_add_process(pid, 0))) return FALSE; + if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; if (!DebugActiveProcess(pid)) { @@ -436,7 +437,7 @@ static unsigned dbg_handle_debug_event(D break; case CREATE_PROCESS_DEBUG_EVENT: - dbg_curr_process = dbg_add_process(de->dwProcessId, + dbg_curr_process = dbg_add_process(&be_process_active_io, de->dwProcessId, de->u.CreateProcessInfo.hProcess); if (dbg_curr_process == NULL) { @@ -698,7 +699,7 @@ static unsigned dbg_start_debuggee(LPSTR return TRUE; } dbg_curr_pid = info.dwProcessId; - if (!(dbg_curr_process = dbg_add_process(dbg_curr_pid, 0))) return FALSE; + if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, dbg_curr_pid, 0))) return FALSE; dbg_wait_for_first_exception(); return TRUE; @@ -920,7 +921,7 @@ static BOOL tgt_process_active_close_pro return TRUE; } -struct be_process_io be_process_active_io = +static struct be_process_io be_process_active_io = { tgt_process_active_close_process, ReadProcessMemory, diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 472d365..4c2ae00 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -250,11 +250,8 @@ struct dbg_process* dbg_get_process( return p; } -struct dbg_process* dbg_add_process(DWORD pid, HANDLE h) +struct dbg_process* dbg_add_process(const struct be_process_io* pio, DWORD pid, HANDLE h) { - /* FIXME: temporary */ - extern struct be_process_io be_process_active_io; - struct dbg_process* p; if ((p = dbg_get_process(pid))) @@ -266,6 +263,7 @@ struct dbg_process* dbg_add_process(DWOR else { p->handle = h; + p->process_io = pio; p->imageName = NULL; } return p; @@ -274,7 +272,7 @@ struct dbg_process* dbg_add_process(DWOR if (!(p = HeapAlloc(GetProcessHeap(), 0, sizeof(struct dbg_process)))) return NULL; p->handle = h; p->pid = pid; - p->process_io = &be_process_active_io; + p->process_io = pio; p->imageName = NULL; p->threads = NULL; p->continue_on_first_exception = FALSE;

1 0

Eric Pouech : winedbg: main_loop.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: f29d084c37bb812ffd07e6792a142e792a0a4bfe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f29d084c37bb812ffd07e67… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 1 21:05:28 2006 +0100 winedbg: main_loop. - split dbg_main_loop in two parts (one for finishing the debuggee attachment, the second one really for handling the main loop) - removed now longer needed dbg_main_loop --- programs/winedbg/debugger.h | 2 -- programs/winedbg/tgt_active.c | 33 +++++++++++++++------------------ programs/winedbg/winedbg.c | 6 ++++-- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 73e53a2..68cf2a6 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -375,8 +375,6 @@ extern void dbg_wait_next_ex extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); - /* temporary for tgt_active.c */ -extern unsigned dbg_main_loop(HANDLE); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index e778c3d..a52d902 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -644,7 +644,7 @@ void dbg_wait_next_exception(DWORD cont, dbg_curr_thread->exec_count); } -/*static*/ unsigned dbg_main_loop(HANDLE hFile) +static void dbg_wait_for_first_exception(void) { DEBUG_EVENT de; @@ -656,10 +656,6 @@ void dbg_wait_next_exception(DWORD cont, { if (dbg_handle_debug_event(&de)) break; } - dbg_interactiveP = TRUE; - parser_handle(hFile); - - return 0; } static unsigned dbg_start_debuggee(LPSTR cmdLine) @@ -703,6 +699,7 @@ static unsigned dbg_start_debuggee(LPSTR } dbg_curr_pid = info.dwProcessId; if (!(dbg_curr_process = dbg_add_process(dbg_curr_pid, 0))) return FALSE; + dbg_wait_for_first_exception(); return TRUE; } @@ -754,17 +751,12 @@ enum dbg_start dbg_active_attach(int ar /* try the form <myself> pid */ if (argc == 1 && str2int(argv[0], &pid) && pid != 0) { - if (dbg_attach_debuggee(pid, FALSE, FALSE)) - { - dbg_curr_pid = pid; - return start_ok; - } - return start_error_init; + if (!dbg_attach_debuggee(pid, FALSE, FALSE)) + return start_error_init; } - /* try the form <myself> pid evt (Win32 JIT debugger) */ - if (argc == 2 && str2int(argv[0], &pid) && pid != 0 && - str2int(argv[1], &evt) && evt != 0) + else if (argc == 2 && str2int(argv[0], &pid) && pid != 0 && + str2int(argv[1], &evt) && evt != 0) { if (!dbg_attach_debuggee(pid, TRUE, FALSE)) { @@ -778,10 +770,12 @@ enum dbg_start dbg_active_attach(int ar return start_error_init; } CloseHandle((HANDLE)evt); - dbg_curr_pid = pid; - return start_ok; } - return start_error_parse; + else return start_error_parse; + + dbg_curr_pid = pid; + dbg_wait_for_first_exception(); + return start_ok; } /****************************************************************** @@ -895,7 +889,10 @@ enum dbg_start dbg_active_auto(int argc, } else return start_error_parse; if (hFile == INVALID_HANDLE_VALUE) return start_error_parse; - dbg_main_loop(hFile); + + dbg_interactiveP = TRUE; + parser_handle(hFile); + return start_ok; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index cd40734..472d365 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -550,11 +550,13 @@ int main(int argc, char** argv) case start_error_init: return -1; } - retv = dbg_main_loop(hFile); + dbg_interactiveP = TRUE; + parser_handle(hFile); + while (dbg_process_list) dbg_process_list->process_io->close_process(dbg_process_list, TRUE); dbg_save_internal_vars(); - return retv; + return 0; }

1 0

Jacek Caban : shdocvw: Don' t call hlink_navigate if HLNF_OPENINNEWWINDOW is set.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: d3a5921e8eeaab5f33bb074c77bb04d8ccd0fa0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3a5921e8eeaab5f33bb074… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 1 22:06:11 2006 +0100 shdocvw: Don't call hlink_navigate if HLNF_OPENINNEWWINDOW is set. - Don't call hlink_navigate if HLNF_OPENINNEWWINDOW is set. - Remove unneeded call to GetBindInfo. --- dlls/shdocvw/navigate.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index f821558..5a6b45a 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -497,6 +497,7 @@ HRESULT navigate_hlink(WebBrowser *This, bindinfo.cbSize = sizeof(bindinfo); hres = IBindStatusCallback_GetBindInfo(callback, &bindf, &bindinfo); + dump_BINDINFO(&bindinfo); if(bindinfo.dwBindVerb == BINDVERB_POST) { post_data_len = bindinfo.cbStgmedData; if(post_data_len) @@ -558,8 +559,6 @@ static HRESULT WINAPI HlinkFrame_Navigat WebBrowser *This = HLINKFRAME_THIS(iface); IMoniker *mon; LPWSTR location = NULL; - BINDINFO bi = {0}; - DWORD bindf = 0; TRACE("(%p)->(%08lx %p %p %p)\n", This, grfHLNF, pbc, pibsc, pihlNavigate); @@ -568,12 +567,6 @@ static HRESULT WINAPI HlinkFrame_Navigat /* Windows calls GetTargetFrameName here. */ - memset(&bi, 0, sizeof(bi)); - bi.cbSize = sizeof(bi); - - IBindStatusCallback_GetBindInfo(pibsc, &bindf, &bi); - dump_BINDINFO(&bi); - IHlink_GetMonikerReference(pihlNavigate, 1, &mon, &location); if(location) { @@ -583,6 +576,11 @@ static HRESULT WINAPI HlinkFrame_Navigat /* Windows calls GetHlinkSite here */ + if(grfHLNF & HLNF_OPENINNEWWINDOW) { + FIXME("Not supported HLNF_OPENINNEWWINDOW\n"); + return E_NOTIMPL; + } + return navigate_hlink(This, mon, pbc, pibsc); }

1 0

Jacek Caban : mshtml: Beginning support for links opened in a new frame.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: d656f996f118667a9a455c08a950d4f4ab647a0b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d656f996f118667a9a455c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 1 22:04:51 2006 +0100 mshtml: Beginning support for links opened in a new frame. --- dlls/mshtml/htmldoc.c | 2 - dlls/mshtml/mshtml_private.h | 7 ++- dlls/mshtml/navigate.c | 13 ++++-- dlls/mshtml/nsembed.c | 22 +++++++---- dlls/mshtml/nsiface.idl | 44 +++++++++++++++++++++ dlls/mshtml/nsio.c | 21 ++++++++-- dlls/mshtml/nsservice.c | 87 +++++++++++++++++++++++++++++++++++++++++- 7 files changed, 173 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d656f996f118667a9a4…

1 0

Jacek Caban : mshtml: Use NSContainer as 'This' of its window.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 2be7ffdf594594f74a702ebc67a8bf4746bf6bd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2be7ffdf594594f74a702eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 1 22:03:00 2006 +0100 mshtml: Use NSContainer as 'This' of its window. --- dlls/mshtml/nsembed.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 25b44ad..3747ba6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -81,23 +81,23 @@ static ATOM nscontainer_class; static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - HTMLDocument *This; + NSContainer *This; nsresult nsres; static const WCHAR wszTHIS[] = {'T','H','I','S',0}; if(msg == WM_CREATE) { - This = *(HTMLDocument**)lParam; + This = *(NSContainer**)lParam; SetPropW(hwnd, wszTHIS, This); }else { - This = (HTMLDocument*)GetPropW(hwnd, wszTHIS); + This = (NSContainer*)GetPropW(hwnd, wszTHIS); } switch(msg) { case WM_SIZE: TRACE("(%p)->(WM_SIZE)\n", This); - nsres = nsIBaseWindow_SetSize(This->nscontainer->window, + nsres = nsIBaseWindow_SetSize(This->window, LOWORD(lParam), HIWORD(lParam), TRUE); if(NS_FAILED(nsres)) WARN("SetSize failed: %08lx\n", nsres); @@ -106,7 +106,6 @@ static LRESULT WINAPI nsembed_proc(HWND return DefWindowProcW(hwnd, msg, wParam, lParam); } - static void register_nscontainer_class(void) { static WNDCLASSEXW wndclass = { @@ -1034,7 +1033,7 @@ void NSContainer_Create(HTMLDocument *do ret->hwnd = CreateWindowExW(0, wszNsContainer, NULL, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, - GetDesktopWindow(), NULL, hInst, doc); + GetDesktopWindow(), NULL, hInst, ret); nsres = nsIBaseWindow_InitWindow(ret->window, ret->hwnd, NULL, 0, 0, 100, 100); if(NS_SUCCEEDED(nsres)) {

1 0

Gerold J. Wucherpfennig : cabinet: Set proper error information on failures .
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 4f75f8469b5c495ce2e1ba266a6e978289f4886d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f75f8469b5c495ce2e1ba2… Author: Gerold J. Wucherpfennig <gjwucherpfennig(a)gmx.net> Date: Fri Feb 24 14:28:20 2006 +0100 cabinet: Set proper error information on failures. --- dlls/cabinet/cabinet.h | 1 dlls/cabinet/fci.c | 567 +++++++++++++++++++++++++++++------------------- 2 files changed, 341 insertions(+), 227 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4f75f8469b5c495ce2e…

1 0

Rein Klazes : user32: Fix handling of '\b' right flush character in menus.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: cc5b5cea967d466ef4c87d039f63d90a99980b76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc5b5cea967d466ef4c87d0… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Wed Mar 1 16:39:37 2006 +0100 user32: Fix handling of '\b' right flush character in menus. - do not add extra space; modify the tests to confirm this; - right flush to the menu tab stop, not to the menu border; - small fixes to the menu tab stop calculation. --- dlls/user/menu.c | 17 +++++++---------- dlls/user/tests/menu.c | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index e2c6318..673fcc4 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -997,6 +997,7 @@ static void MENU_CalcItemSize( HDC hdc, } itemheight = 0; + lpitem->xTab = 0; if (!menuBar) { if (lpitem->hbmpItem) { @@ -1011,9 +1012,11 @@ static void MENU_CalcItemSize( HDC hdc, lpitem->rect.right += size.cx + 2; itemheight = size.cy + 2; } - lpitem->rect.right += 4 + arrow_bitmap_width + menucharsize.cx; if( !(lppop->dwStyle & MNS_NOCHECK)) lpitem->rect.right += check_bitmap_width; + lpitem->rect.right += 4 + menucharsize.cx; + lpitem->xTab = lpitem->rect.right; + lpitem->rect.right += arrow_bitmap_width; } else if (lpitem->hbmpItem) { /* menuBar */ SIZE size; @@ -1030,7 +1033,6 @@ static void MENU_CalcItemSize( HDC hdc, RECT rc = lpitem->rect; LONG txtheight, txtwidth; - lpitem->xTab = 0; if ( lpitem->fState & MFS_DEFAULT ) { hfontOld = SelectObject( hdc, get_menu_font(TRUE) ); } @@ -1055,8 +1057,7 @@ static void MENU_CalcItemSize( HDC hdc, /* get text size after the tab */ tmpheight = DrawTextW( hdc, p, -1, &tmprc, DT_SINGLELINE|DT_CALCRECT); - lpitem->xTab = menucharsize.cx + - 4 + check_bitmap_width + lpitem->bmpsize.cx + txtwidth; + lpitem->xTab += txtwidth; txtheight = max( txtheight, tmpheight); txtwidth += menucharsize.cx + /* space for the tab */ tmprc.right - tmprc.left; /* space for the short cut */ @@ -1064,13 +1065,8 @@ static void MENU_CalcItemSize( HDC hdc, txtheight = DrawTextW( hdc, lpitem->text, -1, &rc, DT_SINGLELINE|DT_CALCRECT); txtwidth = rc.right - rc.left; - if (strchrW( lpitem->text, '\b' )) - lpitem->rect.right += menucharsize.cx; - lpitem->xTab = 4 + check_bitmap_width + lpitem->bmpsize.cx + - txtwidth; + lpitem->xTab += txtwidth; } - if( (lppop->dwStyle & MNS_NOCHECK)) - lpitem->xTab -= check_bitmap_width; lpitem->rect.right += 2 + txtwidth; itemheight = max( itemheight, max( txtheight + 2, menucharsize.cy + 4)); @@ -1642,6 +1638,7 @@ static void MENU_DrawMenuItem( HWND hwnd } else { + rect.right = lpitem->xTab; uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE; } diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index 7de5d6d..7bb0f94 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -64,7 +64,7 @@ static struct { SIZE sc_size; /* size of the short-cut */ } MOD_txtsizes[] = { { "Pinot &Noir" }, - { "&Merlot\t" }, + { "&Merlot\bF4" }, { "Shira&z\tAlt+S" }, { "" }, { NULL }

1 0

Brandon Woodmansee : riched20: Implement EM_AUTOURLDETECT & EM_GETAUTOURLDETECT.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: dee813b5ff599e3325ef8d9eb774a554d7e08ae2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dee813b5ff599e3325ef8d9… Author: Brandon Woodmansee <wood(a)socal.rr.com> Date: Wed Mar 1 10:49:42 2006 +0000 riched20: Implement EM_AUTOURLDETECT & EM_GETAUTOURLDETECT. --- dlls/riched20/editor.c | 115 ++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/editor.h | 2 - dlls/riched20/editstr.h | 1 dlls/riched20/tests/editor.c | 75 +++++++++++++++++++++++++++ 4 files changed, 186 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index feb99c3..a07f086 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -24,7 +24,7 @@ API implementation status: Messages (ANSI versions not done yet) - - EM_AUTOURLDETECT 2.0 + + EM_AUTOURLDETECT 2.0 + EM_CANPASTE + EM_CANREDO 2.0 + EM_CANUNDO @@ -40,7 +40,7 @@ - EM_FINDWORDBREAK - EM_FMTLINES - EM_FORMATRANGE - - EM_GETAUTOURLDETECT 2.0 + + EM_GETAUTOURLDETECT 2.0 - EM_GETBIDIOPTIONS 3.0 - EM_GETCHARFORMAT (partly done) - EM_GETEDITSTYLE @@ -1290,13 +1290,11 @@ LRESULT WINAPI RichEditANSIWndProc(HWND switch(msg) { - UNSUPPORTED_MSG(EM_AUTOURLDETECT) UNSUPPORTED_MSG(EM_DISPLAYBAND) UNSUPPORTED_MSG(EM_EXLIMITTEXT) UNSUPPORTED_MSG(EM_FINDWORDBREAK) UNSUPPORTED_MSG(EM_FMTLINES) UNSUPPORTED_MSG(EM_FORMATRANGE) - UNSUPPORTED_MSG(EM_GETAUTOURLDETECT) UNSUPPORTED_MSG(EM_GETBIDIOPTIONS) UNSUPPORTED_MSG(EM_GETEDITSTYLE) UNSUPPORTED_MSG(EM_GETIMECOMPMODE) @@ -1447,6 +1445,19 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_SendSelChange(editor); return 0; } + case EM_AUTOURLDETECT: + { + if (wParam==1 || wParam ==0) + { + editor->AutoURLDetect_bEnable = (BOOL)wParam; + return 0; + } + return E_INVALIDARG; + } + case EM_GETAUTOURLDETECT: + { + return editor->AutoURLDetect_bEnable; + } case EM_EXSETSEL: { CHARRANGE *pRange = (CHARRANGE *)lParam; @@ -2089,7 +2100,9 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case WM_CHAR: { WCHAR wstr = LOWORD(wParam); - + if (editor->AutoURLDetect_bEnable) + ME_AutoURLDetect(editor, wstr); + switch (wstr) { case 3: /* Ctrl-C */ @@ -2513,3 +2526,95 @@ LRESULT WINAPI REExtendedRegisterClass(v return result; } + +int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) +{ + struct prefix_s { + char *text; + int length; + } prefixes[12] = { + {"http:", 5}, + {"file:", 6}, + {"mailto:", 8}, + {"ftp:", 5}, + {"https:", 7}, + {"gopher:", 8}, + {"nntp:", 6}, + {"prospero:", 10}, + {"telnet:", 8}, + {"news:", 6}, + {"wais:", 6}, + {"www.", 5} + }; + CHARRANGE ins_pt; + int curf_ef, link_ef, def_ef; + int cur_prefx, prefx_cnt; + int sel_min, sel_max; + int car_pos = 0; + int text_pos=-1; + int URLmin, URLmax; + CHARRANGE url; + FINDTEXTA ft; + CHARFORMAT2W cur_format; + CHARFORMAT2W default_format; + CHARFORMAT2W link; + RichEditANSIWndProc(editor->hWnd, EM_EXGETSEL, (WPARAM) 0, (LPARAM) &ins_pt); + sel_min = ins_pt.cpMin; + sel_max = ins_pt.cpMax; + if (sel_min==sel_max) + car_pos = sel_min; + if (sel_min!=sel_max) + car_pos = ME_GetTextLength(editor)+1; + cur_format.cbSize = sizeof(cur_format); + default_format.cbSize = sizeof(default_format); + RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cur_format); + RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &default_format); + link.cbSize = sizeof(link); + link.dwMask = CFM_LINK | CFM_COLOR | CFM_UNDERLINE; + link.dwEffects = CFE_LINK | CFE_UNDERLINE; + link.crTextColor = RGB(0,0,255); + curf_ef = cur_format.dwEffects & link.dwEffects; + def_ef = default_format.dwEffects & link.dwEffects; + link_ef = link.dwEffects & link.dwEffects; + if (curf_ef == link_ef) + { + if( curChar == '\n' || curChar=='\r' || curChar==' ') + { + ME_SetSelection(editor, car_pos, car_pos); + RichEditANSIWndProc(editor->hWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &default_format); + text_pos=-1; + return 0; + } + } + if (curf_ef == def_ef) + { + cur_prefx = 0; + prefx_cnt = (sizeof(prefixes)/sizeof(struct prefix_s))-1; + while (cur_prefx<=prefx_cnt) + { + if (text_pos == -1) + { + ft.lpstrText = prefixes[cur_prefx].text; + URLmin=max(0,(car_pos-prefixes[cur_prefx].length)); + URLmax=max(0, car_pos); + if ((car_pos == 0) && (ME_GetTextLength(editor) != 0)) + { + URLmax = ME_GetTextLength(editor)+1; + } + ft.chrg.cpMin = URLmin; + ft.chrg.cpMax = URLmax; + text_pos=RichEditANSIWndProc(editor->hWnd, EM_FINDTEXT, FR_DOWN, (LPARAM)&ft); + cur_prefx++; + } + if (text_pos != -1) + { + url.cpMin=text_pos; + url.cpMax=car_pos-1; + ME_SetCharFormat(editor, text_pos, (URLmax-text_pos), &link); + ME_Repaint(editor); + break; + } + } + } + return 0; +} diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7376e28..5cafda1 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -250,7 +250,7 @@ void ME_EmptyUndoStack(ME_TextEditor *ed int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, BOOL bCRLF); ME_DisplayItem *ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int *nItemOffset); void ME_StreamInFill(ME_InStream *stream); - +int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar); extern int me_debug; extern HANDLE me_heap; extern void DoWrap(ME_TextEditor *editor); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 17cf2d8..0911e90 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -317,6 +317,7 @@ typedef struct tagME_TextEditor *TM_SINGLECODEPAGE or TM_MULTICODEPAGE*/ int mode; BOOL bHideSelection; + BOOL AutoURLDetect_bEnable; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4f34a66..8835f08 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -536,6 +536,79 @@ static void test_EM_SETOPTIONS() DestroyWindow(hwndRichEdit); } +static void check_CFE_LINK_rcvd(HWND hwnd, int is_url) +{ + CHARFORMAT2W text_format; + int link_present = 0; + text_format.cbSize = sizeof(text_format); + SendMessage(hwnd, EM_SETSEL, 0, 0); + SendMessage(hwnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &text_format); + link_present = text_format.dwEffects & CFE_LINK; + if (is_url) + { /* control text is url; should get CFE_LINK */ + ok(0 != link_present, "URL Case: CFE_LINK not set.\n"); + } + else + { + ok(0 == link_present, "Non-URL Case: CFE_LINK set.\n"); + } +} + +static HWND new_static_wnd(HWND parent) { + return new_window("Static", 0, parent); +} + +static void test_EM_AUTOURLDETECT(void) +{ + struct urls_s { + char *text; + int is_url; + } urls[12] = { + {"winehq.org", 0}, + {"http://www.winehq.org", 1}, + {"http//winehq.org", 0}, + {"ww.winehq.org", 0}, + {"www.winehq.org", 1}, + {"ftp://192.168.1.1", 1}, + {"ftp//192.168.1.1", 0}, + {"mailto:your@email.com", 1}, + {"prospero:prosperoserver", 1}, + {"telnet:test", 1}, + {"news:newserver", 1}, + {"wais:waisserver", 1} + }; + + int i; + int urlRet=-1; + HWND hwndRichEdit, parent; + + parent = new_static_wnd(NULL); + hwndRichEdit = new_richedit(parent); + /* Try and pass EM_AUTOURLDETECT some test wParam values */ + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); + ok(urlRet==0, "Good wParam: urlRet is: %d\n", urlRet); + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, 1, 0); + ok(urlRet==0, "Good wParam2: urlRet is: %d\n", urlRet); + /* Windows returns -2147024809 (0x80070057) on bad wParam values */ + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, 8, 0); + ok(urlRet==E_INVALIDARG, "Bad wParam: urlRet is: %d\n", urlRet); + urlRet=SendMessage(hwndRichEdit, EM_AUTOURLDETECT, (WPARAM)"h", (LPARAM)"h"); + ok(urlRet==E_INVALIDARG, "Bad wParam2: urlRet is: %d\n", urlRet); + /* for each url, check the text to see if CFE_LINK effect is present */ + for (i = 0; i < sizeof(urls)/sizeof(struct urls_s); i++) { + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, FALSE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); + SendMessage(hwndRichEdit, WM_CHAR, 0, 0); + check_CFE_LINK_rcvd(hwndRichEdit, 0); + SendMessage(hwndRichEdit, EM_AUTOURLDETECT, TRUE, 0); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) urls[i].text); + SendMessage(hwndRichEdit, WM_CHAR, 0, 0); + check_CFE_LINK_rcvd(hwndRichEdit, urls[i].is_url); + } + DestroyWindow(hwndRichEdit); + DestroyWindow(parent); +} + static void test_EM_SCROLL() { int i, j; @@ -686,7 +759,6 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - test_EM_FINDTEXT(); test_EM_SCROLLCARET(); test_EM_SCROLL(); @@ -694,6 +766,7 @@ START_TEST( editor ) test_TM_PLAINTEXT(); test_EM_SETOPTIONS(); test_WM_GETTEXT(); + test_EM_AUTOURLDETECT(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Jeremy White : crypt32: More gcc 2.95 adjustments.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: efccbbfbea3a6d4ae9ea8617a7f23fb0a8f127c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efccbbfbea3a6d4ae9ea861… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Mar 1 09:52:22 2006 -0600 crypt32: More gcc 2.95 adjustments. --- dlls/crypt32/tests/oid.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index cfda412..fc1fdfc 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -356,8 +356,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_RSA_MD5), "Expected %s, got %s\n", szOID_RSA_MD5, info->pszOID); - ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", + U(*info).Algid); } info = CryptFindOIDInfo(CRYPT_OID_INFO_NAME_KEY, (void *)sha1, 0); ok(info != NULL, "Expected to find sha1\n"); @@ -365,8 +365,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n", szOID_OIWSEC_sha1, info->pszOID); - ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", + U(*info).Algid); } info = CryptFindOIDInfo(CRYPT_OID_INFO_ALGID_KEY, &alg, 0); ok(info != NULL, "Expected to find sha1\n"); @@ -374,8 +374,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_OIWSEC_sha1), "Expected %s, got %s\n", szOID_OIWSEC_sha1, info->pszOID); - ok(info->Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_SHA1, "Expected CALG_SHA1, got %d\n", + U(*info).Algid); } info = CryptFindOIDInfo(CRYPT_OID_INFO_SIGN_KEY, algs, 0); ok(info != NULL, "Expected to find md5RSA\n"); @@ -383,8 +383,8 @@ static void test_findOIDInfo(void) { ok(!strcmp(info->pszOID, szOID_RSA_MD5RSA), "Expected %s, got %s\n", szOID_RSA_MD5RSA, info->pszOID); - ok(info->Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", - info->Algid); + ok(U(*info).Algid == CALG_MD5, "Expected CALG_MD5, got %d\n", + U(*info).Algid); } }

1 0

Aric Cyr : wined3d: Reverse GL_BGR to GL_RGB for the D3D RGB formats.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 252c4adb965a26db19c1c9161c40a82b488cb6d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=252c4adb965a26db19c1c91… Author: Aric Cyr <aric.cyr(a)gmail.com> Date: Thu Mar 2 00:45:42 2006 +0900 wined3d: Reverse GL_BGR to GL_RGB for the D3D RGB formats. This fixes texture colours in many D3D games (verified with Age Of Mythology). --- dlls/wined3d/utils.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 90a8292..53a9533 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1703,9 +1703,9 @@ GLenum D3DFmt2GLFmt(IWineD3DDeviceImpl* case WINED3DFMT_Q8W8V8U8: retVal = GL_RGBA; break; case WINED3DFMT_Q16W16V16U16: retVal = GL_COLOR_INDEX; break; /* color buffer */ - case WINED3DFMT_R3G3B2: retVal = GL_BGR; break; - case WINED3DFMT_R5G6B5: retVal = GL_BGR; break; - case WINED3DFMT_R8G8B8: retVal = GL_BGR; break; + case WINED3DFMT_R3G3B2: retVal = GL_RGB; break; + case WINED3DFMT_R5G6B5: retVal = GL_RGB; break; + case WINED3DFMT_R8G8B8: retVal = GL_RGB; break; case WINED3DFMT_A1R5G5B5: retVal = GL_BGRA; break; case WINED3DFMT_X1R5G5B5: retVal = GL_BGRA; break; case WINED3DFMT_A4R4G4B4: retVal = GL_BGRA; break;

1 0

Robert Shearman : ole: Change NORMALEXTREFS to 5, like it is in native.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 9a9981bad5a860368b535360094270426b4dc3e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a9981bad5a860368b53536… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:18:33 2006 +0000 ole: Change NORMALEXTREFS to 5, like it is in native. --- dlls/ole32/marshal.c | 2 +- dlls/ole32/stubmanager.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index aebdba1..8f952f9 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); extern const CLSID CLSID_DfMarshal; /* number of refs given out for normal marshaling */ -#define NORMALEXTREFS 1 /* FIXME: this should be 5, but we have to wait for IRemUnknown support first */ +#define NORMALEXTREFS 5 /* private flag indicating that the caller does not want to notify the stub * when the proxy disconnects or is destroyed */ diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 2f2e297..add7246 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -534,7 +534,7 @@ void stub_manager_release_marshal_data(s if (ifstub->flags & MSHLFLAGS_TABLEWEAK) refs = 0; - else + else if (ifstub->flags & MSHLFLAGS_TABLESTRONG) refs = 1; stub_manager_ext_release(m, refs);

1 0

Robert Shearman : ole: Fix marshaling of proxies for interfaces that haven' t already been unmarshaled.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 857a6d1f63001794ad6370abeab6f610b37f6a90 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=857a6d1f63001794ad6370a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:18:14 2006 +0000 ole: Fix marshaling of proxies for interfaces that haven't already been unmarshaled. --- dlls/ole32/marshal.c | 54 ++++++++++++++++++++++++++++++++------- dlls/ole32/tests/marshal.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index ef3df6e..aebdba1 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -366,25 +366,59 @@ static HRESULT WINAPI Proxy_MarshalInter void* pvDestContext, DWORD mshlflags) { ICOM_THIS_MULTI(struct proxy_manager, lpVtblMarshal, iface); - ULONG res; HRESULT hr; - STDOBJREF stdobjref; struct ifproxy *ifproxy; TRACE("(...,%s,...)\n", debugstr_guid(riid)); hr = proxy_manager_find_ifproxy(This, riid, &ifproxy); - if (FAILED(hr)) + if (SUCCEEDED(hr)) { - ERR("couldn't find proxy for interface %s, error 0x%08lx\n", debugstr_guid(riid), hr); - return hr; + STDOBJREF stdobjref = ifproxy->stdobjref; + /* FIXME: optimization - share out proxy's public references if possible + * instead of making new proxy do a roundtrip through the server */ + stdobjref.cPublicRefs = 0; /* InterlockedDecrement(&This->stdobjref.cPublicRefs) >= 0 ? 1 : 0 */ + + hr = IStream_Write(pStm, &stdobjref, sizeof(stdobjref), NULL); } + else + { + /* we don't have the interface already unmarshaled so we have to + * request the object from the server */ + IRemUnknown *remunk; + IPID *ipid; + REMQIRESULT *qiresults = NULL; + IID iid = *riid; + + /* get the ipid of the first entry */ + /* FIXME: should we implement ClientIdentity on the ifproxies instead + * of the proxy_manager so we use the correct ipid here? */ + ipid = &LIST_ENTRY(list_head(&This->interfaces), struct ifproxy, entry)->stdobjref.ipid; + + /* get IRemUnknown proxy so we can communicate with the remote object */ + hr = proxy_manager_get_remunknown(This, &remunk); - stdobjref = ifproxy->stdobjref; - /* FIXME: optimization - share out proxy's public references if possible - * instead of making new proxy do a roundtrip through the server */ - stdobjref.cPublicRefs = 0; /* InterlockedDecrement(&This->stdobjref.cPublicRefs) >= 0 ? 1 : 0 */ - hr = IStream_Write(pStm, &stdobjref, sizeof(stdobjref), &res); + if (hr == S_OK) + { + hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, + 1, &iid, &qiresults); + if (SUCCEEDED(hr)) + { + hr = IStream_Write(pStm, &qiresults->std, sizeof(qiresults->std), NULL); + if (FAILED(hr)) + { + REMINTERFACEREF rif; + rif.ipid = qiresults->std.ipid; + rif.cPublicRefs = qiresults->std.cPublicRefs; + rif.cPrivateRefs = 0; + IRemUnknown_RemRelease(remunk, 1, &rif); + } + CoTaskMemFree(qiresults); + } + else + ERR("IRemUnknown_RemQueryInterface failed with error 0x%08lx\n", hr); + } + } return hr; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 10c690c..3de88a9 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -472,6 +472,66 @@ static void test_proxy_marshal_and_unmar end_host_object(tid, thread); } +/* tests success case of an interthread marshal and then marshaling the proxy + * using an iid that hasn't previously been unmarshaled */ +static void test_proxy_marshal_and_unmarshal2(void) +{ + HRESULT hr; + IStream *pStream = NULL; + IUnknown *pProxy = NULL; + IUnknown *pProxy2 = NULL; + DWORD tid; + HANDLE thread; + + cLocks = 0; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, CreateStreamOnHGlobal); + tid = start_host_object(pStream, &IID_IUnknown, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &thread); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IUnknown, (void **)&pProxy); + ok_ole_success(hr, CoUnmarshalInterface); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* marshal the proxy */ + hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok_ole_success(hr, CoMarshalInterface); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* unmarshal the second proxy to the object */ + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy2); + ok_ole_success(hr, CoUnmarshalInterface); + IStream_Release(pStream); + + /* now the proxies should be as follows: + * pProxy -> &Test_ClassFactory + * pProxy2 -> &Test_ClassFactory + * they should NOT be as follows: + * pProxy -> &Test_ClassFactory + * pProxy2 -> pProxy + * the above can only really be tested by looking in +ole traces + */ + + ok_more_than_one_lock(); + + IUnknown_Release(pProxy); + + ok_more_than_one_lock(); + + IUnknown_Release(pProxy2); + + ok_no_locks(); + + end_host_object(tid, thread); +} + /* tests that stubs are released when the containing apartment is destroyed */ static void test_marshal_stub_apartment_shutdown(void) { @@ -1930,6 +1990,7 @@ START_TEST(marshal) test_marshal_and_unmarshal_invalid(); test_interthread_marshal_and_unmarshal(); test_proxy_marshal_and_unmarshal(); + test_proxy_marshal_and_unmarshal2(); test_marshal_stub_apartment_shutdown(); test_marshal_proxy_apartment_shutdown(); test_marshal_proxy_mta_apartment_shutdown();

1 0

Robert Shearman : oleaut: Use IsEqualIID in connpt. c instead of memcmp for comparing IIDs.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 269909f53e902014a6c1a5b92689269ec684d424 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=269909f53e902014a6c1a5b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:17:00 2006 +0000 oleaut: Use IsEqualIID in connpt.c instead of memcmp for comparing IIDs. --- dlls/oleaut32/connpt.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index da0ffcc..78f4117 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -160,14 +160,10 @@ static HRESULT WINAPI ConnectionPointImp /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid)) *ppvObject = (IConnectionPoint*)This; - } - else if (memcmp(&IID_IConnectionPoint, riid, sizeof(IID_IConnectionPoint)) == 0) - { + else if (IsEqualIID(&IID_IConnectionPoint, riid)) *ppvObject = (IConnectionPoint*)This; - } /* * Check that we obtained an interface. @@ -433,14 +429,10 @@ static HRESULT WINAPI EnumConnectionsImp /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid)) *ppvObject = (IEnumConnections*)This; - } - else if (memcmp(&IID_IEnumConnections, riid, sizeof(IID_IEnumConnections)) == 0) - { + else if (IsEqualIID(&IID_IEnumConnections, riid)) *ppvObject = (IEnumConnections*)This; - } /* * Check that we obtained an interface.

1 0

Robert Shearman : rpcrt4: Change the stubless parameter attributes to using a bitfield
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 4253b0123932102a6be3d8397f02feea41ef83a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4253b0123932102a6be3d83… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:22:26 2006 +0000 rpcrt4: Change the stubless parameter attributes to using a bitfield (as defined by the PSDK) so the ServerAllocSize part is easier to calculate. --- dlls/rpcrt4/ndr_stubless.c | 133 +++++++++++++++++--------------------------- include/Makefile.in | 1 include/ndrtypes.h | 57 +++++++++++++++++++ 3 files changed, 110 insertions(+), 81 deletions(-) create mode 100644 include/ndrtypes.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4253b0123932102a6be…

1 0

Robert Shearman : rpcrt4: Implement marshaling and unmarshaling for enum types.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: e8877ede800d3fc7b7f79a89bd32c879842ccb84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8877ede800d3fc7b7f79a8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 1 12:21:56 2006 +0000 rpcrt4: Implement marshaling and unmarshaling for enum types. --- dlls/rpcrt4/ndr_marshall.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3045b42..b77c281 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <string.h> #include <assert.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -2985,6 +2986,7 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); *(ULONG *)pStubMsg->Buffer = *(ULONG *)pMemory; pStubMsg->Buffer += sizeof(ULONG); @@ -3007,7 +3009,14 @@ static unsigned char *WINAPI NdrBaseType TRACE("value: %s\n", wine_dbgstr_longlong(*(ULONGLONG*)pMemory)); break; case RPC_FC_ENUM16: - case RPC_FC_ENUM32: + /* only 16-bits on the wire, so do a sanity check */ + if (*(UINT *)pMemory > USHRT_MAX) + RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + *(USHORT *)pStubMsg->Buffer = *(UINT *)pMemory; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%04x\n", *(UINT *)pMemory); + break; default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); } @@ -3055,6 +3064,7 @@ static unsigned char *WINAPI NdrBaseType case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); **(ULONG **)ppMemory = *(ULONG *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(ULONG); @@ -3079,7 +3089,12 @@ static unsigned char *WINAPI NdrBaseType TRACE("value: %s\n", wine_dbgstr_longlong(**(ULONGLONG **)ppMemory)); break; case RPC_FC_ENUM16: - case RPC_FC_ENUM32: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + /* 16-bits on the wire, but int in memory */ + **(UINT **)ppMemory = *(USHORT *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%08x\n", **(UINT **)ppMemory); + break; default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); } @@ -3110,11 +3125,13 @@ static void WINAPI NdrBaseTypeBufferSize case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + case RPC_FC_ENUM16: ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(USHORT) - 1); pStubMsg->BufferLength += sizeof(USHORT); break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM32: ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(ULONG) - 1); pStubMsg->BufferLength += sizeof(ULONG); break; @@ -3134,8 +3151,6 @@ static void WINAPI NdrBaseTypeBufferSize ALIGN_LENGTH(pStubMsg->BufferLength, sizeof(error_status_t) - 1); pStubMsg->BufferLength += sizeof(error_status_t); break; - case RPC_FC_ENUM16: - case RPC_FC_ENUM32: default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); } @@ -3172,6 +3187,7 @@ static unsigned long WINAPI NdrBaseTypeM return sizeof(error_status_t); case RPC_FC_ENUM16: case RPC_FC_ENUM32: + return sizeof(INT); default: FIXME("Unhandled base type: 0x%02x\n", *pFormat); return 0;

1 0

Juan Lang : crypt32: Use CertFindCertificateInStore to simplify adding certificates.
by Alexandre Julliard 02 Mar '06

02 Mar '06

Module: wine Branch: refs/heads/master Commit: 661d80708b5c57308c22684ba8372e33c991cd8e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=661d80708b5c57308c22684… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Mar 1 08:38:32 2006 -0800 crypt32: Use CertFindCertificateInStore to simplify adding certificates. --- dlls/crypt32/store.c | 78 ++++++++++++++++++-------------------------------- 1 files changed, 28 insertions(+), 50 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 840d168..47e595c 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -373,74 +373,50 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_ { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; BOOL add = FALSE, ret; + PCCERT_CONTEXT existing = NULL; TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); - switch (dwAddDisposition) - { - case CERT_STORE_ADD_ALWAYS: - add = TRUE; - break; - case CERT_STORE_ADD_NEW: + if (dwAddDisposition != CERT_STORE_ADD_ALWAYS) { - BYTE hashToAdd[20], hash[20]; + BYTE hashToAdd[20]; DWORD size = sizeof(hashToAdd); ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, hashToAdd, &size); if (ret) { - PWINE_CERT_LIST_ENTRY cursor; + CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd }; - /* Add if no cert with the same hash is found. */ - add = TRUE; - EnterCriticalSection(&ms->cs); - LIST_FOR_EACH_ENTRY(cursor, &ms->certs, WINE_CERT_LIST_ENTRY, entry) - { - size = sizeof(hash); - ret = CertGetCertificateContextProperty(&cursor->cert.cert, - CERT_HASH_PROP_ID, hash, &size); - if (ret && !memcmp(hashToAdd, hash, size)) - { - TRACE("found matching certificate, not adding\n"); - SetLastError(CRYPT_E_EXISTS); - add = FALSE; - break; - } - } - LeaveCriticalSection(&ms->cs); + existing = CertFindCertificateInStore(store, + cert->cert.dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, + NULL); + } + } + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + add = TRUE; + break; + case CERT_STORE_ADD_NEW: + { + if (existing) + { + TRACE("found matching certificate, not adding\n"); + SetLastError(CRYPT_E_EXISTS); + add = FALSE; } + else + add = TRUE; break; } case CERT_STORE_ADD_REPLACE_EXISTING: { - BYTE hashToAdd[20], hash[20]; - DWORD size = sizeof(hashToAdd); - add = TRUE; - ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, - hashToAdd, &size); - if (ret) + if (existing) { - PWINE_CERT_LIST_ENTRY cursor, next; - - /* Look for existing cert to delete */ - EnterCriticalSection(&ms->cs); - LIST_FOR_EACH_ENTRY_SAFE(cursor, next, &ms->certs, - WINE_CERT_LIST_ENTRY, entry) - { - size = sizeof(hash); - ret = CertGetCertificateContextProperty(&cursor->cert.cert, - CERT_HASH_PROP_ID, hash, &size); - if (ret && !memcmp(hashToAdd, hash, size)) - { - TRACE("found matching certificate, replacing\n"); - list_remove(&cursor->entry); - CertFreeCertificateContext((PCCERT_CONTEXT)cursor); - break; - } - } - LeaveCriticalSection(&ms->cs); + TRACE("found matching certificate, replacing\n"); + CertDeleteCertificateFromStore(existing); } break; } @@ -448,6 +424,8 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_ FIXME("Unimplemented add disposition %ld\n", dwAddDisposition); add = FALSE; } + if (existing) + CertFreeCertificateContext(existing); if (add) { PWINE_CERT_LIST_ENTRY entry = CryptMemAlloc(

1 0

Jon Parshall : shell32: New icons for Desktop and My Computer.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: b84c9d41e4a16d5f3bb4c466e80c5011f82cc95d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b84c9d41e4a16d5f3bb4c46… Author: Jon Parshall <jparshall(a)codeweavers.com> Date: Wed Mar 1 14:08:45 2006 +0800 shell32: New icons for Desktop and My Computer. --- dlls/shell32/shres.rc | 482 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 361 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b84c9d41e4a16d5f3bb…

1 0

Jason Edmeades : user32: Ensure VK_UP displays the popup menu for the selected item if
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: 24dc3de4c952b1205c637d0a165a04ae389ed0f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24dc3de4c952b1205c637d0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Mar 1 12:39:09 2006 +0100 user32: Ensure VK_UP displays the popup menu for the selected item if the popup menu is not visible --- dlls/user/menu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index a72e922..e2c6318 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -3053,19 +3053,19 @@ static BOOL MENU_TrackMenu( HMENU hmenu, case VK_END: MENU_SelectItem( mt.hOwnerWnd, mt.hCurrentMenu, NO_SELECTED_ITEM, FALSE, 0 ); - /* fall through */ - case VK_UP: MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, (msg.wParam == VK_HOME)? ITEM_NEXT : ITEM_PREV ); break; + case VK_UP: case VK_DOWN: /* If on menu bar, pull-down the menu */ menu = MENU_GetMenu( mt.hCurrentMenu ); if (!(menu->wFlags & MF_POPUP)) mt.hCurrentMenu = MENU_ShowSubPopup(mt.hOwnerWnd, mt.hTopMenu, TRUE, wFlags); else /* otherwise try to move selection */ - MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, ITEM_NEXT ); + MENU_MoveSelection( mt.hOwnerWnd, mt.hCurrentMenu, + (msg.wParam == VK_UP)? ITEM_PREV : ITEM_NEXT ); break; case VK_LEFT:

1 0

Marcus Meissner : PACKAGING: Mention more libraries / tools in the needed dependencies section.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: ec2cb1871cdf15ba13515eeef31480a0fbcf81c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec2cb1871cdf15ba13515ee… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Mar 1 07:10:34 2006 +0100 PACKAGING: Mention more libraries / tools in the needed dependencies section. --- documentation/PACKAGING | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/documentation/PACKAGING b/documentation/PACKAGING index 9a34630..dd04422 100644 --- a/documentation/PACKAGING +++ b/documentation/PACKAGING @@ -64,6 +64,9 @@ they should appear as "Suggests" or "Rec better support of fonts than using the X11 fonts engine. It is only needed for the X11 back end engine. Used from GDI. + * fontforge: http://sourceforge.net/projects/fontforge/ + Used by WINE to create our own set of TrueType fonts during build. + * fontconfig Used to find TrueType fonts for rendering with freetype. Used by GDI. @@ -119,6 +122,15 @@ they should appear as "Suggests" or "Rec Xi - X Input handling (for asian input methods mostly) Xext - X extensions + * libxml2, libxslt + These two libraries are used for our msxml3.dll implementation. + + * prelink + Used during build to locate WINE at a specific virtual address. + + * capi4linux + Used to implement our capi2032.dll. + GOALS ~~~~~

1 0

Gerald Pfeifer : README: Fix spelling Red Hat. Remove unneeded references to Debian
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: 2d979b6a893e0d3a918d801b25bcf010e4fcbe35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d979b6a893e0d3a918d801… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Feb 28 23:19:19 2006 +0100 README: Fix spelling Red Hat. Remove unneeded references to Debian and Red Hat. Document the use of libxml2 as a weak prerequisite. --- README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 3468646..029f592 100644 --- a/README +++ b/README @@ -70,7 +70,7 @@ Supported file systems: Basic requirements: You need to have the X11 development include files installed - (called xlib6g-dev in Debian and XFree86-devel in RedHat). + (called xlib6g-dev in Debian and XFree86-devel in Red Hat). Build tool requirements: On x86 Systems gcc >= 2.7.2 is required. @@ -81,12 +81,12 @@ Build tool requirements: Of course you also need "make" (most likely GNU make). - You also need flex version 2.5 or later and bison. If you are - using RedHat or Debian, install the flex and bison packages. + You also need flex version 2.5 or later and bison. Optional support libraries: If you want CUPS printing support, please install both cups and cups-devel packages. + Install the libxml2 package to get a functional msxml implementation. 4. COMPILATION

1 0

Mike McCormack : server: Print a message if wineserver crashes and we don' t dump cores.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: 0cd0626de019c8ca288ed8a61a053c0f485c5c5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0cd0626de019c8ca288ed8a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 1 01:07:04 2006 +0900 server: Print a message if wineserver crashes and we don't dump cores. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ server/signal.c | 26 ++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 392808f..9e163c8 100755 --- a/configure +++ b/configure @@ -7038,6 +7038,7 @@ done + for ac_header in \ IOKit/IOKitLib.h \ alsa/asoundlib.h \ @@ -7119,6 +7120,7 @@ for ac_header in \ sys/poll.h \ sys/ptrace.h \ sys/reg.h \ + sys/resource.h \ sys/scsiio.h \ sys/shm.h \ sys/signal.h \ diff --git a/configure.ac b/configure.ac index e88d337..f2f910d 100644 --- a/configure.ac +++ b/configure.ac @@ -252,6 +252,7 @@ AC_CHECK_HEADERS(\ sys/poll.h \ sys/ptrace.h \ sys/reg.h \ + sys/resource.h \ sys/scsiio.h \ sys/shm.h \ sys/signal.h \ diff --git a/include/config.h.in b/include/config.h.in index 18f1127..d2c9f3b 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -734,6 +734,9 @@ /* Define to 1 if you have the <sys/reg.h> header file. */ #undef HAVE_SYS_REG_H +/* Define to 1 if you have the <sys/resource.h> header file. */ +#undef HAVE_SYS_RESOURCE_H + /* Define to 1 if you have the <sys/scsiio.h> header file. */ #undef HAVE_SYS_SCSIIO_H diff --git a/server/signal.c b/server/signal.c index 0c2a579..e12532e 100644 --- a/server/signal.c +++ b/server/signal.c @@ -28,6 +28,9 @@ #ifdef HAVE_SYS_POLL_H #include <sys/poll.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include <unistd.h> #include "file.h" @@ -215,6 +218,13 @@ static void do_sigchld( int signum ) do_signal( handler_sigchld ); } +/* SIGSEGV handler */ +static void do_sigsegv( int signum ) +{ + fprintf( stderr, "wineserver crashed, please report this.\n"); + abort(); +} + /* SIGIO handler */ #ifdef HAVE_SIGINFO_T_SI_FD static void do_sigio( int signum, siginfo_t *si, void *x ) @@ -241,6 +251,17 @@ int watchdog_triggered(void) return watchdog != 0; } +static int core_dump_disabled( void ) +{ + int r = 0; +#ifdef RLIMIT_CORE + struct rlimit lim; + + r = !getrlimit(RLIMIT_CORE, &lim) && (lim.rlim_cur == 0); +#endif + return r; +} + void init_signals(void) { struct sigaction action; @@ -279,6 +300,11 @@ void init_signals(void) action.sa_handler = do_sigterm; sigaction( SIGQUIT, &action, NULL ); sigaction( SIGTERM, &action, NULL ); + if (core_dump_disabled()) + { + action.sa_handler = do_sigsegv; + sigaction( SIGSEGV, &action, NULL ); + } action.sa_handler = SIG_IGN; sigaction( SIGXFSZ, &action, NULL ); #ifdef HAVE_SIGINFO_T_SI_FD

1 0

Vitaliy Margolen : x11drv: Convert 24-bit into 32-bit color before looking for an
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: 20a886164f8368af6c47d8891703ff83b6049b29 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=20a886164f8368af6c47d88… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Feb 25 23:15:44 2006 -0700 x11drv: Convert 24-bit into 32-bit color before looking for an available screen resolution. We do this during enumeration, so there would be no 24-bit modes available. --- dlls/x11drv/settings.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/x11drv/settings.c b/dlls/x11drv/settings.c index 5e3665f..5187b8b 100644 --- a/dlls/x11drv/settings.c +++ b/dlls/x11drv/settings.c @@ -237,7 +237,7 @@ static const char * _DM_fields(DWORD fie LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lpvoid ) { - DWORD i; + DWORD i, dwBpp; DEVMODEW dm; TRACE("(%s,%p,%p,0x%08lx,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); @@ -259,12 +259,13 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPC } devmode = &dm; } + dwBpp = (devmode->dmBitsPerPel == 24) ? 32 : devmode->dmBitsPerPel; for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) { - if (devmode->dmBitsPerPel != dd_modes[i].dwBPP) + if (dwBpp != dd_modes[i].dwBPP) continue; } if (devmode->dmFields & DM_PELSWIDTH)

1 0

Juan Lang : crypt32: Eliminate an unnecessary function pointer from stores.
by Alexandre Julliard 01 Mar '06

01 Mar '06

Module: wine Branch: refs/heads/master Commit: ba2c1e51164efc91e1998e09821cf31a4f226be2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba2c1e51164efc91e1998e0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Feb 28 09:08:03 2006 -0800 crypt32: Eliminate an unnecessary function pointer from stores. --- dlls/crypt32/store.c | 81 +++++++++++++++++++++++--------------------------- 1 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 444d9c3..840d168 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -135,14 +135,13 @@ typedef struct _WINE_CERT_CONTEXT_REF * struct _WINE_CERT_CONTEXT; -/* Called to create a new reference to an existing cert context. Should call - * CRYPT_InitCertRef to make sure the reference count is properly updated. - * If the store does not provide any additional allocated data (that is, does - * not need to implement a FreeCertFunc), it may use CRYPT_CreateCertRef for - * this. +/* Called to add a new certificate context to a store. The context does not + * yet have a reference. If ppStoreContext is not NULL, a reference to the + * added context should be returned in *ppStoreContext. */ -typedef struct _WINE_CERT_CONTEXT_REF * (*CreateRefFunc) - (struct _WINE_CERT_CONTEXT *context, HCERTSTORE store); +typedef BOOL (*AddCertFunc)(struct WINE_CRYPTCERTSTORE *store, + struct _WINE_CERT_CONTEXT *context, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext); /* Optional, called when a cert context reference is being freed. Don't free * the ref pointer itself, CertFreeCertificateContext does that. @@ -161,7 +160,6 @@ typedef enum _CertStoreType { * is still needed to distinguish collection stores from other types. * On the function pointers: * - closeStore is called when the store's ref count becomes 0 - * - addCert is called with a PWINE_CERT_CONTEXT as the second parameter * - control is optional, but should be implemented by any store that supports * persistence */ @@ -173,8 +171,7 @@ typedef struct WINE_CRYPTCERTSTORE HCRYPTPROV cryptProv; CertStoreType type; PFN_CERT_STORE_PROV_CLOSE closeStore; - PFN_CERT_STORE_PROV_WRITE_CERT addCert; - CreateRefFunc createCertRef; + AddCertFunc addCert; EnumCertFunc enumCert; PFN_CERT_STORE_PROV_DELETE_CERT deleteCert; DupCertFunc dupCert; @@ -370,13 +367,14 @@ static PWINE_CERT_CONTEXT_REF CRYPT_Crea return pCertRef; } -static BOOL WINAPI CRYPT_MemAddCert(HCERTSTORE store, PCCERT_CONTEXT pCert, - DWORD dwAddDisposition) +static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, + PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) { WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; BOOL add = FALSE, ret; - TRACE("(%p, %p, %ld)\n", store, pCert, dwAddDisposition); + TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); switch (dwAddDisposition) { @@ -388,8 +386,8 @@ static BOOL WINAPI CRYPT_MemAddCert(HCER BYTE hashToAdd[20], hash[20]; DWORD size = sizeof(hashToAdd); - ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)pCert, - CERT_HASH_PROP_ID, hashToAdd, &size); + ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, + hashToAdd, &size); if (ret) { PWINE_CERT_LIST_ENTRY cursor; @@ -420,8 +418,8 @@ static BOOL WINAPI CRYPT_MemAddCert(HCER DWORD size = sizeof(hashToAdd); add = TRUE; - ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)pCert, - CERT_HASH_PROP_ID, hashToAdd, &size); + ret = CRYPT_GetCertificateContextProperty(cert, CERT_HASH_PROP_ID, + hashToAdd, &size); if (ret) { PWINE_CERT_LIST_ENTRY cursor, next; @@ -458,10 +456,13 @@ static BOOL WINAPI CRYPT_MemAddCert(HCER if (entry) { TRACE("adding %p\n", entry); - CRYPT_InitCertRef(&entry->cert, (PWINE_CERT_CONTEXT)pCert, store); + CRYPT_InitCertRef(&entry->cert, cert, store); EnterCriticalSection(&ms->cs); list_add_tail(&ms->certs, &entry->entry); LeaveCriticalSection(&ms->cs); + if (ppStoreContext) + *ppStoreContext = + CertDuplicateCertificateContext((PCCERT_CONTEXT)entry); ret = TRUE; } else @@ -612,7 +613,6 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpe CRYPT_InitStore(&store->hdr, hCryptProv, dwFlags, StoreTypeMem); store->hdr.closeStore = CRYPT_MemCloseStore; store->hdr.addCert = CRYPT_MemAddCert; - store->hdr.createCertRef = CRYPT_CreateCertRef; store->hdr.enumCert = CRYPT_MemEnumCert; store->hdr.deleteCert = CRYPT_MemDeleteCert; store->hdr.freeCert = NULL; @@ -625,14 +625,15 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpe return (PWINECRYPT_CERTSTORE)store; } -static BOOL WINAPI CRYPT_CollectionAddCert(HCERTSTORE store, - PCCERT_CONTEXT pCert, DWORD dwAddDisposition) +static BOOL CRYPT_CollectionAddCert(PWINECRYPT_CERTSTORE store, + PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) { PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; PWINE_STORE_LIST_ENTRY entry, next; BOOL ret; - TRACE("(%p, %p, %ld)\n", store, pCert, dwAddDisposition); + TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); ret = FALSE; EnterCriticalSection(&cs->cs); @@ -641,7 +642,8 @@ static BOOL WINAPI CRYPT_CollectionAddCe { if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG) { - ret = entry->store->addCert(entry->store, pCert, dwAddDisposition); + ret = entry->store->addCert(entry->store, cert, dwAddDisposition, + ppStoreContext); break; } } @@ -837,7 +839,6 @@ static WINECRYPT_CERTSTORE *CRYPT_Collec StoreTypeCollection); store->hdr.closeStore = CRYPT_CollectionCloseStore; store->hdr.addCert = CRYPT_CollectionAddCert; - store->hdr.createCertRef = CRYPT_CollectionCreateCertRef; store->hdr.enumCert = CRYPT_CollectionEnumCert; store->hdr.deleteCert = CRYPT_CollectionDeleteCert; store->hdr.dupCert = CRYPT_CollectionDupCert; @@ -862,15 +863,16 @@ static void WINAPI CRYPT_ProvCloseStore( CryptMemFree(store); } -static BOOL WINAPI CRYPT_ProvAddCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert, - DWORD dwAddDisposition) +static BOOL CRYPT_ProvAddCert(PWINECRYPT_CERTSTORE store, + PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition, + PCCERT_CONTEXT *ppStoreContext) { - PWINE_PROVIDERSTORE store = (PWINE_PROVIDERSTORE)hCertStore; + PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; BOOL ret; - TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwAddDisposition); + TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext); - if (store->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG) + if (ps->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG) { SetLastError(ERROR_ACCESS_DENIED); ret = FALSE; @@ -878,12 +880,12 @@ static BOOL WINAPI CRYPT_ProvAddCert(HCE else { ret = TRUE; - if (store->provWriteCert) - ret = store->provWriteCert(store->hStoreProv, cert, + if (ps->provWriteCert) + ret = ps->provWriteCert(ps->hStoreProv, (PCCERT_CONTEXT)cert, CERT_STORE_PROV_WRITE_ADD_FLAG); if (ret) - ret = store->memStore->addCert(store->memStore, cert, - dwAddDisposition); + ret = ps->memStore->addCert(ps->memStore, cert, + dwAddDisposition, ppStoreContext); } return ret; } @@ -1006,7 +1008,6 @@ static PWINECRYPT_CERTSTORE CRYPT_ProvCr ret->hStoreProv = pProvInfo->hStoreProv; ret->hdr.closeStore = CRYPT_ProvCloseStore; ret->hdr.addCert = CRYPT_ProvAddCert; - ret->hdr.createCertRef = CRYPT_ProvCreateCertRef; ret->hdr.enumCert = CRYPT_ProvEnumCert; ret->hdr.deleteCert = CRYPT_ProvDeleteCert; ret->hdr.dupCert = CRYPT_ProvDupCert; @@ -2478,12 +2479,7 @@ BOOL WINAPI CertAddCertificateContextToS CryptMemFree(buf); LeaveCriticalSection(&ref->context->cs); if (ret) - { - ret = store->addCert(store, (PCCERT_CONTEXT)cert, dwAddDisposition); - if (ret && ppStoreContext) - *ppStoreContext = (PCCERT_CONTEXT)store->createCertRef(cert, - hCertStore); - } + ret = store->addCert(store, cert, dwAddDisposition, ppStoreContext); if (!ret) CRYPT_FreeCert(cert); } @@ -2513,10 +2509,7 @@ BOOL WINAPI CertAddEncodedCertificateToS if (cert) { - ret = hcs->addCert(hcs, (PCCERT_CONTEXT)cert, dwAddDisposition); - if (ret && ppCertContext) - *ppCertContext = (PCCERT_CONTEXT)hcs->createCertRef(cert, - hCertStore); + ret = hcs->addCert(hcs, cert, dwAddDisposition, ppCertContext); if (!ret) CRYPT_FreeCert(cert); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006