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

Eric Pouech : dbghelp: Implemented SymRegisterCallbackW64 and 64 -> 64W mapping function.
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: 4a80e63a29e1b0184eab6e72bffec70d911437c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a80e63a29e1b0184eab6e7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed May 10 21:35:11 2006 +0200 dbghelp: Implemented SymRegisterCallbackW64 and 64 -> 64W mapping function. --- dlls/dbghelp/dbghelp.c | 76 ++++++++++++++++++++++++++++++++++++---- dlls/dbghelp/dbghelp.spec | 2 + dlls/dbghelp/dbghelp_private.h | 1 + include/dbghelp.h | 13 +++++++ 4 files changed, 84 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index dbd3cfb..d7e0cf3 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -479,10 +479,64 @@ static BOOL CALLBACK reg_cb64to32(HANDLE BOOL pcs_callback(const struct process* pcs, ULONG action, void* data) { TRACE("%p %lu %p\n", pcs, action, data); + if (!pcs->reg_cb) return FALSE; + if (pcs->reg_is_unicode) + { + IMAGEHLP_DEFERRED_SYMBOL_LOAD64* idsl; + IMAGEHLP_DEFERRED_SYMBOL_LOADW64 idslW; + + switch (action) + { + case CBA_DEBUG_INFO: + case CBA_DEFERRED_SYMBOL_LOAD_CANCEL: + case CBA_SET_OPTIONS: + case CBA_SYMBOLS_UNLOADED: + break; + case CBA_DEFERRED_SYMBOL_LOAD_COMPLETE: + case CBA_DEFERRED_SYMBOL_LOAD_FAILURE: + case CBA_DEFERRED_SYMBOL_LOAD_PARTIAL: + case CBA_DEFERRED_SYMBOL_LOAD_START: + idsl = (IMAGEHLP_DEFERRED_SYMBOL_LOAD64*)(DWORD)data; + idslW.SizeOfStruct = sizeof(idslW); + idslW.BaseOfImage = idsl->BaseOfImage; + idslW.CheckSum = idsl->CheckSum; + idslW.TimeDateStamp = idsl->TimeDateStamp; + MultiByteToWideChar(CP_ACP, 0, idsl->FileName, -1, + idslW.FileName, sizeof(idslW.FileName) / sizeof(WCHAR)); + idslW.Reparse = idsl->Reparse; + data = &idslW; + break; + case CBA_DUPLICATE_SYMBOL: + case CBA_EVENT: + case CBA_READ_MEMORY: + default: + FIXME("No mapping for action %lu\n", action); + return FALSE; + } + } return pcs->reg_cb(pcs->handle, action, (ULONG64)(DWORD_PTR)data, pcs->reg_user); } +/****************************************************************** + * sym_register_cb + * + * Helper for registering a callback. + */ +static BOOL sym_register_cb(HANDLE hProcess, + PSYMBOL_REGISTERED_CALLBACK64 cb, + DWORD64 user, BOOL unicode) +{ + struct process* pcs = process_find_by_handle(hProcess); + + if (!pcs) return FALSE; + pcs->reg_cb = cb; + pcs->reg_is_unicode = unicode; + pcs->reg_user = user; + + return TRUE; +} + /*********************************************************************** * SymRegisterCallback (DBGHELP.@) */ @@ -491,7 +545,9 @@ BOOL WINAPI SymRegisterCallback(HANDLE h PVOID UserContext) { DWORD64 tmp = ((ULONGLONG)(DWORD)CallbackFunction << 32) | (DWORD)UserContext; - return SymRegisterCallback64(hProcess, reg_cb64to32, tmp); + TRACE("(%p, %p, %p)\n", + hProcess, CallbackFunction, UserContext); + return sym_register_cb(hProcess, reg_cb64to32, tmp, FALSE); } /*********************************************************************** @@ -501,15 +557,21 @@ BOOL WINAPI SymRegisterCallback64(HANDLE PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, ULONG64 UserContext) { - struct process* pcs = process_find_by_handle(hProcess); - TRACE("(%p, %p, %s)\n", hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); - if (!pcs) return FALSE; - pcs->reg_cb = CallbackFunction; - pcs->reg_user = UserContext; + return sym_register_cb(hProcess, CallbackFunction, UserContext, FALSE); +} - return TRUE; +/*********************************************************************** + * SymRegisterCallbackW64 (DBGHELP.@) + */ +BOOL WINAPI SymRegisterCallbackW64(HANDLE hProcess, + PSYMBOL_REGISTERED_CALLBACK64 CallbackFunction, + ULONG64 UserContext) +{ + TRACE("(%p, %p, %s)\n", + hProcess, CallbackFunction, wine_dbgstr_longlong(UserContext)); + return sym_register_cb(hProcess, CallbackFunction, UserContext, TRUE); } /* This is imagehlp version not dbghelp !! */ diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 69d4ffa..8641f43 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -130,7 +130,7 @@ @ stub SymRefreshModuleList @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterCallback64(long ptr double) -@ stub SymRegisterCallbackW64 +@ stdcall SymRegisterCallbackW64(long ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymSearch(long double long long str double ptr ptr long) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index efc5ceb..cfc9f92 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -294,6 +294,7 @@ struct process WCHAR* search_path; PSYMBOL_REGISTERED_CALLBACK64 reg_cb; + BOOL reg_is_unicode; DWORD64 reg_user; struct module* lmodules; diff --git a/include/dbghelp.h b/include/dbghelp.h index 85e6a73..49f4d7e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -287,6 +287,18 @@ typedef struct _IMAGEHLP_DEFERRED_SYMBOL DWORD Flags; } IMAGEHLP_DEFERRED_SYMBOL_LOAD64, *PIMAGEHLP_DEFERRED_SYMBOL_LOAD64; +typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOADW64 +{ + DWORD SizeOfStruct; + DWORD64 BaseOfImage; + DWORD CheckSum; + DWORD TimeDateStamp; + WCHAR FileName[MAX_PATH + 1]; + BOOLEAN Reparse; + HANDLE hFile; + DWORD Flags; +} IMAGEHLP_DEFERRED_SYMBOL_LOADW64, *PIMAGEHLP_DEFERRED_SYMBOL_LOADW64; + typedef struct _IMAGEHLP_DUPLICATE_SYMBOL { DWORD SizeOfStruct; @@ -889,6 +901,7 @@ typedef BOOL (CALLBACK *PSYMBOL_REGISTER BOOL WINAPI SymRegisterCallback(HANDLE, PSYMBOL_REGISTERED_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYMBOL_REGISTERED_CALLBACK64)(HANDLE, ULONG, ULONG64, ULONG64); BOOL WINAPI SymRegisterCallback64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); +BOOL WINAPI SymRegisterCallbackW64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64, PSTR, DWORD); DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD);

1 0

Ivan Gyurdiev : wined3d: Share shader_dump_ins_modifiers().
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: c61af3af8da074620485998b7757c21cd0fb6b9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c61af3af8da074620485998… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 10 13:53:07 2006 -0400 wined3d: Share shader_dump_ins_modifiers(). Share shader_dump_ins_modifiers(), and make vertex shaders use it. The saturate modifer (_sat) is valid on vs_3_0+, and it isn't being shown in the trace. --- dlls/wined3d/baseshader.c | 25 +++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 29 ++--------------------------- dlls/wined3d/vertexshader.c | 5 ++++- dlls/wined3d/wined3d_private.h | 3 +++ 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5c3b143..acc402b 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -395,4 +395,29 @@ void generate_base_shader( } +void shader_dump_ins_modifiers(const DWORD output) { + + DWORD shift = (output & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; + DWORD mmask = output & D3DSP_DSTMOD_MASK; + + switch (shift) { + case 0: break; + case 13: TRACE("_d8"); break; + case 14: TRACE("_d4"); break; + case 15: TRACE("_d2"); break; + case 1: TRACE("_x2"); break; + case 2: TRACE("_x4"); break; + case 3: TRACE("_x8"); break; + default: TRACE("_unhandled_shift(%ld)", shift); break; + } + + switch(mmask) { + case D3DSPDM_NONE: break; + case D3DSPDM_SATURATE: TRACE("_sat"); break; + case D3DSPDM_PARTIALPRECISION: TRACE("_pp"); break; + case D3DSPDM_MSAMPCENTROID: TRACE("_centroid"); break; + default: TRACE("_unhandled_modifier(%#lx)", mmask); break; + } +} + /* TODO: Move other shared code here */ diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index ff368dc..d43bea9 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1370,31 +1370,6 @@ #if 1 /* if were using the data buffer o #endif } -inline static void pshader_program_dump_ins_modifiers(const DWORD output) { - - DWORD shift = (output & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; - DWORD mmask = output & D3DSP_DSTMOD_MASK; - - switch (shift) { - case 0: break; - case 13: TRACE("_d8"); break; - case 14: TRACE("_d4"); break; - case 15: TRACE("_d2"); break; - case 1: TRACE("_x2"); break; - case 2: TRACE("_x4"); break; - case 3: TRACE("_x8"); break; - default: TRACE("_unhandled_shift(%ld)", shift); break; - } - - switch(mmask) { - case D3DSPDM_NONE: break; - case D3DSPDM_SATURATE: TRACE("_sat"); break; - case D3DSPDM_PARTIALPRECISION: TRACE("_pp"); break; - case D3DSPDM_MSAMPCENTROID: TRACE("_centroid"); break; - default: TRACE("_unhandled_modifier(%#lx)", mmask); break; - } -} - inline static void pshader_program_dump_ps_param(const DWORD param, int input) { static const char* rastout_reg_names[] = { "oC0", "oC1", "oC2", "oC3", "oDepth" }; static const char swizzle_reg_chars[] = "rgba"; @@ -1568,7 +1543,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S else TRACE("dcl"); - pshader_program_dump_ins_modifiers(param); + shader_dump_ins_modifiers(param); TRACE(" "); pshader_program_dump_ps_param(param, 0); pToken += 2; @@ -1594,7 +1569,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S } else { TRACE("%s", curOpcode->name); if (curOpcode->num_params > 0) { - pshader_program_dump_ins_modifiers(*pToken); + shader_dump_ins_modifiers(*pToken); TRACE(" "); pshader_program_dump_ps_param(*pToken, 0); ++pToken; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index c527ceb..c578d38 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1641,6 +1641,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ parse_decl_usage(This, usage, param & D3DSP_REGNUM_MASK); shader_program_dump_decl_usage(usage, param); + shader_dump_ins_modifiers(param); TRACE(" "); vshader_program_dump_vs_param(param, 0); pToken += 2; @@ -1664,8 +1665,10 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ ++pToken; ++len; } else { - TRACE("%s ", curOpcode->name); + TRACE("%s", curOpcode->name); if (curOpcode->num_params > 0) { + shader_dump_ins_modifiers(*pToken); + TRACE(" "); vshader_program_dump_vs_param(*pToken, 0); ++pToken; ++len; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30cf91c..d978604 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1300,6 +1300,9 @@ extern void generate_base_shader( SHADER_BUFFER* buffer, CONST DWORD* pFunction); +extern void shader_dump_ins_modifiers( + const DWORD output); + inline static int shader_get_regtype(const DWORD param) { return (((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2));

1 0

Ivan Gyurdiev : wined3d: Initialize volume format.
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: 257692e087ce5655a571a810d2941a3797767152 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=257692e087ce5655a571a81… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 10 13:55:02 2006 -0400 wined3d: Initialize volume format. --- dlls/wined3d/volume.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 9 ++++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index e8eaa0d..b6b435b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -291,23 +291,23 @@ HRESULT WINAPI IWineD3DVolumeImpl_LoadTe TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", GL_TEXTURE_3D, gl_level, - D3DFmt2GLIntFmt(myDevice, This->currentDesc.Format), + D3DFmt2GLIntFmt(myDevice, This->resource.format), This->currentDesc.Width, This->currentDesc.Height, This->currentDesc.Depth, 0, - D3DFmt2GLFmt(myDevice, This->currentDesc.Format), - D3DFmt2GLType(myDevice, This->currentDesc.Format), + D3DFmt2GLFmt(myDevice, This->resource.format), + D3DFmt2GLType(myDevice, This->resource.format), This->resource.allocatedMemory); glTexImage3D(GL_TEXTURE_3D, gl_level, - D3DFmt2GLIntFmt(myDevice, This->currentDesc.Format), + D3DFmt2GLIntFmt(myDevice, This->resource.format), This->currentDesc.Width, This->currentDesc.Height, This->currentDesc.Depth, 0, - D3DFmt2GLFmt(myDevice, This->currentDesc.Format), - D3DFmt2GLType(myDevice, This->currentDesc.Format), + D3DFmt2GLFmt(myDevice, This->resource.format), + D3DFmt2GLType(myDevice, This->resource.format), This->resource.allocatedMemory); checkGLcall("glTexImage3D"); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d978604..6a894eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -734,6 +734,13 @@ typedef struct IWineD3DCubeTextureImpl extern const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl; +typedef struct _WINED3DVOLUMET_DESC +{ + UINT Width; + UINT Height; + UINT Depth; +} WINED3DVOLUMET_DESC; + /***************************************************************************** * IWineD3DVolume implementation structure (extends IUnknown) */ @@ -744,7 +751,7 @@ typedef struct IWineD3DVolumeImpl IWineD3DResourceClass resource; /* WineD3DVolume Information */ - D3DVOLUME_DESC currentDesc; + WINED3DVOLUMET_DESC currentDesc; IWineD3DBase *container; UINT bytesPerPixel;

1 0

Ivan Gyurdiev : wined3d: Set pIndexData to 0 in DrawIndexedPrimitiveUP.
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: b2d96086e5f0361e9933fcbb0d7f18580b953d85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2d96086e5f0361e9933fcb… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed May 10 13:57:49 2006 -0400 wined3d: Set pIndexData to 0 in DrawIndexedPrimitiveUP. --- dlls/wined3d/device.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dd448fb..7c351b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5330,9 +5330,8 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawPr drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* start vertex */, 0 /* NumVertices */, 0 /* indxStart*/, 0 /* indxSize*/, NULL /* indxData */, 0 /* indxMin */, NULL); - /* stream zero settings set to null at end, as per the msdn - http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… - */ + + /* MSDN specifies stream zero settings must be set to NULL */ This->stateBlock->streamStride[0] = 0; This->stateBlock->streamSource[0] = NULL; @@ -5373,13 +5372,11 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawIn This->stateBlock->streamStride[0] = VertexStreamZeroStride; drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* vertexStart */, NumVertices, 0 /* indxStart */, idxStride, pIndexData, MinVertexIndex, NULL); - /* stream zero settings set to null at end as per the msdn - http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… - */ - /* stream zero settings set to null at end as per the msdn */ + /* MSDN specifies stream zero settings and index buffer must be set to NULL */ This->stateBlock->streamSource[0] = NULL; This->stateBlock->streamStride[0] = 0; + This->stateBlock->pIndexData = NULL; return WINED3D_OK; }

1 0

Robert Reif : winmm: Fix wave test volume warning.
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: d1b838e948d85eef26b2c04d4e1071b78194acd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1b838e948d85eef26b2c04… Author: Robert Reif <reif(a)earthlink.net> Date: Wed May 10 19:40:25 2006 -0400 winmm: Fix wave test volume warning. Volume is only valid when sound card has volume support. --- dlls/winmm/tests/wave.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a0646fd..576de4f 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -553,7 +553,7 @@ static void wave_out_test_deviceOut(int WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; - BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME; + BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; double paused = 0.0; double actual; DWORD callback = 0; @@ -659,7 +659,7 @@ static void wave_out_test_deviceOut(int pwfx->wBitsPerSample,pwfx->nChannels, get_format_str(pwfx->wFormatTag), wave_open_flags(flags)); - if (sine && !volume) + if (sine && has_volume && volume == 0) trace("*** Warning the sound is muted, you will not hear the test\n"); /* Check that the position is 0 at start */

1 0

Alexandre Julliard : x11drv: Prefer SendMessageW over SendMessageA where possible.
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: 2164815a9ae2196dc3cf76af31522aab0ff8fde2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2164815a9ae2196dc3cf76a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 21:32:56 2006 +0200 x11drv: Prefer SendMessageW over SendMessageA where possible. --- dlls/x11drv/event.c | 2 +- dlls/x11drv/winpos.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c index 2271cae..d9488e0 100644 --- a/dlls/x11drv/event.c +++ b/dlls/x11drv/event.c @@ -535,7 +535,7 @@ static void EVENT_FocusOut( HWND hwnd, X wine_tsx11_unlock(); } if (hwnd != GetForegroundWindow()) return; - SendMessageA( hwnd, WM_CANCELMODE, 0, 0 ); + SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); /* don't reset the foreground window, if the window which is getting the focus is a Wine window */ diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index f0fa3b8..5fdde83 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -743,7 +743,7 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *win { /* child windows get WM_CHILDACTIVATE message */ if ((GetWindowLongW( winpos->hwnd, GWL_STYLE ) & (WS_CHILD | WS_POPUP)) == WS_CHILD) - SendMessageA( winpos->hwnd, WM_CHILDACTIVATE, 0, 0 ); + SendMessageW( winpos->hwnd, WM_CHILDACTIVATE, 0, 0 ); else SetForegroundWindow( winpos->hwnd ); } @@ -1102,7 +1102,7 @@ void X11DRV_MapNotify( HWND hwnd, XEvent WIN_SetStyle( hwnd, style, WS_MINIMIZE ); WIN_ReleasePtr( win ); - SendMessageA( hwnd, WM_SHOWWINDOW, SW_RESTORE, 0 ); + SendMessageW( hwnd, WM_SHOWWINDOW, SW_RESTORE, 0 ); data->lock_changes++; SetWindowPos( hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, SWP_NOZORDER ); @@ -1137,7 +1137,7 @@ void X11DRV_UnmapNotify( HWND hwnd, XEve WIN_ReleasePtr( win ); EndMenu(); - SendMessageA( hwnd, WM_SHOWWINDOW, SW_MINIMIZE, 0 ); + SendMessageW( hwnd, WM_SHOWWINDOW, SW_MINIMIZE, 0 ); data->lock_changes++; SetWindowPos( hwnd, 0, 0, 0, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER ); @@ -1602,7 +1602,7 @@ void X11DRV_SysCommandSizeMove( HWND hwn /* repaint the window before moving it around */ RedrawWindow( hwnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); - SendMessageA( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); + SendMessageW( hwnd, WM_ENTERSIZEMOVE, 0, 0 ); set_movesize_capture( hwnd ); /* grab the server only when moving top-level windows without desktop */ @@ -1695,7 +1695,7 @@ void X11DRV_SysCommandSizeMove( HWND hwn /* determine the hit location */ if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); - SendMessageA( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&newRect ); + SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&newRect ); if (!iconic) { @@ -1741,8 +1741,8 @@ void X11DRV_SysCommandSizeMove( HWND hwn if (HOOK_CallHooks( WH_CBT, HCBT_MOVESIZE, (WPARAM)hwnd, (LPARAM)&sizingRect, TRUE )) moved = FALSE; - SendMessageA( hwnd, WM_EXITSIZEMOVE, 0, 0 ); - SendMessageA( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L); + SendMessageW( hwnd, WM_EXITSIZEMOVE, 0, 0 ); + SendMessageW( hwnd, WM_SETVISIBLE, !IsIconic(hwnd), 0L); /* window moved or resized */ if (moved) @@ -1776,7 +1776,7 @@ void X11DRV_SysCommandSizeMove( HWND hwn if( !moved ) { if(style & WS_SYSMENU ) - SendMessageA( hwnd, WM_SYSCOMMAND, + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MOUSEMENU + HTSYSMENU, MAKELONG(pt.x,pt.y)); } else WINPOS_ShowIconTitle( hwnd, TRUE );

1 0

Alexandre Julliard : user: Prefer SendMessageW over SendMessageA where possible.
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: 6ebbfd49590e0fe244b36101037d0fcdd39f66d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ebbfd49590e0fe244b3610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 10 21:33:33 2006 +0200 user: Prefer SendMessageW over SendMessageA where possible. --- dlls/user/defdlg.c | 16 ++++++++-------- dlls/user/icontitle.c | 4 ++-- dlls/user/mdi.c | 4 ++-- dlls/user/nonclient.c | 8 ++++---- dlls/user/winpos.c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/user/defdlg.c b/dlls/user/defdlg.c index abd19b1..28780ab 100644 --- a/dlls/user/defdlg.c +++ b/dlls/user/defdlg.c @@ -159,15 +159,15 @@ static BOOL DEFDLG_SetDefId( HWND hwndDl /* Make sure the old default control is a valid push button ID */ hwndOld = GetDlgItem( hwndDlg, old_id ); - if (!hwndOld || !(SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + if (!hwndOld || !(SendMessageW( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) hwndOld = DEFDLG_FindDefButton( hwndDlg ); if (hwndOld && hwndOld != hwndNew) - SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); + SendMessageW( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); if (hwndNew) { if(dlgcode & DLGC_UNDEFPUSHBUTTON) - SendMessageA( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); + SendMessageW( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); } return TRUE; } @@ -197,15 +197,15 @@ static BOOL DEFDLG_SetDefButton( HWND hw } /* Make sure the old default control is a valid push button ID */ - if (!hwndOld || !(SendMessageA( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) + if (!hwndOld || !(SendMessageW( hwndOld, WM_GETDLGCODE, 0, 0) & DLGC_DEFPUSHBUTTON)) hwndOld = DEFDLG_FindDefButton( hwndDlg ); if (hwndOld && hwndOld != hwndNew) - SendMessageA( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); + SendMessageW( hwndOld, BM_SETSTYLE, BS_PUSHBUTTON, TRUE ); if (hwndNew) { if(dlgcode & DLGC_UNDEFPUSHBUTTON) - SendMessageA( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); + SendMessageW( hwndNew, BM_SETSTYLE, BS_DEFPUSHBUTTON, TRUE ); } return TRUE; } @@ -300,8 +300,8 @@ static LRESULT DEFDLG_Proc( HWND hwnd, U if (hwndFocus) { /* always make combo box hide its listbox control */ - if (!SendMessageA( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 )) - SendMessageA( GetParent(hwndFocus), CB_SHOWDROPDOWN, FALSE, 0 ); + if (!SendMessageW( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 )) + SendMessageW( GetParent(hwndFocus), CB_SHOWDROPDOWN, FALSE, 0 ); } } return DefWindowProcA( hwnd, msg, wParam, lParam ); diff --git a/dlls/user/icontitle.c b/dlls/user/icontitle.c index b4aafe2..9b9878b 100644 --- a/dlls/user/icontitle.c +++ b/dlls/user/icontitle.c @@ -228,8 +228,8 @@ LRESULT WINAPI IconTitleWndProc( HWND hW if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: - if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) - lParam = SendMessageA( owner, WM_ISACTIVEICON, 0, 0 ); + if( GetWindowLongW( owner, GWL_STYLE ) & WS_CHILD ) + lParam = SendMessageW( owner, WM_ISACTIVEICON, 0, 0 ); else lParam = (owner == GetActiveWindow()); if( ICONTITLE_Paint( hWnd, owner, (HDC)wParam, (BOOL)lParam ) ) diff --git a/dlls/user/mdi.c b/dlls/user/mdi.c index 7978eed..9fba332 100644 --- a/dlls/user/mdi.c +++ b/dlls/user/mdi.c @@ -671,7 +671,7 @@ static LONG MDICascade( HWND client, MDI int i, total; if (IsZoomed(ci->hwndActiveChild)) - SendMessageA(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); + SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); if (ci->nActiveChildren == 0) return 0; @@ -724,7 +724,7 @@ static void MDITile( HWND client, MDICLI BOOL has_icons = FALSE; if (IsZoomed(ci->hwndActiveChild)) - SendMessageA(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); + SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0); if (ci->nActiveChildren == 0) return; diff --git a/dlls/user/nonclient.c b/dlls/user/nonclient.c index edadaa7..2732cc2 100644 --- a/dlls/user/nonclient.c +++ b/dlls/user/nonclient.c @@ -1318,9 +1318,9 @@ static void NC_TrackMinMaxBox( HWND hwnd return; if (wParam == HTMINBUTTON) - SendMessageA( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_MINIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); else - SendMessageA( hwnd, WM_SYSCOMMAND, + SendMessageW( hwnd, WM_SYSCOMMAND, IsZoomed(hwnd) ? SC_RESTORE:SC_MAXIMIZE, MAKELONG(msg.pt.x,msg.pt.y) ); } @@ -1377,7 +1377,7 @@ static void NC_TrackCloseButton (HWND hw ReleaseDC( hwnd, hdc ); if (!pressed) return; - SendMessageA( hwnd, WM_SYSCOMMAND, SC_CLOSE, MAKELONG(msg.pt.x,msg.pt.y) ); + SendMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, MAKELONG(msg.pt.x,msg.pt.y) ); } @@ -1573,7 +1573,7 @@ LRESULT NC_HandleSysCommand( HWND hwnd, break; case SC_CLOSE: - return SendMessageA( hwnd, WM_CLOSE, 0, 0 ); + return SendMessageW( hwnd, WM_CLOSE, 0, 0 ); case SC_VSCROLL: case SC_HSCROLL: diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index 15adf2f..ceaa57b 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -385,7 +385,7 @@ HWND WINPOS_WindowFromPoint( HWND hwndSc *hittest = HTCLIENT; break; } - res = SendMessageA( list[i], WM_NCHITTEST, 0, MAKELONG(pt.x,pt.y) ); + res = SendMessageW( list[i], WM_NCHITTEST, 0, MAKELONG(pt.x,pt.y) ); if (res != HTTRANSPARENT) { *hittest = res; /* Found the window */ @@ -679,7 +679,7 @@ BOOL WINPOS_RedrawIconTitle( HWND hWnd ) { if( lpPos->hwndIconTitle ) { - SendMessageA( lpPos->hwndIconTitle, WM_SHOWWINDOW, TRUE, 0); + SendMessageW( lpPos->hwndIconTitle, WM_SHOWWINDOW, TRUE, 0); InvalidateRect( lpPos->hwndIconTitle, NULL, TRUE ); return TRUE; } @@ -706,7 +706,7 @@ BOOL WINPOS_ShowIconTitle( HWND hwnd, BO { if (!IsWindowVisible(title)) { - SendMessageA( title, WM_SHOWWINDOW, TRUE, 0 ); + SendMessageW( title, WM_SHOWWINDOW, TRUE, 0 ); SetWindowPos( title, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW ); } @@ -795,7 +795,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, PO MinMax.ptMaxPosition.y = -yinc; } - SendMessageA( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax ); + SendMessageW( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax ); /* Some sanity checks */

1 0

Mike McCormack : advapi32: Fix a typo (spotted by Peter Berg Larsen).
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: ff6885495b7d23c99a04e035752b06101ca0d182 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff6885495b7d23c99a04e03… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 11 10:23:09 2006 +0900 advapi32: Fix a typo (spotted by Peter Berg Larsen). --- dlls/advapi32/crypt_arc4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/crypt_arc4.c b/dlls/advapi32/crypt_arc4.c index 2ba2b1a..9ee4b5e 100644 --- a/dlls/advapi32/crypt_arc4.c +++ b/dlls/advapi32/crypt_arc4.c @@ -103,7 +103,7 @@ NTSTATUS WINAPI SystemFunction032(struct arc4_info a4i; arc4_init(&a4i, key->Buffer, key->Length); - arc4_ProcessString(&a4i, data->Buffer, key->Length); + arc4_ProcessString(&a4i, data->Buffer, data->Length); return STATUS_SUCCESS; }

1 0

Mike McCormack : wininet: Fix a typo (spotted by Coverity).
by Alexandre Julliard 11 May '06

11 May '06

Module: wine Branch: refs/heads/master Commit: a27eee868e3aeebe37b954575b26c8ba448198e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a27eee868e3aeebe37b9545… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu May 11 10:22:58 2006 +0900 wininet: Fix a typo (spotted by Coverity). --- dlls/wininet/dialogs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 7fc6207..24c8506 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -80,7 +80,7 @@ static BOOL WININET_GetProxyServer( HINT /* FIXME: perhaps it would be better to use InternetCrackUrl here */ p = strchrW(szBuf, ':'); - if(*p) + if (p) *p = 0; return TRUE;

1 0

Francois Gouget : winapi_check: Fix 'long int' parsing.
by Alexandre Julliard 10 May '06

10 May '06

Module: wine Branch: refs/heads/master Commit: 964cbcbf80198824f03c5e3dc2de262f8095578c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=964cbcbf80198824f03c5e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 10 18:53:41 2006 +0200 winapi_check: Fix 'long int' parsing. Fix parsing of 'long int'. Simplify handling of spaces in a couple of regular expressions. --- tools/winapi/winapi_parser.pm | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index e9bcfda..2260c4f 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -426,13 +426,13 @@ sub parse_c_file($$) { $argument =~ s/^\s*(.*?)\s*$/$1/; # print " " . ($n + 1) . ": '$argument'\n"; - $argument =~ s/^(IN OUT(?=\s)|IN(?=\s)|OUT(?=\s)|\s*)\s*//; - $argument =~ s/^(const(?=\s)|CONST(?=\s)|volatile(?=\s)|\s*)\s*//; + $argument =~ s/^(?:IN OUT|IN|OUT)?\s+//; + $argument =~ s/^(?:const|CONST|volatile)?\s+//; if($argument =~ /^\.\.\.$/) { $argument_type = "..."; $argument_name = "..."; } elsif($argument =~ /^ - ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+)? (?:short\s+(?=int)|long\s+(?=int))?)?(?:\w+|ElfW$\w+$|WS$\w+$))\s* ((?:__RPC_FAR|const|CONST|volatile)?\s*(?:\*\s*(?:__RPC_FAR|const|CONST|volatile)?\s*?)*)\s* (\w*)\s*(\[\])?(?:\s+OPTIONAL)?$/x) @@ -446,7 +446,7 @@ sub parse_c_file($$) { } $argument_name = $3; } elsif ($argument =~ /^ - ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+) + ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+)? (?:short\s+(?=int)|long\s+(?=int))?)?\w+)\s* ((?:const|volatile)?\s*(?:\*\s*(?:const|volatile)?\s*?)*)\s* (?:__cdecl\s+|__stdcall\s+|__RPC_STUB\s+|__RPC_USER\s+|CALLBACK\s+|CDECL\s+|NET_API_FUNCTION\s+|RPC_ENTRY\s+|STDMETHODCALLTYPE\s+|VFWAPIV\s+|VFWAPI\s+|WINAPIV\s+|WINAPI\s+)?

1 0