April 2008 - Wine-commits - list.winehq.org

James Hawkins : fusion: Implement IAssemblyCache::InstallAssembly.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 282246eca4aa778f447e8951dea416fb5e817657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=282246eca4aa778f447e8951d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Apr 13 21:00:15 2008 -0500 fusion: Implement IAssemblyCache::InstallAssembly. --- dlls/fusion/Makefile.in | 3 +- dlls/fusion/asmcache.c | 134 ++++++++++- dlls/fusion/assembly.c | 573 ++++++++++++++++++++++++++++++++++++++++++ dlls/fusion/fusionpriv.h | 212 ++++++++++++++++ dlls/fusion/tests/asmcache.c | 61 ++--- 5 files changed, 943 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=282246eca4aa778f447e8…

1 0

Andrew Talbot : crypt32: Remove unused variables.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: d3afff856eae9e163a22d534d50cff4e7368670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3afff856eae9e163a22d534d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 14 22:13:41 2008 +0100 crypt32: Remove unused variables. --- dlls/crypt32/oid.c | 3 +-- dlls/crypt32/store.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 980c750..5a71c74 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -938,7 +938,6 @@ BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD dwEncodingType, { HKEY key; LPWSTR dlls; - LPCWSTR existing; BOOL ret = FALSE; TRACE("(%x, %s, %d, %s)\n", dwEncodingType, debugstr_a(pszFuncName), @@ -954,7 +953,7 @@ BOOL WINAPI CryptRegisterDefaultOIDFunction(DWORD dwEncodingType, return FALSE; dlls = CRYPT_GetDefaultOIDDlls(key); - if ((existing = CRYPT_FindStringInMultiString(dlls, pwszDll))) + if (CRYPT_FindStringInMultiString(dlls, pwszDll)) SetLastError(ERROR_FILE_EXISTS); else { diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 20d71b7..84d326c 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -291,7 +291,6 @@ static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, PWINECRYPT_CERTSTORE store = NULL; HKEY root; LPCWSTR base; - BOOL ret; TRACE("(%ld, %08x, %s)\n", hCryptProv, dwFlags, debugstr_w((LPCWSTR)pvPara)); @@ -304,7 +303,6 @@ static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, if (!lstrcmpiW(storeName, rootW)) return CRYPT_RootOpenStore(hCryptProv, dwFlags); - ret = TRUE; switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) { case CERT_SYSTEM_STORE_LOCAL_MACHINE:

1 0

Andrew Talbot : comdlg32: Remove unused variables.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 1089e165a4747d03bd3ac34ca17eee6083e55504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1089e165a4747d03bd3ac34ca… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 14 22:13:38 2008 +0100 comdlg32: Remove unused variables. --- dlls/comdlg32/printdlg.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index ea5d34e..808a33c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1247,7 +1247,6 @@ static LRESULT check_printer_setup(HWND hDlg) { DWORD needed,num; WCHAR resourcestr[256],resultstr[256]; - int res; EnumPrintersW(PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &needed, &num); if(needed == 0) @@ -1260,7 +1259,7 @@ static LRESULT check_printer_setup(HWND hDlg) { LoadStringW(COMDLG32_hInstance, PD32_NO_DEVICES,resultstr, 255); LoadStringW(COMDLG32_hInstance, PD32_PRINT_TITLE,resourcestr, 255); - res = MessageBoxW(hDlg, resultstr, resourcestr,MB_OK | MB_ICONWARNING); + MessageBoxW(hDlg, resultstr, resourcestr,MB_OK | MB_ICONWARNING); return FALSE; } } @@ -2566,15 +2565,13 @@ _c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) { */ static BOOL PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) { - DEVNAMES *dn; DEVMODEA *dm; DWORD paperword; memcpy(pda->dlga, &pda->curdlg, sizeof(pda->curdlg)); pda->dlga->hDevMode = pda->pdlg.hDevMode; pda->dlga->hDevNames = pda->pdlg.hDevNames; - - dn = GlobalLock(pda->pdlg.hDevNames); + dm = GlobalLock(pda->pdlg.hDevMode); /* Save paper orientation into device context */ @@ -2599,7 +2596,6 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) { else FIXME("could not get dialog text for papersize cmbbox?\n"); - GlobalUnlock(pda->pdlg.hDevNames); GlobalUnlock(pda->pdlg.hDevMode); return TRUE;

1 0

Marcus Meissner : d3d9: Initialized 2 variables with NULL.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: c59f18121f003ec0586a896ff12f4bb0914a1a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59f18121f003ec0586a896ff… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Apr 15 09:30:30 2008 +0200 d3d9: Initialized 2 variables with NULL. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e8866c0..e977930 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2043,8 +2043,8 @@ static void fill_surface(IDirect3DSurface9 *surface, DWORD color) static void stretchrect_test(IDirect3DDevice9 *device) { HRESULT hr; - IDirect3DTexture9 *tex_rt32 = NULL, *tex_rt64 = NULL, *tex_rt_dest64; - IDirect3DSurface9 *surf_tex_rt32 = NULL, *surf_tex_rt64 = NULL, *surf_tex_rt_dest64; + IDirect3DTexture9 *tex_rt32 = NULL, *tex_rt64 = NULL, *tex_rt_dest64 = NULL; + IDirect3DSurface9 *surf_tex_rt32 = NULL, *surf_tex_rt64 = NULL, *surf_tex_rt_dest64 = NULL; IDirect3DTexture9 *tex32 = NULL, *tex64 = NULL, *tex_dest64 = NULL; IDirect3DSurface9 *surf_tex32 = NULL, *surf_tex64 = NULL, *surf_tex_dest64 = NULL; IDirect3DSurface9 *surf_rt32 = NULL, *surf_rt64 = NULL, *surf_rt_dest64 = NULL;

1 0

Andrew Talbot : crypt32: Remove unwanted shadow variable.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 8a1d3b334d539728e7ae49f442cc1f757bf09620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1d3b334d539728e7ae49f44… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 14 22:02:20 2008 +0100 crypt32: Remove unwanted shadow variable. --- dlls/crypt32/encode.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index f769afc..9071e5c 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1227,7 +1227,6 @@ static BOOL WINAPI CRYPT_DEREncodeItemsAsSet(DWORD dwCertEncodingType, if (ret) { DWORD bytesNeeded = 0, lenBytes; - BOOL ret; for (i = 0; i < setOf.cBlob; i++) bytesNeeded += setOf.rgBlob[i].cbData;

1 0

Lei Zhang : user32: Handle ctrl + end in edit control.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 483116a89e96430b9ce41b629e5c75b52d45e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=483116a89e96430b9ce41b629… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 14 17:18:40 2008 -0700 user32: Handle ctrl + end in edit control. --- dlls/user32/edit.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e367e6e..a5265e9 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -211,7 +211,7 @@ static void EDIT_LockBuffer(EDITSTATE *es); static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size); static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size); static void EDIT_MoveBackward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend); +static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveForward(EDITSTATE *es, BOOL extend); static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend); @@ -2012,13 +2012,13 @@ static void EDIT_MoveDown_ML(EDITSTATE *es, BOOL extend) * EDIT_MoveEnd * */ -static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend) +static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend, BOOL ctrl) { BOOL after_wrap = FALSE; INT e; /* Pass a high value in x to make sure of receiving the end of the line */ - if (es->style & ES_MULTILINE) + if (!ctrl && (es->style & ES_MULTILINE)) e = EDIT_CharFromPos(es, 0x3fffffff, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), &after_wrap); else @@ -4568,7 +4568,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) EDIT_MoveHome(es, shift, control); break; case VK_END: - EDIT_MoveEnd(es, shift); + EDIT_MoveEnd(es, shift, control); break; case VK_PRIOR: if (es->style & ES_MULTILINE) @@ -4598,7 +4598,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) } else if (control) { /* delete to end of line */ EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); - EDIT_MoveEnd(es, TRUE); + EDIT_MoveEnd(es, TRUE, FALSE); EDIT_WM_Clear(es); } else { /* delete character right of caret */

1 0

Marcus Meissner : shell32: Correct casing for "Wine".
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: e8a6f15b3d2a9f33d98c1780d73cbc4c92894cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a6f15b3d2a9f33d98c1780d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Apr 2 09:37:25 2008 +0200 shell32: Correct casing for "Wine". --- dlls/shell32/shell32_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 73068d4..f5e0291 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -149,7 +149,7 @@ FONT 10, "MS Shell Dlg" LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 LTEXT "Wine Version %s", IDC_ABOUT_STATIC_TEXT3, 40, 34, 170, 10 - LTEXT "WINE wurde f�r Sie gekeltert von:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "Wine wurde f�r Sie gekeltert von:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

Jacek Caban : mshtml.idl: Added IHTMLWindow3 declaration.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: b56a072eb964f51afc8f7e34a4d18207c1f5a868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56a072eb964f51afc8f7e34a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 15 02:09:14 2008 +0200 mshtml.idl: Added IHTMLWindow3 declaration. --- include/mshtml.idl | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index f82391d..16ff754 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -4488,6 +4488,74 @@ interface IHTMLWindow2 : IHTMLFramesCollection2 } /***************************************************************************** + * IHTMLWindow3 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4ae-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLWindow3 : IDispatch +{ + [propget, id(DISPID_IHTMLWINDOW3_SCREENLEFT)] + HRESULT screenLeft([out, retval] long *p); + + [propget, id(DISPID_IHTMLWINDOW3_SCREENTOP)] + HRESULT screenTop([out, retval] long *p); + + [id(DISPID_IHTMLWINDOW3_ATTACHEVENT)] + HRESULT attachEvent( + [in] BSTR event, + [in] IDispatch *pDisp, + [out, retval] VARIANT_BOOL *pfResult); + + [id(DISPID_IHTMLWINDOW3_DETACHEVENT)] + HRESULT detachEvent( + [in] BSTR event, + [in] IDispatch *pDisp); + + [id(DISPID_IHTMLWINDOW3_SETTIMEOUT)] + HRESULT setTimeout( + [in] VARIANT *expression, + [in] long msec, + [in, optional] VARIANT *language, + [out, retval] long *timerID); + + [id(DISPID_IHTMLWINDOW3_SETINTERVAL)] + HRESULT setInterval( + [in] VARIANT *expression, + [in] long msec, + [in, optional] VARIANT *language, + [out, retval] long *timerID); + + [id(DISPID_IHTMLWINDOW3_PRINT)] + HRESULT print(); + + [propput, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + HRESULT onbeforeprint([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONBEFOREPRINT), displaybind, bindable] + HRESULT onbeforeprint([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + HRESULT onafterprint([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW3_ONAFTERPRINT), displaybind, bindable] + HRESULT onafterprint([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLWINDOW3_CLIPBOARDDATA)] + HRESULT clipboardData([out, retval] IHTMLDataTransfer **p); + + [id(DISPID_IHTMLWINDOW3_SHOWMODELESSDIALOG)] + HRESULT showModelessDialog( + [in, defaultvalue("")] BSTR url, + [in, optional] VARIANT *varArgIn, + [in, optional] VARIANT *options, + [out, retval] IHTMLWindow2 **pDialog); +} + +/***************************************************************************** * DispHTMLWindow2 dispinterface */ [

1 0

Lei Zhang : user32: Do checks in the right order in EDIT_BuildLineDefs_ML.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 4aef5cb86dcb1e2692a233883f3fe102a5477334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aef5cb86dcb1e2692a233883… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 14 16:53:42 2008 -0700 user32: Do checks in the right order in EDIT_BuildLineDefs_ML. --- dlls/user32/edit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b2bfe1c..c969ea2 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1277,9 +1277,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->width = (INT)LOWORD(GetTabbedTextExtentW(dc, current_position, current_line->net_length, es->tabs_count, es->tabs)); } - else if (orig_net_length < current_line->net_length && - current_line == start_line && - current_line->index != nstart_index) { + else if (current_line == start_line && + current_line->index != nstart_index && + orig_net_length < current_line->net_length) { /* The previous line expanded but it's still not as wide as the client rect */ /* The expansion is due to an upwards line wrap so we must partially include it in the update region */

1 0

Lei Zhang : user32: Handle ctrl + home in edit control.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: dfdd9290a7d90e11fec3a1045ad48fae6d79921e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfdd9290a7d90e11fec3a1045… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 14 17:16:36 2008 -0700 user32: Handle ctrl + home in edit control. --- dlls/user32/edit.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c969ea2..e367e6e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -213,7 +213,7 @@ static BOOL EDIT_MakeUndoFit(EDITSTATE *es, UINT size); static void EDIT_MoveBackward(EDITSTATE *es, BOOL extend); static void EDIT_MoveEnd(EDITSTATE *es, BOOL extend); static void EDIT_MoveForward(EDITSTATE *es, BOOL extend); -static void EDIT_MoveHome(EDITSTATE *es, BOOL extend); +static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl); static void EDIT_MoveWordBackward(EDITSTATE *es, BOOL extend); static void EDIT_MoveWordForward(EDITSTATE *es, BOOL extend); static void EDIT_PaintLine(EDITSTATE *es, HDC hdc, INT line, BOOL rev); @@ -2058,12 +2058,12 @@ static void EDIT_MoveForward(EDITSTATE *es, BOOL extend) * Home key: move to beginning of line. * */ -static void EDIT_MoveHome(EDITSTATE *es, BOOL extend) +static void EDIT_MoveHome(EDITSTATE *es, BOOL extend, BOOL ctrl) { INT e; /* Pass the x_offset in x to make sure of receiving the first position of the line */ - if (es->style & ES_MULTILINE) + if (!ctrl && (es->style & ES_MULTILINE)) e = EDIT_CharFromPos(es, -es->x_offset, HIWORD(EDIT_EM_PosFromChar(es, es->selection_end, es->flags & EF_AFTER_WRAP)), NULL); else @@ -4028,7 +4028,7 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) case '\n': if (es->style & ES_MULTILINE) { if (es->style & ES_READONLY) { - EDIT_MoveHome(es, FALSE); + EDIT_MoveHome(es, FALSE, FALSE); EDIT_MoveDown_ML(es, FALSE); } else { static const WCHAR cr_lfW[] = {'\r','\n',0}; @@ -4565,7 +4565,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) EDIT_MoveForward(es, shift); break; case VK_HOME: - EDIT_MoveHome(es, shift); + EDIT_MoveHome(es, shift, control); break; case VK_END: EDIT_MoveEnd(es, shift);

1 0