October 2006 - Wine-commits

James Hawkins : msi: Assign the property to path if the property is empty.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: e3496be256a563c97e91871ef21f149bae4d63be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3496be256a563c97e91871ef… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 14:59:52 2006 -0700 msi: Assign the property to path if the property is empty. --- dlls/msi/dialog.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index fcbd766..b4e9ce3 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1456,6 +1456,9 @@ static void msi_dialog_update_pathedit( prop = msi_dialog_dup_property( dialog, control->property, indirect ); path = msi_dup_property( dialog->package, prop ); + if (!path) + path = prop; + SetWindowTextW( control->hwnd, path ); SendMessageW( control->hwnd, EM_SETSEL, 0, -1 ); @@ -2083,7 +2086,10 @@ static void msi_dialog_update_directory_ indirect = control->attributes & msidbControlAttributesIndirect; prop = msi_dialog_dup_property( dialog, control->property, indirect ); + path = msi_dup_property( dialog->package, prop ); + if (!path) + path = prop; PathStripPathW( path ); PathRemoveBackslashW( path ); @@ -2140,7 +2146,10 @@ static void msi_dialog_update_directory_ indirect = control->attributes & msidbControlAttributesIndirect; prop = msi_dialog_dup_property( dialog, control->property, indirect ); + path = msi_dup_property( dialog->package, prop ); + if (!path) + path = prop; lstrcpyW( dir_spec, path ); lstrcatW( dir_spec, asterisk ); @@ -2182,6 +2191,8 @@ UINT msi_dialog_directorylist_up( msi_di prop = msi_dialog_dup_property( dialog, control->property, indirect ); path = msi_dup_property( dialog->package, prop ); + if (!path) + path = prop; /* strip off the last directory */ ptr = PathFindFileNameW( path ); @@ -2230,7 +2241,10 @@ static UINT msi_dialog_dirlist_handler( indirect = control->attributes & msidbControlAttributesIndirect; prop = msi_dialog_dup_property( dialog, control->property, indirect ); + path = msi_dup_property( dialog->package, prop ); + if (!path) + path = prop; lstrcpyW( new_path, path ); lstrcatW( new_path, text );

1 0

James Hawkins : msi: Add missing '\n' to TRACE output.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 1bfc50eb74f7a434039db54e78737d74062053f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bfc50eb74f7a434039db54e7… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 14:59:01 2006 -0700 msi: Add missing '\n' to TRACE output. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 74eefe5..11719dd 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2964,7 +2964,7 @@ static LRESULT msi_dialog_onnotify( msi_ LPNMHDR nmhdr = (LPNMHDR) param; msi_control *control = msi_dialog_find_control_by_hwnd( dialog, nmhdr->hwndFrom ); - TRACE("%p %p", dialog, nmhdr->hwndFrom); + TRACE("%p %p\n", dialog, nmhdr->hwndFrom); if ( control && control->handler ) control->handler( dialog, control, param );

1 0

James Hawkins : msi: Don't ERR if a dialog doesn' t provide control conditions, as they are not required.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 038d31ca93f0fee8af13b5863d3da07536de0945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038d31ca93f0fee8af13b5863… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 14:59:16 2006 -0700 msi: Don't ERR if a dialog doesn't provide control conditions, as they are not required. --- dlls/msi/dialog.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 11719dd..fcbd766 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2529,10 +2529,7 @@ static UINT msi_dialog_evaluate_control_ /* query the Control table for all the elements of the control */ r = MSI_OpenQuery( package->db, &view, query, dialog->name ); if( r != ERROR_SUCCESS ) - { - ERR("query failed for dialog %s\n", debugstr_w(dialog->name)); - return ERROR_INVALID_PARAMETER; - } + return ERROR_SUCCESS; r = MSI_IterateRecords( view, 0, msi_dialog_set_control_condition, dialog ); msiobj_release( &view->hdr );

1 0

Roderick Colenbrander : x11drv: Fix wgl pixel format bug.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 9461c0c63471494ee6aa2b358db2956ba8ca08e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9461c0c63471494ee6aa2b358… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Oct 3 22:56:20 2006 +0200 x11drv: Fix wgl pixel format bug. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 24b30cb..64b1166 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1203,7 +1203,7 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDE /* We can only render using the iPixelFormat (1) of Wine's Main visual, we need to get the correspondig GLX format. * If this fails something is very wrong on the system. */ - if(!ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, &tmp, &fmt_index)) { + if(!ConvertPixelFormatWGLtoGLX(gdi_display, hdcPF, &fmt_index, &tmp)) { ERR("Cannot get FB Config for main iPixelFormat 1, expect problems!\n"); SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL;

1 0

Roderick Colenbrander : gdi32: Route WGL font code through gdi32.dll.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 95a67ab3733bb161433f9181c5d9c20586baff7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a67ab3733bb161433f9181c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Oct 3 21:22:22 2006 +0200 gdi32: Route WGL font code through gdi32.dll. --- dlls/gdi/driver.c | 2 ++ dlls/gdi/gdi32.spec | 2 ++ dlls/gdi/gdi_private.h | 2 ++ dlls/gdi/opengl.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/opengl32/opengl32.spec | 4 ++-- dlls/opengl32/wgl.c | 28 ---------------------------- dlls/winex11.drv/opengl.c | 27 ++++++++------------------- 7 files changed, 54 insertions(+), 49 deletions(-) diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c index b0e3f24..16c48e5 100644 --- a/dlls/gdi/driver.c +++ b/dlls/gdi/driver.c @@ -198,6 +198,8 @@ #define GET_FUNC(name) driver->funcs.p## /* OpenGL32 */ GET_FUNC(wglCreateContext); GET_FUNC(wglMakeCurrent); + GET_FUNC(wglUseFontBitmapsA); + GET_FUNC(wglUseFontBitmapsW); #undef GET_FUNC } else memset( &driver->funcs, 0, sizeof(driver->funcs) ); diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index 73dd0c3..b1883a7 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -500,6 +500,8 @@ # Wine extensions: OpenGL support # @ stdcall wglCreateContext(long) @ stdcall wglMakeCurrent(long long) +@ stdcall wglUseFontBitmapsA(long long long long) +@ stdcall wglUseFontBitmapsW(long long long long) ################################################################ # Wine extensions: Win16 functions that are needed by other dlls diff --git a/dlls/gdi/gdi_private.h b/dlls/gdi/gdi_private.h index e63308c..02a1348 100644 --- a/dlls/gdi/gdi_private.h +++ b/dlls/gdi/gdi_private.h @@ -186,6 +186,8 @@ typedef struct tagDC_FUNCS /* OpenGL32 */ HGLRC (*pwglCreateContext)(PHYSDEV); BOOL (*pwglMakeCurrent)(PHYSDEV, HGLRC); + BOOL (*pwglUseFontBitmapsA)(PHYSDEV, DWORD, DWORD, DWORD); + BOOL (*pwglUseFontBitmapsW)(PHYSDEV, DWORD, DWORD, DWORD); } DC_FUNCTIONS; /* It should not be necessary to access the contents of the GdiPath diff --git a/dlls/gdi/opengl.c b/dlls/gdi/opengl.c index b601250..25ca345 100644 --- a/dlls/gdi/opengl.c +++ b/dlls/gdi/opengl.c @@ -74,3 +74,41 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLR GDI_ReleaseObj( hdc); return ret; } + +/*********************************************************************** + * wglUseFontBitmapsA (OPENGL32.@) + */ +BOOL WINAPI wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase) +{ + BOOL ret = FALSE; + DC * dc = DC_GetDCPtr( hdc ); + + TRACE("(%p, %ld, %ld, %ld)\n", hdc, first, count, listBase); + + if (!dc) return FALSE; + + if (!dc->funcs->pwglUseFontBitmapsA) FIXME(" :stub\n"); + else ret = dc->funcs->pwglUseFontBitmapsA(dc->physDev, first, count, listBase); + + GDI_ReleaseObj( hdc); + return ret; +} + +/*********************************************************************** + * wglUseFontBitmapsW (OPENGL32.@) + */ +BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase) +{ + BOOL ret = FALSE; + DC * dc = DC_GetDCPtr( hdc ); + + TRACE("(%p, %ld, %ld, %ld)\n", hdc, first, count, listBase); + + if (!dc) return FALSE; + + if (!dc->funcs->pwglUseFontBitmapsW) FIXME(" :stub\n"); + else ret = dc->funcs->pwglUseFontBitmapsW(dc->physDev, first, count, listBase); + + GDI_ReleaseObj( hdc); + return ret; +} diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index dbd93b2..7fb060c 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -394,7 +394,7 @@ @ stdcall wglShareLists(long long) @ stdcall wglSwapBuffers(long) gdi32.SwapBuffers @ stdcall wglSwapLayerBuffers(long long) -@ stdcall wglUseFontBitmapsA(long long long long) -@ stdcall wglUseFontBitmapsW(long long long long) +@ stdcall wglUseFontBitmapsA(long long long long) gdi32.wglUseFontBitmapsA +@ stdcall wglUseFontBitmapsW(long long long long) gdi32.wglUseFontBitmapsW @ stdcall wglUseFontOutlinesA(long long long long long long long ptr) @ stdcall wglUseFontOutlinesW(long long long long long long long ptr) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index f593b01..516e096 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -52,8 +52,6 @@ typedef struct wine_wgl_s { HDC WINAPI (*p_wglGetCurrentDC)(void); PROC WINAPI (*p_wglGetProcAddress)(LPCSTR lpszProc); BOOL WINAPI (*p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); - BOOL WINAPI (*p_wglUseFontBitmapsA)(HDC hdc, DWORD first, DWORD count, DWORD listBase); - BOOL WINAPI (*p_wglUseFontBitmapsW)(HDC hdc, DWORD first, DWORD count, DWORD listBase); void WINAPI (*p_wglGetIntegerv)(GLenum pname, GLint* params); } wine_wgl_t; @@ -327,30 +325,6 @@ BOOL WINAPI wglSwapLayerBuffers(HDC hdc, return TRUE; } -/*********************************************************************** - * wglUseFontBitmapsA (OPENGL32.@) - */ -BOOL WINAPI wglUseFontBitmapsA(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase) -{ - TRACE("(%p, %ld, %ld, %ld)\n", hdc, first, count, listBase); - return wine_wgl.p_wglUseFontBitmapsA(hdc, first, count, listBase); -} - -/*********************************************************************** - * wglUseFontBitmapsW (OPENGL32.@) - */ -BOOL WINAPI wglUseFontBitmapsW(HDC hdc, - DWORD first, - DWORD count, - DWORD listBase) -{ - TRACE("(%p, %ld, %ld, %ld)\n", hdc, first, count, listBase); - return wine_wgl.p_wglUseFontBitmapsW(hdc, first, count, listBase); -} - #ifdef HAVE_GL_GLU_H static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) @@ -680,8 +654,6 @@ static BOOL process_attach(void) wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod, "wglGetCurrentDC"); wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod, "wglGetProcAddress"); wine_wgl.p_wglShareLists = (void *)GetProcAddress(mod, "wglShareLists"); - wine_wgl.p_wglUseFontBitmapsA = (void*)GetProcAddress(mod, "wglUseFontBitmapsA"); - wine_wgl.p_wglUseFontBitmapsW = (void*)GetProcAddress(mod, "wglUseFontBitmapsW"); /* Interal WGL function */ wine_wgl.p_wglGetIntegerv = (void *)GetProcAddress(mod, "wglGetIntegerv"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6a77a27..24b30cb 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -516,17 +516,6 @@ inline static void set_drawable( HDC hdc ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL ); } -/* retrieve the X font to use on a given DC */ -inline static Font get_font( HDC hdc ) -{ - Font font; - enum x11drv_escape_codes escape = X11DRV_GET_FONT; - - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, - sizeof(font), (LPSTR)&font )) font = 0; - return font; -} - /** for use of wglGetCurrentReadDCARB */ inline static HDC get_hdc_from_Drawable(GLXDrawable d) { @@ -1589,14 +1578,14 @@ static BOOL internal_wglUseFontBitmaps(H } /* OpenGL32 wglUseFontBitmapsA */ -BOOL WINAPI X11DRV_wglUseFontBitmapsA(HDC hdc, DWORD first, DWORD count, DWORD listBase) +BOOL X11DRV_wglUseFontBitmapsA(X11DRV_PDEVICE *physDev, DWORD first, DWORD count, DWORD listBase) { - Font fid = get_font( hdc ); + Font fid = physDev->font; - TRACE("(%p, %ld, %ld, %ld) using font %ld\n", hdc, first, count, listBase, fid); + TRACE("(%p, %ld, %ld, %ld) using font %ld\n", physDev->hdc, first, count, listBase, fid); if (fid == 0) { - return internal_wglUseFontBitmaps(hdc, first, count, listBase, GetGlyphOutlineA); + return internal_wglUseFontBitmaps(physDev->hdc, first, count, listBase, GetGlyphOutlineA); } wine_tsx11_lock(); @@ -1607,14 +1596,14 @@ BOOL WINAPI X11DRV_wglUseFontBitmapsA(HD } /* OpenGL32 wglUseFontBitmapsW */ -BOOL WINAPI X11DRV_wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase) +BOOL X11DRV_wglUseFontBitmapsW(X11DRV_PDEVICE *physDev, DWORD first, DWORD count, DWORD listBase) { - Font fid = get_font( hdc ); + Font fid = physDev->font; - TRACE("(%p, %ld, %ld, %ld) using font %ld\n", hdc, first, count, listBase, fid); + TRACE("(%p, %ld, %ld, %ld) using font %ld\n", physDev->hdc, first, count, listBase, fid); if (fid == 0) { - return internal_wglUseFontBitmaps(hdc, first, count, listBase, GetGlyphOutlineW); + return internal_wglUseFontBitmaps(physDev->hdc, first, count, listBase, GetGlyphOutlineW); } WARN("Using the glX API for the WCHAR variant - some characters may come out incorrectly !\n");

1 0

Mikołaj Zalewski : wineconsole: Make the user backend work on non-latin1 locales.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 2fb8ea4d55a489619dde46d1020e4a6c9a3c0d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb8ea4d55a489619dde46d10… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Oct 3 21:08:32 2006 +0200 wineconsole: Make the user backend work on non-latin1 locales. --- programs/wineconsole/user.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 2afd47a..fffd40f 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -21,12 +21,15 @@ #include <stdio.h> #include <stdlib.h> #include "winecon_user.h" +#include "winnls.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wineconsole); WINE_DECLARE_DEBUG_CHANNEL(wc_font); +UINT g_uiDefaultCharset; + /* mapping console colors to RGB values */ COLORREF WCUSER_ColorMap[16] = { @@ -342,7 +345,7 @@ BOOL WCUSER_ValidateFontMetric(const str ret = (tm->tmMaxCharWidth * data->curcfg.win_width < GetSystemMetrics(SM_CXSCREEN) && tm->tmHeight * data->curcfg.win_height < GetSystemMetrics(SM_CYSCREEN)); return ret && !tm->tmItalic && !tm->tmUnderlined && !tm->tmStruckOut && - (tm->tmCharSet == DEFAULT_CHARSET || tm->tmCharSet == ANSI_CHARSET); + (tm->tmCharSet == DEFAULT_CHARSET || tm->tmCharSet == g_uiDefaultCharset); } /****************************************************************** @@ -354,7 +357,7 @@ BOOL WCUSER_ValidateFont(const struct in { return (lf->lfPitchAndFamily & 3) == FIXED_PITCH && /* (lf->lfPitchAndFamily & 0xF0) == FF_MODERN && */ - (lf->lfCharSet == DEFAULT_CHARSET || lf->lfCharSet == ANSI_CHARSET); + (lf->lfCharSet == DEFAULT_CHARSET || lf->lfCharSet == g_uiDefaultCharset); } /****************************************************************** @@ -1382,6 +1385,12 @@ enum init_return WCUSER_InitBackend(stru static const WCHAR wClassName[] = {'W','i','n','e','C','o','n','s','o','l','e','C','l','a','s','s',0}; WNDCLASS wndclass; + CHARSETINFO ci; + + if (!TranslateCharsetInfo((DWORD *)(INT_PTR)GetACP(), &ci, TCI_SRCCODEPAGE)) + return init_failed; + g_uiDefaultCharset = ci.ciCharset; + WINE_TRACE_(wc_font)("Code page %d => Default charset: %d\n", GetACP(), g_uiDefaultCharset); data->private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct inner_data_user)); if (!data->private) return init_failed;

1 0

Roderick Colenbrander : gdi32: Route WGL context code through gdi32.dll.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 4b212dc401dbdc1b87ec9add48bf288d49a9d90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b212dc401dbdc1b87ec9add4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Oct 3 19:52:17 2006 +0200 gdi32: Route WGL context code through gdi32.dll. --- dlls/gdi/Makefile.in | 1 + dlls/gdi/driver.c | 4 ++ dlls/gdi/gdi32.spec | 6 +++ dlls/gdi/gdi_private.h | 4 ++ dlls/gdi/opengl.c | 76 +++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/opengl32.spec | 4 +- dlls/opengl32/wgl.c | 21 ------------ dlls/winex11.drv/opengl.c | 17 ++++++---- 8 files changed, 104 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b212dc401dbdc1b87ec9…

1 0

Vitaliy Margolen : user: Move some common code into one function.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: caa2425a880cd441f9e80fef14eb757c16f15eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa2425a880cd441f9e80fef1… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Oct 3 23:06:30 2006 -0600 user: Move some common code into one function. --- dlls/user/hook.c | 185 ++++++++++++++++++++++++------------------------------ 1 files changed, 83 insertions(+), 102 deletions(-) diff --git a/dlls/user/hook.c b/dlls/user/hook.c index c5a7d49..4ba1d82 100644 --- a/dlls/user/hook.c +++ b/dlls/user/hook.c @@ -84,9 +84,11 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); struct hook_info { + INT id; FARPROC proc; void *handle; - DWORD tid; + DWORD pid, tid; + BOOL prev_unicode, next_unicode; WCHAR module[MAX_PATH]; }; @@ -274,10 +276,10 @@ static LRESULT call_hook_WtoA( HOOKPROC /*********************************************************************** - * call_hook + * call_hook_proc */ -static LRESULT call_hook( HOOKPROC proc, INT id, INT code, WPARAM wparam, LPARAM lparam, - BOOL prev_unicode, BOOL next_unicode ) +static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, LPARAM lparam, + BOOL prev_unicode, BOOL next_unicode ) { LRESULT ret; @@ -315,82 +317,99 @@ static void *get_hook_proc( void *proc, return (char *)mod + (ULONG_PTR)proc; } - /*********************************************************************** - * HOOK_CallHooks + * call_hook + * + * Call hook either in current thread or send message to the destination + * thread. */ -LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) +static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARAM lparam ) { - struct user_thread_info *thread_info = get_user_thread_info(); - HOOKPROC proc = NULL; - HHOOK handle = 0; - DWORD pid = 0, tid = 0; - WCHAR module[MAX_PATH]; - BOOL unicode_hook = FALSE; DWORD_PTR ret = 0; - USER_CheckNotLock(); - - if (!HOOK_IsHooked( id )) - { - TRACE( "skipping hook %s mask %x\n", hook_names[id-WH_MINHOOK], thread_info->active_hooks ); - return 0; - } - - SERVER_START_REQ( start_hook_chain ) - { - req->id = id; - req->event = EVENT_MIN; - wine_server_set_reply( req, module, sizeof(module)-sizeof(WCHAR) ); - if (!wine_server_call( req )) - { - module[wine_server_reply_size(req) / sizeof(WCHAR)] = 0; - handle = reply->handle; - proc = reply->proc; - pid = reply->pid; - tid = reply->tid; - unicode_hook = reply->unicode; - thread_info->active_hooks = reply->active_hooks; - } - } - SERVER_END_REQ; - - if (tid) + if (info->tid) { TRACE( "calling hook in thread %04x %s code %x wp %x lp %lx\n", - tid, hook_names[id-WH_MINHOOK], code, wparam, lparam ); + info->tid, hook_names[info->id-WH_MINHOOK], code, wparam, lparam ); - switch(id) + switch(info->id) { case WH_KEYBOARD_LL: - MSG_SendInternalMessageTimeout( pid, tid, WM_WINE_KEYBOARD_LL_HOOK, wparam, lparam, + MSG_SendInternalMessageTimeout( info->pid, info->tid, WM_WINE_KEYBOARD_LL_HOOK, wparam, lparam, SMTO_ABORTIFHUNG, get_ll_hook_timeout(), &ret ); break; case WH_MOUSE_LL: - MSG_SendInternalMessageTimeout( pid, tid, WM_WINE_MOUSE_LL_HOOK, wparam, lparam, + MSG_SendInternalMessageTimeout( info->pid, info->tid, WM_WINE_MOUSE_LL_HOOK, wparam, lparam, SMTO_ABORTIFHUNG, get_ll_hook_timeout(), &ret ); break; default: - ERR("Unknown hook id %d\n", id); + ERR("Unknown hook id %d\n", info->id); assert(0); break; } } - else if (proc) + else if (info->proc) { TRACE( "calling hook %p %s code %x wp %x lp %lx module %s\n", - proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, debugstr_w(module) ); + info->proc, hook_names[info->id-WH_MINHOOK], code, wparam, + lparam, debugstr_w(info->module) ); - if (!module[0] || (proc = get_hook_proc( proc, module )) != NULL) + if (!info->module[0] || + (info->proc = get_hook_proc( info->proc, info->module )) != NULL) { + struct user_thread_info *thread_info = get_user_thread_info(); HHOOK prev = thread_info->hook; - thread_info->hook = handle; - ret = call_hook( proc, id, code, wparam, lparam, unicode, unicode_hook ); + + thread_info->hook = info->handle; + ret = call_hook_proc( (HOOKPROC)info->proc, info->id, code, wparam, lparam, + info->prev_unicode, info->next_unicode ); thread_info->hook = prev; } + } + return ret; +} + +/*********************************************************************** + * HOOK_CallHooks + */ +LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + struct hook_info info; + DWORD_PTR ret = 0; + + USER_CheckNotLock(); + + if (!HOOK_IsHooked( id )) + { + TRACE( "skipping hook %s mask %x\n", hook_names[id-WH_MINHOOK], thread_info->active_hooks ); + return 0; + } + + ZeroMemory( &info, sizeof(info) - sizeof(info.module) ); + info.prev_unicode = unicode; + info.id = id; + SERVER_START_REQ( start_hook_chain ) + { + req->id = info.id; + req->event = EVENT_MIN; + wine_server_set_reply( req, info.module, sizeof(info.module)-sizeof(WCHAR) ); + if (!wine_server_call( req )) + { + info.module[wine_server_reply_size(req) / sizeof(WCHAR)] = 0; + info.handle = reply->handle; + info.pid = reply->pid; + info.tid = reply->tid; + info.proc = reply->proc; + info.next_unicode = reply->unicode; + thread_info->active_hooks = reply->active_hooks; + } } - else return 0; + SERVER_END_REQ; + + if (!info.tid && !info.proc) return 0; + ret = call_hook( &info, code, wparam, lparam ); SERVER_START_REQ( finish_hook_chain ) { @@ -501,68 +520,30 @@ BOOL WINAPI UnhookWindowsHookEx( HHOOK h LRESULT WINAPI CallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) { struct user_thread_info *thread_info = get_user_thread_info(); - HOOKPROC proc = NULL; - WCHAR module[MAX_PATH]; - HHOOK handle = 0; - DWORD pid = 0, tid = 0; - INT id = 0; - BOOL prev_unicode = FALSE, next_unicode = FALSE; - DWORD_PTR ret = 0; + struct hook_info info; + + ZeroMemory( &info, sizeof(info) - sizeof(info.module) ); SERVER_START_REQ( get_next_hook ) { req->handle = thread_info->hook; req->event = EVENT_MIN; - wine_server_set_reply( req, module, sizeof(module)-sizeof(WCHAR) ); + wine_server_set_reply( req, info.module, sizeof(info.module)-sizeof(WCHAR) ); if (!wine_server_call_err( req )) { - module[wine_server_reply_size(req) / sizeof(WCHAR)] = 0; - handle = reply->next; - id = reply->id; - pid = reply->pid; - tid = reply->tid; - proc = reply->proc; - prev_unicode = reply->prev_unicode; - next_unicode = reply->next_unicode; + info.module[wine_server_reply_size(req) / sizeof(WCHAR)] = 0; + info.handle = reply->next; + info.id = reply->id; + info.pid = reply->pid; + info.tid = reply->tid; + info.proc = reply->proc; + info.prev_unicode = reply->prev_unicode; + info.next_unicode = reply->next_unicode; } } SERVER_END_REQ; - if (tid) - { - TRACE( "calling hook in thread %04x %s code %x wp %x lp %lx\n", - tid, hook_names[id-WH_MINHOOK], code, wparam, lparam ); - - switch(id) - { - case WH_KEYBOARD_LL: - MSG_SendInternalMessageTimeout( pid, tid, WM_WINE_KEYBOARD_LL_HOOK, wparam, lparam, - SMTO_ABORTIFHUNG, get_ll_hook_timeout(), &ret ); - break; - case WH_MOUSE_LL: - MSG_SendInternalMessageTimeout( pid, tid, WM_WINE_MOUSE_LL_HOOK, wparam, lparam, - SMTO_ABORTIFHUNG, get_ll_hook_timeout(), &ret ); - break; - default: - ERR("Unknown hook id %d\n", id); - assert(0); - break; - } - } - else if (proc) - { - TRACE( "calling hook %p %s code %x wp %x lp %lx module %s\n", - proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, debugstr_w(module) ); - - if (!module[0] || (proc = get_hook_proc( proc, module )) != NULL) - { - HHOOK prev = thread_info->hook; - thread_info->hook = handle; - ret = call_hook( proc, id, code, wparam, lparam, prev_unicode, next_unicode ); - thread_info->hook = prev; - } - } - return ret; + return call_hook( &info, code, wparam, lparam ); }

1 0

Juan Lang : crypt32: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: f3a1f2bf60464a90f578cfbf1eba5a2d18e6fbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a1f2bf60464a90f578cfbf1… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Oct 3 21:58:09 2006 -0700 crypt32: Win64 printf format warning fixes. --- dlls/crypt32/Makefile.in | 2 - dlls/crypt32/base64.c | 8 ++- dlls/crypt32/cert.c | 54 +++++++++++---------- dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 28 ++++++----- dlls/crypt32/decode.c | 116 +++++++++++++++++++++++----------------------- dlls/crypt32/encode.c | 36 +++++++------- dlls/crypt32/main.c | 22 ++++----- dlls/crypt32/oid.c | 34 +++++++------ dlls/crypt32/proplist.c | 2 - dlls/crypt32/serialize.c | 8 ++- dlls/crypt32/sip.c | 8 ++- dlls/crypt32/store.c | 98 +++++++++++++++++++-------------------- dlls/crypt32/str.c | 36 +++++++------- 14 files changed, 228 insertions(+), 228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3a1f2bf60464a90f578c…

1 0

Vitaliy Margolen : capi: Fix compiler warnings.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 42a279f2555c4c55da9f22682950ece97baa4732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a279f2555c4c55da9f22682… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Oct 3 21:50:45 2006 -0600 capi: Fix compiler warnings. --- dlls/capi2032/cap20wxx.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/capi2032/cap20wxx.c b/dlls/capi2032/cap20wxx.c index 8502f05..c8e6507 100644 --- a/dlls/capi2032/cap20wxx.c +++ b/dlls/capi2032/cap20wxx.c @@ -99,7 +99,7 @@ #ifdef HAVE_CAPI4LINUX return 0x1009; fret = pcapi20_register (maxLogicalConnection, maxBDataBlocks, maxBDataLen, &aid); *pApplID = aid; - TRACE ( "(%lx) -> %lx\n", *pApplID, fret); + TRACE ( "(%x) -> %x\n", *pApplID, fret); return fret; #else FIXME ( "(), no CAPI4LINUX support compiled into WINE.\n" ); @@ -117,7 +117,7 @@ #ifdef HAVE_CAPI4LINUX if (!pcapi20_release) return 0x1109; fret = pcapi20_release (ApplID); - TRACE ("(%lx) -> %lx\n", ApplID, fret); + TRACE ("(%x) -> %x\n", ApplID, fret); return fret; #else return 0x1109; @@ -134,7 +134,7 @@ #ifdef HAVE_CAPI4LINUX if (!pcapi20_put_message) return 0x1109; fret = pcapi20_put_message (ApplID, pCAPIMessage); - TRACE ("(%lx) -> %lx\n", ApplID, fret); + TRACE ("(%x) -> %x\n", ApplID, fret); return fret; #else return 0x1109; @@ -151,7 +151,7 @@ #ifdef HAVE_CAPI4LINUX if (!pcapi20_get_message) return 0x1109; fret = pcapi20_get_message (ApplID, (unsigned char **)ppCAPIMessage); - TRACE ("(%lx) -> %lx\n", ApplID, fret); + TRACE ("(%x) -> %x\n", ApplID, fret); return fret; #else return 0x1109; @@ -162,7 +162,7 @@ #endif \*---------------------------------------------------------------------------*/ DWORD WINAPI wrapCAPI_WAIT_FOR_SIGNAL (DWORD ApplID) { #ifdef HAVE_CAPI4LINUX - TRACE ("(%lx)\n", ApplID); + TRACE ("(%x)\n", ApplID); load_functions(); if (!pcapi20_waitformessage) @@ -188,7 +188,7 @@ #ifdef HAVE_CAPI4LINUX if (!strncmp (SzBuffer, "AVM", 3)) { strcpy (SzBuffer, "AVM-GmbH"); } - TRACE ("(%s) -> %lx\n", SzBuffer, fret); + TRACE ("(%s) -> %x\n", SzBuffer, fret); return fret; #else return 0x1109; @@ -210,7 +210,7 @@ #ifdef HAVE_CAPI4LINUX *pCAPIMinor = *(unsigned *)(version + 1 * sizeof (unsigned)); *pManufacturerMajor = *(unsigned *)(version + 2 * sizeof (unsigned)); *pManufacturerMinor = *(unsigned *)(version + 3 * sizeof (unsigned)); - TRACE ("(%lx.%lx,%lx.%lx) -> %lx\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor, + TRACE ("(%x.%x,%x.%x) -> %x\n", *pCAPIMajor, *pCAPIMinor, *pManufacturerMajor, *pManufacturerMinor, fret); return fret; #else @@ -228,7 +228,7 @@ #ifdef HAVE_CAPI4LINUX if (!pcapi20_get_serial_number) return 0x1109; fret = (pcapi20_get_serial_number (0, (unsigned char*) SzBuffer) != 0) ? 0 : 0x1108; - TRACE ("(%s) -> %lx\n", SzBuffer, fret); + TRACE ("(%s) -> %x\n", SzBuffer, fret); return fret; #else return 0x1109; @@ -246,7 +246,7 @@ #ifdef HAVE_CAPI4LINUX return 0x1109; fret = pcapi20_get_profile (CtlrNr, SzBuffer); - TRACE ("(%lx,%x) -> %lx\n", CtlrNr, *(unsigned short *)SzBuffer, fret); + TRACE ("(%x,%x) -> %x\n", CtlrNr, *(unsigned short *)SzBuffer, fret); return fret; #else return 0x1109; @@ -263,7 +263,7 @@ #ifdef HAVE_CAPI4LINUX if (!pcapi20_isinstalled) return 0x1109; fret = pcapi20_isinstalled(); - TRACE ("() -> %lx\n", fret); + TRACE ("() -> %x\n", fret); return fret; #else return 0x1109;

1 0