October 2006 - Wine-Commits

Andrew Talbot : dbghelp: Cast-qual warnings fix.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 7da1d6d1ac1d74222a0ed027d113b64d1d9651e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da1d6d1ac1d74222a0ed027d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Oct 28 17:26:18 2006 +0100 dbghelp: Cast-qual warnings fix. --- dlls/dbghelp/path.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index f297011..59e87de 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -349,6 +349,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr struct process* pcs = process_find_by_handle(hProcess); char tmp[MAX_PATH]; char* ptr; + char* buf = NULL; const char* filename; const char* searchPath = inSearchPath; @@ -360,7 +361,6 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr if (!searchPath) { unsigned len = WideCharToMultiByte(CP_ACP, 0, pcs->search_path, -1, NULL, 0, NULL, NULL); - char* buf; searchPath = buf = HeapAlloc(GetProcessHeap(), 0, len); if (!searchPath) return FALSE; @@ -381,8 +381,7 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr if (sffip_cb(full_path, &s)) { strcpy(buffer, full_path); - if (searchPath != inSearchPath) - HeapFree(GetProcessHeap(), 0, (char*)searchPath); + HeapFree(GetProcessHeap(), 0, buf); return TRUE; } @@ -403,12 +402,10 @@ BOOL WINAPI SymFindFileInPath(HANDLE hPr if (do_search(filename, tmp, FALSE, sffip_cb, &s)) { strcpy(buffer, tmp); - if (searchPath != inSearchPath) - HeapFree(GetProcessHeap(), 0, (char*)searchPath); + HeapFree(GetProcessHeap(), 0, buf); return TRUE; } } - if (searchPath != inSearchPath) - HeapFree(GetProcessHeap(), 0, (char*)searchPath); + HeapFree(GetProcessHeap(), 0, buf); return FALSE; }

1 0

Andrew Talbot : gdi32: Cast-qual warnings fix.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 5a2227f86ea86559580688cec2e4e2a6cef6e4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2227f86ea86559580688cec… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Oct 29 17:23:20 2006 +0000 gdi32: Cast-qual warnings fix. --- dlls/gdi32/enhmetafile.c | 76 +++++++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a2227f86ea8655958068…

1 0

Andrew Talbot : gdi32: Cast-qual warnings fix.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 7b2c27aadfb0bd67f9e3a85bf287ca5f6b930651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2c27aadfb0bd67f9e3a85bf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Oct 29 17:23:11 2006 +0000 gdi32: Cast-qual warnings fix. --- dlls/gdi32/env.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/env.c b/dlls/gdi32/env.c index 8e582eb..ecac6f6 100644 --- a/dlls/gdi32/env.c +++ b/dlls/gdi32/env.c @@ -114,7 +114,8 @@ INT16 WINAPI SetEnvironment16(LPCSTR lpP { ATOM atom; BOOL16 nullport = FALSE; - LPSTR p; + LPCSTR port_name; + LPSTR device_mode; ENVTABLE *env; HGLOBAL16 handle; @@ -131,20 +132,20 @@ INT16 WINAPI SetEnvironment16(LPCSTR lpP } if (nCount) { /* store DEVMODE struct */ if (nullport) - p = (LPSTR)lpdev; + port_name = (LPSTR)lpdev; else - p = (LPSTR)lpPortName; + port_name = lpPortName; - if ((atom = PortNameToAtom(p, TRUE)) + if ((atom = PortNameToAtom(port_name, TRUE)) && (env = SearchEnvTable(0)) && (handle = GlobalAlloc16(GMEM_SHARE|GMEM_MOVEABLE, nCount))) { - if (!(p = GlobalLock16(handle))) { + if (!(device_mode = GlobalLock16(handle))) { GlobalFree16(handle); return 0; } env->atom = atom; env->handle = handle; - memcpy(p, lpdev, nCount); + memcpy(device_mode, lpdev, nCount); GlobalUnlock16(handle); return handle; }

1 0

Andrew Talbot : d3d9: Cast-qual warnings fix.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 3ac7720f059a287db74aa5ff33b4f05236579d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac7720f059a287db74aa5ff3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Oct 27 19:27:24 2006 +0100 d3d9: Cast-qual warnings fix. --- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b450cbb..349356b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -230,7 +230,7 @@ static void WINAPI IDirect3DDevice9Impl_ TRACE("(%p) Relay\n", This); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ - return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (WINED3DGAMMARAMP *) pRamp); + return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, iSwapChain, Flags, (CONST WINED3DGAMMARAMP *)pRamp); } static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { @@ -850,13 +850,13 @@ static HRESULT WINAPI IDirect3DDevice9 static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DRECTPATCH_INFO *)pRectPatchInfo); + return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (CONST WINED3DRECTPATCH_INFO *)pRectPatchInfo); } /*http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/idirect3ddevice9/DrawTriPatch.asp*/ static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *) pTriPatchInfo); + return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (CONST WINED3DTRIPATCH_INFO *)pTriPatchInfo); } static HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT Handle) { diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 6ced19a..c4281d9 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -173,7 +173,7 @@ static HRESULT WINAPI IDirect3DVolume9Im static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; TRACE("(%p) relay %p %p %p %d\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); - return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags); + return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *)pLockedVolume, (CONST WINED3DBOX *)pBox, Flags); } static HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) { diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 79ac57d..3397bb7 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -190,7 +190,7 @@ static HRESULT WINAPI IDirect3DVolumeTex static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; TRACE("(%p) Relay %p %p %p %d\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); - return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags); + return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *)pLockedVolume, (CONST WINED3DBOX *)pBox, Flags); } static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level) { @@ -202,7 +202,7 @@ static HRESULT WINAPI IDirect3DVolumeTex static HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE9 iface, CONST D3DBOX* pDirtyBox) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (WINED3DBOX *) pDirtyBox); + return IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (CONST WINED3DBOX *)pDirtyBox); }

1 0

Mike McCormack : msi: Split ACTION_UpdateInstallStates into two separate functions.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: b76691537ffec8914137cc4e0d3fcb78d5a64633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76691537ffec8914137cc4e0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Oct 30 16:35:09 2006 +0900 msi: Split ACTION_UpdateInstallStates into two separate functions. --- dlls/msi/action.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e7ba6a2..7cfd74d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1592,15 +1592,10 @@ static MSIFOLDER *load_folder( MSIPACKAG return folder; } -/* scan for and update current install states */ -static void ACTION_UpdateInstallStates(MSIPACKAGE *package) +static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) { MSICOMPONENT *comp; - MSIFEATURE *feature; - /* FIXME: component's installed state should be determined - * by the component's registration - */ LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { INSTALLSTATE res; @@ -1608,12 +1603,19 @@ static void ACTION_UpdateInstallStates(M if (!comp->ComponentId) continue; - res = MsiGetComponentPathW( package->ProductCode, + res = MsiGetComponentPathW( package->ProductCode, comp->ComponentId, NULL, NULL); if (res < 0) res = INSTALLSTATE_ABSENT; comp->Installed = res; } +} + +/* scan for and update current install states */ +static void ACTION_UpdateFeatureInstallStates(MSIPACKAGE *package) +{ + MSICOMPONENT *comp; + MSIFEATURE *feature; LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { @@ -1972,6 +1974,9 @@ static UINT ACTION_CostFinalize(MSIPACKA msiobj_release(&view->hdr); } + /* read components states from the registry */ + ACTION_GetComponentInstallStates(package); + TRACE("File calculations\n"); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -2053,7 +2058,7 @@ static UINT ACTION_CostFinalize(MSIPACKA MSI_SetPropertyW(package,szlevel, szOne); msi_free(level); - ACTION_UpdateInstallStates(package); + ACTION_UpdateFeatureInstallStates(package); return MSI_SetFeatureStates(package); }

1 0

Jacek Caban : mshtml: Print wine_gecko version in load_wine_gecko.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: b0bffdc58bac08c2d692a9e87999931b51ed9a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bffdc58bac08c2d692a9e87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 28 14:16:05 2006 +0200 mshtml: Print wine_gecko version in load_wine_gecko. --- dlls/mshtml/nsembed.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index cd4ff3b..0f38db4 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -239,6 +239,33 @@ static BOOL load_mozctl(PRUnichar *gre_p return FALSE; } +static void check_version(LPCWSTR gre_path) +{ + WCHAR file_name[MAX_PATH]; + char version[128]; + DWORD read=0; + HANDLE hfile; + + static const WCHAR wszVersion[] = {'\\','V','E','R','S','I','O','N',0}; + + strcpyW(file_name, gre_path); + strcatW(file_name, wszVersion); + + hfile = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(hfile == INVALID_HANDLE_VALUE) { + TRACE("unknown version\n"); + return; + } + + ReadFile(hfile, version, sizeof(version), &read, NULL); + version[read] = 0; + + TRACE("%s\n", debugstr_a(version)); + + CloseHandle(hfile); +} + static BOOL load_wine_gecko(PRUnichar *gre_path) { HKEY hkey; @@ -259,6 +286,9 @@ static BOOL load_wine_gecko(PRUnichar *g if(res != ERROR_SUCCESS || type != REG_SZ) return FALSE; + if(TRACE_ON(mshtml)) + check_version(gre_path); + return load_xpcom(gre_path); }

1 0

Dmitry Timoshkov : user32: Flush painting events harder in some places in order to avoid races in the message tests .
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: 0e71d0e1360ad32f5dcd6d2a9e24cc10e02698d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e71d0e1360ad32f5dcd6d2a9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Oct 28 17:42:56 2006 +0900 user32: Flush painting events harder in some places in order to avoid races in the message tests. --- dlls/user/tests/msg.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 9eaa5f0..14a7bdd 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -3816,6 +3816,7 @@ static void test_messages(void) ok (hchild != 0, "Failed to create child window\n"); SetFocus(hchild); + flush_events(); flush_sequence(); EnableWindow(hparent, FALSE); @@ -3830,8 +3831,6 @@ static void test_messages(void) /* MsgWaitForMultipleObjects test */ ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 0, QS_POSTMESSAGE); ok(ret == WAIT_TIMEOUT, "MsgWaitForMultipleObjects returned %x\n", ret); - msg.message = 0xdeadbeef; - ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "got not expected %04x\n", msg.message); PostMessageA(hparent, WM_USER, 0, 0); @@ -6712,6 +6711,8 @@ static void test_scrollwindowex(void) flush_sequence(); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); ok_sequence(ScrollWindowPaint1, "ScrollWindowEx", 0); + flush_events(); + flush_sequence(); /* Now without the SW_ERASE flag */ trace("start scroll\n"); @@ -6721,6 +6722,8 @@ static void test_scrollwindowex(void) flush_sequence(); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); ok_sequence(ScrollWindowPaint2, "ScrollWindowEx", 0); + flush_events(); + flush_sequence(); /* now scroll the child window as well */ trace("start scroll\n"); @@ -6734,6 +6737,8 @@ static void test_scrollwindowex(void) flush_sequence(); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); ok_sequence(ScrollWindowPaint1, "ScrollWindowEx", 0); + flush_events(); + flush_sequence(); /* now scroll with ScrollWindow() */ trace("start scroll with ScrollWindow\n");

1 0

Dmitry Timoshkov : user32: Properly log HCBT_KEYSKIPPED hook event, make the message
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: bed6b6cd7f8b2a61d952e31722be8bde59868b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed6b6cd7f8b2a61d952e3172… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Oct 28 17:24:13 2006 +0900 user32: Properly log HCBT_KEYSKIPPED hook event, make the message tests pass cleanly under fully up to date XP SP2. --- dlls/user/tests/msg.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 76 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bed6b6cd7f8b2a61d952e…

1 0

Detlef Riekenberg : control.exe: Remove unused define.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: fb1326fb302dfbf4e3f7844d3125891c837bda18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1326fb302dfbf4e3f7844d3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Oct 28 16:00:41 2006 +0200 control.exe: Remove unused define. --- programs/control/params.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/control/params.h b/programs/control/params.h index 3348834..d7b73d3 100644 --- a/programs/control/params.h +++ b/programs/control/params.h @@ -31,9 +31,6 @@ #define szP_PRINTERS "PRINTERS" /* alphabetical list of appropriate commands to execute */ -#define szEXEC_PREFIX "rundll32.exe" -#define szEXEC_ARGS "Shell32.dll,Control_RunDLL " - #define szC_COLOR "desk.cpl,,2" #define szC_DATETIME "timedate.cpl" #define szC_DESKTOP "desk.cpl"

1 0

Jacek Caban : urlmon: Update winehq.org IP.
by Alexandre Julliard Oct. 30, 2006

Oct. 30, 2006

Module: wine Branch: master Commit: ee5a4400303bf77c653c6ee179aff64696cf9c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5a4400303bf77c653c6ee17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 28 14:18:37 2006 +0200 urlmon: Update winehq.org IP. --- dlls/urlmon/tests/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 53c5bc4..84050dc 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -249,7 +249,7 @@ static HRESULT WINAPI ProtocolSink_Repor static const WCHAR host[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR wszWineHQIP[] = - {'2','0','9','.','3','2','.','1','4','1','.','3',0}; + {'2','0','9','.','4','6','.','2','5','.','1','3','4',0}; /* I'm not sure if it's a good idea to hardcode here the IP address... */ switch(ulStatusCode) {

1 0