October 2006 - Wine-Commits

Christopher GAUTIER : wined3d: Disable GL_REGISTER_COMBINERS_NV ( if supported) in IWineD3DSurfaceImpl_BltOverride.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 331679bcc984ca3f5dbcd09e23843f8f9bedc619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331679bcc984ca3f5dbcd09e2… Author: Christopher GAUTIER <krys(a)via.ecp.fr> Date: Thu Oct 5 09:45:23 2006 +0200 wined3d: Disable GL_REGISTER_COMBINERS_NV (if supported) in IWineD3DSurfaceImpl_BltOverride. --- dlls/wined3d/surface.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f78d651..f139840 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2333,9 +2333,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOv DWORD oldCKey; DDCOLORKEY oldBltCKey = {0,0}; GLint oldLight, oldFog, oldDepth, oldBlend, oldCull, oldAlpha; + GLint oldStencil, oldNVRegisterCombiners = 0; GLint alphafunc; GLclampf alpharef; - GLint oldStencil; RECT SourceRectangle; GLint oldDraw; @@ -2397,6 +2397,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOv oldAlpha = glIsEnabled(GL_ALPHA_TEST); oldStencil = glIsEnabled(GL_STENCIL_TEST); + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + oldNVRegisterCombiners = glIsEnabled(GL_REGISTER_COMBINERS_NV); + } + glGetIntegerv(GL_ALPHA_TEST_FUNC, &alphafunc); checkGLcall("glGetFloatv GL_ALPHA_TEST_FUNC"); glGetFloatv(GL_ALPHA_TEST_REF, &alpharef); @@ -2433,6 +2437,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOv checkGLcall("glDisable GL_CULL_FACE"); glDisable(GL_STENCIL_TEST); checkGLcall("glDisable GL_STENCIL_TEST"); + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + glDisable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glDisable GL_REGISTER_COMBINERS_NV"); + } /* Ok, we need 2d textures, but not 1D or 3D */ glDisable(GL_TEXTURE_1D); @@ -2536,6 +2544,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOv glEnable(GL_ALPHA_TEST); checkGLcall("glEnable GL_ALPHA_TEST"); } + if (GL_SUPPORT(NV_REGISTER_COMBINERS) && oldNVRegisterCombiners) { + glEnable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glEnable GL_REGISTER_COMBINERS_NV"); + } glAlphaFunc(alphafunc, alpharef); checkGLcall("glAlphaFunc\n");

1 0

James Hawkins : msi: Make msi_dialog_dup_property return a copy of the property if the property is empty .
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 9024a88dd996887a34d10b39231971b22f703143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9024a88dd996887a34d10b392… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 5 19:41:13 2006 -0700 msi: Make msi_dialog_dup_property return a copy of the property if the property is empty. --- dlls/msi/dialog.c | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ef685e0..11890ac 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -217,13 +217,18 @@ static LPWSTR msi_get_deformatted_field( static LPWSTR msi_dialog_dup_property( msi_dialog *dialog, LPCWSTR property, BOOL indirect ) { + LPWSTR prop = NULL; + if (!property) return NULL; if (indirect) - return msi_dup_property( dialog->package, property ); + prop = msi_dup_property( dialog->package, property ); + + if (!prop) + prop = strdupW( property ); - return strdupW( property ); + return prop; } msi_dialog *msi_dialog_get_parent( msi_dialog *dialog ) @@ -1469,10 +1474,7 @@ static void msi_dialog_update_pathedit( indirect = control->attributes & msidbControlAttributesIndirect; prop = msi_dialog_dup_property( dialog, control->property, indirect ); - - path = msi_dup_property( dialog->package, prop ); - if (!path) - path = prop; + path = msi_dialog_dup_property( dialog, prop, TRUE ); SetWindowTextW( control->hwnd, path ); SendMessageW( control->hwnd, EM_SETSEL, 0, -1 ); @@ -2171,10 +2173,7 @@ 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; + path = msi_dialog_dup_property( dialog, prop, TRUE ); PathStripPathW( path ); PathRemoveBackslashW( path ); @@ -2231,10 +2230,7 @@ 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; + path = msi_dialog_dup_property( dialog, prop, TRUE ); lstrcpyW( dir_spec, path ); lstrcatW( dir_spec, asterisk ); @@ -2274,10 +2270,7 @@ UINT msi_dialog_directorylist_up( msi_di control = msi_dialog_find_control_by_type( dialog, szDirectoryList ); indirect = control->attributes & msidbControlAttributesIndirect; prop = msi_dialog_dup_property( dialog, control->property, indirect ); - - path = msi_dup_property( dialog->package, prop ); - if (!path) - path = prop; + path = msi_dialog_dup_property( dialog, prop, TRUE ); /* strip off the last directory */ ptr = PathFindFileNameW( path ); @@ -2326,10 +2319,7 @@ 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; + path = msi_dialog_dup_property( dialog, prop, TRUE ); lstrcpyW( new_path, path ); lstrcatW( new_path, text );

1 0

James Hawkins : ddraw: Set lplpDirect3DViewport3 to NULL before returning an error ( found by Smatch).
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 1a922b6a3887d89a767af46aef94d7d10acb4ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a922b6a3887d89a767af46ae… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 5 19:57:48 2006 -0700 ddraw: Set lplpDirect3DViewport3 to NULL before returning an error (found by Smatch). --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a8545b4..c728a7a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -903,8 +903,8 @@ IDirect3DDeviceImpl_3_NextViewport(IDire if(!vp) { - return DDERR_INVALIDPARAMS; *lplpDirect3DViewport3 = NULL; + return DDERR_INVALIDPARAMS; }

1 0

James Hawkins : dinput: Call missing LeaveCriticalSection in the error case (found by Smatch).
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 553bafd535c2dbbc5f2a49b423982285c35112e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553bafd535c2dbbc5f2a49b42… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 5 19:39:54 2006 -0700 dinput: Call missing LeaveCriticalSection in the error case (found by Smatch). --- dlls/dinput/mouse.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index aae5e9a..ea4b2c4 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -703,7 +703,10 @@ static HRESULT WINAPI SysMouseAImpl_GetD /* Check if we need to do a mouse warping */ if (This->need_warp == WARP_NEEDED && (GetCurrentTime() - This->last_warped > 10)) { if(!dinput_window_check(This)) + { + LeaveCriticalSection(&(This->crit)); return DIERR_GENERIC; + } TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime();

1 0

James Hawkins : crypt32: Remove redundant NULL checks before CryptMemFree ( found by Smatch).
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: b96ac007645c94c8f44ec8983f53c5b4a247cb43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96ac007645c94c8f44ec8983… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 5 19:36:49 2006 -0700 crypt32: Remove redundant NULL checks before CryptMemFree (found by Smatch). --- dlls/crypt32/protectdata.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 75846e7..9cc8584 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -537,20 +537,13 @@ void free_protect_data(struct protect_da if (!pInfo) return; - if (pInfo->info0.pbData) - CryptMemFree(pInfo->info0.pbData); - if (pInfo->info1.pbData) - CryptMemFree(pInfo->info1.pbData); - if (pInfo->szDataDescr) - CryptMemFree(pInfo->szDataDescr); - if (pInfo->data0.pbData) - CryptMemFree(pInfo->data0.pbData); - if (pInfo->salt.pbData) - CryptMemFree(pInfo->salt.pbData); - if (pInfo->cipher.pbData) - CryptMemFree(pInfo->cipher.pbData); - if (pInfo->fingerprint.pbData) - CryptMemFree(pInfo->fingerprint.pbData); + CryptMemFree(pInfo->info0.pbData); + CryptMemFree(pInfo->info1.pbData); + CryptMemFree(pInfo->szDataDescr); + CryptMemFree(pInfo->data0.pbData); + CryptMemFree(pInfo->salt.pbData); + CryptMemFree(pInfo->cipher.pbData); + CryptMemFree(pInfo->fingerprint.pbData); } /* copies a string into a data blob */ @@ -768,7 +761,7 @@ BOOL load_encryption_key(HCRYPTPROV hPro /* clean up */ CryptDestroyHash(hSaltHash); - if (szUsername) CryptMemFree(szUsername); + CryptMemFree(szUsername); return rc; }

1 0

James Hawkins : dbghelp: Remove redundant NULL checks before pdb_free ( found by Smatch).
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 1b95f6093868254b612138ae1136d2257a551b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b95f6093868254b612138ae1… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 5 19:38:54 2006 -0700 dbghelp: Remove redundant NULL checks before pdb_free (found by Smatch). --- dlls/dbghelp/msc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 46bb70b..a0b4960 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1746,10 +1746,10 @@ static void pdb_free_lookup(const struct switch (pdb_lookup->kind) { case PDB_JG: - if (pdb_lookup->u.jg.toc) pdb_free(pdb_lookup->u.jg.toc); + pdb_free(pdb_lookup->u.jg.toc); break; case PDB_DS: - if (pdb_lookup->u.ds.toc) pdb_free(pdb_lookup->u.ds.toc); + pdb_free(pdb_lookup->u.ds.toc); break; } } @@ -2193,7 +2193,7 @@ static BOOL pdb_process_internal(const s leave: /* Cleanup */ - if (symbols_image) pdb_free(symbols_image); + pdb_free(symbols_image); pdb_free_lookup(pdb_lookup); if (image) UnmapViewOfFile(image);

1 0

James Hawkins : advapi32: Remove redundant NULL check before SERV_free ( found by Smatch).
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: ca118989f454554f6913337cca272a925653d0db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca118989f454554f6913337cc… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 5 19:38:07 2006 -0700 advapi32: Remove redundant NULL check before SERV_free (found by Smatch). --- dlls/advapi32/service.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index be0f41f..b1d80dc 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -433,8 +433,7 @@ static BOOL service_handle_start(HANDLE goto end; } - if (service->args) - SERV_free(service->args); + SERV_free(service->args); service->args = args; args = NULL; service->thread = CreateThread( NULL, 0, service_thread,

1 0

Jacek Caban : mshtml: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 0c74c0a95bdb4d39242a5e2ccc112cd6d29be88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c74c0a95bdb4d39242a5e2cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 5 23:50:39 2006 +0200 mshtml: Win64 printf format warning fixes. --- dlls/mshtml/Makefile.in | 2 - dlls/mshtml/conpoint.c | 2 - dlls/mshtml/hlink.c | 28 ++++++------ dlls/mshtml/htmlbody.c | 8 ++-- dlls/mshtml/htmldoc.c | 14 +++--- dlls/mshtml/htmldoc3.c | 8 ++-- dlls/mshtml/htmlelem.c | 32 +++++++------- dlls/mshtml/htmlelem2.c | 6 +-- dlls/mshtml/htmlinput.c | 16 ++++--- dlls/mshtml/htmlnode.c | 6 +-- dlls/mshtml/htmlselect.c | 12 +++-- dlls/mshtml/htmltextarea.c | 12 +++-- dlls/mshtml/htmltextcont.c | 10 ++-- dlls/mshtml/install.c | 12 +++-- dlls/mshtml/loadopts.c | 8 ++-- dlls/mshtml/main.c | 6 +-- dlls/mshtml/navigate.c | 40 +++++++++--------- dlls/mshtml/nsembed.c | 86 +++++++++++++++++++------------------- dlls/mshtml/nsio.c | 54 ++++++++++++------------ dlls/mshtml/nsservice.c | 16 ++++--- dlls/mshtml/olecmd.c | 100 ++++++++++++++++++++++---------------------- dlls/mshtml/oleobj.c | 32 +++++++------- dlls/mshtml/persist.c | 16 ++++--- dlls/mshtml/protocol.c | 48 +++++++++++---------- dlls/mshtml/selection.c | 10 ++-- dlls/mshtml/txtrange.c | 12 +++-- dlls/mshtml/view.c | 32 +++++++------- 27 files changed, 314 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c74c0a95bdb4d39242a5…

1 0

Mike McCormack : comctl32: Return the correct value for CB_GETLBTEXTLEN.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 1207e84af50da8525c802cf70593aa2db5e31f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1207e84af50da8525c802cf70… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 6 17:42:22 2006 +0900 comctl32: Return the correct value for CB_GETLBTEXTLEN. --- dlls/comctl32/comboex.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 1f29024..00c5fc3 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -501,6 +501,32 @@ static inline BOOL COMBOEX_HasEdit(COMBO /* *** CBEM_xxx message support *** */ +static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf) +{ + CBE_ITEMDATA *item; + LPCWSTR str; + + item = COMBOEX_FindItem(infoPtr, n); + if (!item) + return 0; + + str = COMBOEX_GetText(infoPtr, item); + + if (infoPtr->unicode) + { + if (buf) + lstrcpyW(buf, str); + return lstrlenW(str); + } + else + { + UINT r; + r = WideCharToMultiByte(CP_ACP, 0, str, -1, (LPSTR)buf, 0x40000000, NULL, NULL); + if (r) r--; + return r; + } +} + static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index) { @@ -2193,11 +2219,15 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg case WM_GETTEXT: return SendMessageW(infoPtr->hwndEdit, uMsg, wParam, lParam); + case CB_GETLBTEXT: + return COMBOEX_GetListboxText(infoPtr, wParam, (LPWSTR)lParam); + + case CB_GETLBTEXTLEN: + return COMBOEX_GetListboxText(infoPtr, wParam, NULL); + /* Combo messages we are not sure if we need to process or just forward */ case CB_GETDROPPEDCONTROLRECT: case CB_GETITEMHEIGHT: - case CB_GETLBTEXT: - case CB_GETLBTEXTLEN: case CB_GETEXTENDEDUI: case CB_LIMITTEXT: case CB_RESETCONTENT:

1 0

Mike McCormack : msi: Fix transform traces.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 4d41a2b9ee2ba952e9b800df25e90ea85c940565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d41a2b9ee2ba952e9b800df2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 6 17:37:06 2006 +0900 msi: Fix transform traces. --- dlls/msi/table.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d5e6332..dfbc73a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1655,7 +1655,7 @@ static MSIRECORD *msi_get_transform_reco if( !rec ) return rec; - TRACE("row -> "); + TRACE("row -> \n"); for( i=0; i<tv->num_cols; i++ ) { UINT n = bytes_per_column( &columns[i] ); @@ -1675,20 +1675,20 @@ static MSIRECORD *msi_get_transform_reco { LPCWSTR sval = msi_string_lookup_id( st, val ); MSI_RecordSetStringW( rec, i+1, sval ); - TRACE("[%s]", debugstr_w(sval)); + TRACE(" field %d [%s]\n", i+1, debugstr_w(sval)); } else { if (val) MSI_RecordSetInteger( rec, i+1, val^0x8000 ); - TRACE("[0x%04x]", val ); + TRACE(" field %d [0x%04x]\n", i+1, val ); } break; case 4: val = (rawdata[ofs] + (rawdata[ofs + 1]<<16)); if (val) MSI_RecordSetInteger( rec, i+1, val^0x80000000 ); - TRACE("[0x%08x]", val ); + TRACE(" field %d [0x%08x]\n", i+1, val ); break; default: ERR("oops - unknown column width %d\n", n); @@ -1696,7 +1696,6 @@ static MSIRECORD *msi_get_transform_reco } ofs += n/2; } - TRACE("\n"); return rec; } @@ -1911,7 +1910,7 @@ static UINT msi_table_load_transform( MS if( rawdata[n] & 1) { - TRACE("insert [%d]: ", row); + TRACE("insert [%d]: \n", row); /* * Native msi seems writes nul into the @@ -1930,12 +1929,12 @@ static UINT msi_table_load_transform( MS } else if( mask & 0xff ) { - TRACE("modify [%d]: ", row); + TRACE("modify [%d]: \n", row); msi_table_modify_row( tv, rec, row, mask ); } else { - TRACE("delete [%d]: ", row); + TRACE("delete [%d]: \n", row); msi_delete_row( tv, row ); } if( TRACE_ON(msidb) ) dump_record( rec );

1 0