January 2009 - Wine-Commits

Detlef Riekenberg : comdlg32: Remove dead code (GetModuleHandleA can't fail ).
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: cbaa2e5bd7ac3bf201b1f17882928847821b4a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbaa2e5bd7ac3bf201b1f1788… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jan 22 22:16:07 2009 +0100 comdlg32: Remove dead code (GetModuleHandleA can't fail). --- dlls/comdlg32/cdlg32.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index afa3c61..321554f 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -83,12 +83,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) SHELL32_hInstance = GetModuleHandleA("SHELL32.DLL"); - if (!SHELL32_hInstance) - { - ERR("loading of shell32 failed\n"); - return FALSE; - } - /* ITEMIDLIST */ GPA(COMDLG32_PIDL_ILIsEqual, SHELL32_hInstance, (LPCSTR)21L); GPA(COMDLG32_PIDL_ILCombine, SHELL32_hInstance, (LPCSTR)25L);

1 0

Austin English : iphlpapi: Include netinet/if_inarp.h for NetBSD.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 337067a89d39a6bf20d53e4930f42bb7d9145302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=337067a89d39a6bf20d53e493… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 22 10:44:06 2009 -0600 iphlpapi: Include netinet/if_inarp.h for NetBSD. --- configure | 2 ++ configure.ac | 1 + dlls/iphlpapi/ipstats.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 9 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f327766..bf76813 100755 --- a/configure +++ b/configure @@ -7926,6 +7926,7 @@ done + for ac_header in \ netinet/ip.h \ net/if.h \ @@ -7934,6 +7935,7 @@ for ac_header in \ net/if_types.h \ net/route.h \ netinet/if_ether.h \ + netinet/if_inarp.h \ netinet/in_pcb.h \ netinet/ip_icmp.h \ netinet/ip_var.h \ diff --git a/configure.ac b/configure.ac index 1a2828d..66ad0ac 100644 --- a/configure.ac +++ b/configure.ac @@ -386,6 +386,7 @@ AC_CHECK_HEADERS(\ net/if_types.h \ net/route.h \ netinet/if_ether.h \ + netinet/if_inarp.h \ netinet/in_pcb.h \ netinet/ip_icmp.h \ netinet/ip_var.h \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5d0be71..32e24e3 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -64,6 +64,9 @@ #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif +#ifdef HAVE_NETINET_IF_INARP_H +#include <netinet/if_inarp.h> +#endif #ifdef HAVE_NETINET_IP_H #include <netinet/ip.h> #endif diff --git a/include/config.h.in b/include/config.h.in index db83db0..11dc1c6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -456,6 +456,9 @@ /* Define to 1 if you have the <netinet/if_ether.h> header file. */ #undef HAVE_NETINET_IF_ETHER_H +/* Define to 1 if you have the <netinet/if_inarp.h> header file. */ +#undef HAVE_NETINET_IF_INARP_H + /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H

1 0

Andrew Talbot : rsaenh: Declare some functions static.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: 149ee9bf3ba89069e0e579c8fb7caae45b61fd24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149ee9bf3ba89069e0e579c8f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 22 22:07:54 2009 +0000 rsaenh: Declare some functions static. --- dlls/rsaenh/mpi.c | 278 ++++++++++++++++++++++++------------------------ dlls/rsaenh/tomcrypt.h | 29 ----- 2 files changed, 139 insertions(+), 168 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 1a5affd..0eb91f3 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -232,6 +232,28 @@ mp_zero (mp_int * a) memset (a->dp, 0, sizeof (mp_digit) * a->alloc); } +/* b = |a| + * + * Simple function copies the input and fixes the sign to positive + */ +static int +mp_abs (const mp_int * a, mp_int * b) +{ + int res; + + /* copy a to b */ + if (a != b) { + if ((res = mp_copy (a, b)) != MP_OKAY) { + return res; + } + } + + /* force the sign of b to positive */ + b->sign = MP_ZPOS; + + return MP_OKAY; +} + /* computes the modular inverse via binary extended euclidean algorithm, * that is c = 1/a mod b * @@ -793,7 +815,7 @@ static int fast_s_mp_sqr (const mp_int * a, mp_int * b) * Simple algorithm which zeroes the int, grows it then just sets one bit * as required. */ -int +static int mp_2expt (mp_int * a, int b) { int res; @@ -815,28 +837,6 @@ mp_2expt (mp_int * a, int b) return MP_OKAY; } -/* b = |a| - * - * Simple function copies the input and fixes the sign to positive - */ -int -mp_abs (const mp_int * a, mp_int * b) -{ - int res; - - /* copy a to b */ - if (a != b) { - if ((res = mp_copy (a, b)) != MP_OKAY) { - return res; - } - } - - /* force the sign of b to positive */ - b->sign = MP_ZPOS; - - return MP_OKAY; -} - /* high level addition (handles signs) */ int mp_add (mp_int * a, mp_int * b, mp_int * c) { @@ -870,7 +870,7 @@ int mp_add (mp_int * a, mp_int * b, mp_int * c) /* single digit addition */ -int +static int mp_add_d (mp_int * a, mp_digit b, mp_int * c) { int res, ix, oldused; @@ -1205,6 +1205,57 @@ mp_mod_2d (const mp_int * a, int b, mp_int * c) return MP_OKAY; } +/* shift right a certain amount of digits */ +static void mp_rshd (mp_int * a, int b) +{ + int x; + + /* if b <= 0 then ignore it */ + if (b <= 0) { + return; + } + + /* if b > used then simply zero it and return */ + if (a->used <= b) { + mp_zero (a); + return; + } + + { + register mp_digit *bottom, *top; + + /* shift the digits down */ + + /* bottom */ + bottom = a->dp; + + /* top [offset into digits] */ + top = a->dp + b; + + /* this is implemented as a sliding window where + * the window is b-digits long and digits from + * the top of the window are copied to the bottom + * + * e.g. + + b-2 | b-1 | b0 | b1 | b2 | ... | bb | ----> + /\ | ----> + \-------------------/ ----> + */ + for (x = 0; x < (a->used - b); x++) { + *bottom++ = *top++; + } + + /* zero the top digits */ + for (; x < a->used; x++) { + *bottom++ = 0; + } + } + + /* remove excess digits */ + a->used -= b; +} + /* shift right by a certain bit count (store quotient in c, optional remainder in d) */ static int mp_div_2d (const mp_int * a, int b, mp_int * c, mp_int * d) { @@ -3096,7 +3147,7 @@ static const mp_digit __prime_tab[] = { * * sets result to 0 if not, 1 if yes */ -int mp_prime_is_divisible (const mp_int * a, int *result) +static int mp_prime_is_divisible (const mp_int * a, int *result) { int err, ix; mp_digit res; @@ -3120,68 +3171,6 @@ int mp_prime_is_divisible (const mp_int * a, int *result) return MP_OKAY; } -/* performs a variable number of rounds of Miller-Rabin - * - * Probability of error after t rounds is no more than - - * - * Sets result to 1 if probably prime, 0 otherwise - */ -int mp_prime_is_prime (mp_int * a, int t, int *result) -{ - mp_int b; - int ix, err, res; - - /* default to no */ - *result = MP_NO; - - /* valid value of t? */ - if (t <= 0 || t > PRIME_SIZE) { - return MP_VAL; - } - - /* is the input equal to one of the primes in the table? */ - for (ix = 0; ix < PRIME_SIZE; ix++) { - if (mp_cmp_d(a, __prime_tab[ix]) == MP_EQ) { - *result = 1; - return MP_OKAY; - } - } - - /* first perform trial division */ - if ((err = mp_prime_is_divisible (a, &res)) != MP_OKAY) { - return err; - } - - /* return if it was trivially divisible */ - if (res == MP_YES) { - return MP_OKAY; - } - - /* now perform the miller-rabin rounds */ - if ((err = mp_init (&b)) != MP_OKAY) { - return err; - } - - for (ix = 0; ix < t; ix++) { - /* set the prime */ - mp_set (&b, __prime_tab[ix]); - - if ((err = mp_prime_miller_rabin (a, &b, &res)) != MP_OKAY) { - goto __B; - } - - if (res == MP_NO) { - goto __B; - } - } - - /* passed the test */ - *result = MP_YES; -__B:mp_clear (&b); - return err; -} - /* Miller-Rabin test of "a" to the base of "b" as described in * HAC pp. 139 Algorithm 4.24 * @@ -3189,7 +3178,7 @@ __B:mp_clear (&b); * Randomly the chance of error is no more than 1/4 and often * very much lower. */ -int mp_prime_miller_rabin (mp_int * a, const mp_int * b, int *result) +static int mp_prime_miller_rabin (mp_int * a, const mp_int * b, int *result) { mp_int n1, y, r; int s, j, err; @@ -3264,6 +3253,68 @@ __N1:mp_clear (&n1); return err; } +/* performs a variable number of rounds of Miller-Rabin + * + * Probability of error after t rounds is no more than + + * + * Sets result to 1 if probably prime, 0 otherwise + */ +static int mp_prime_is_prime (mp_int * a, int t, int *result) +{ + mp_int b; + int ix, err, res; + + /* default to no */ + *result = MP_NO; + + /* valid value of t? */ + if (t <= 0 || t > PRIME_SIZE) { + return MP_VAL; + } + + /* is the input equal to one of the primes in the table? */ + for (ix = 0; ix < PRIME_SIZE; ix++) { + if (mp_cmp_d(a, __prime_tab[ix]) == MP_EQ) { + *result = 1; + return MP_OKAY; + } + } + + /* first perform trial division */ + if ((err = mp_prime_is_divisible (a, &res)) != MP_OKAY) { + return err; + } + + /* return if it was trivially divisible */ + if (res == MP_YES) { + return MP_OKAY; + } + + /* now perform the miller-rabin rounds */ + if ((err = mp_init (&b)) != MP_OKAY) { + return err; + } + + for (ix = 0; ix < t; ix++) { + /* set the prime */ + mp_set (&b, __prime_tab[ix]); + + if ((err = mp_prime_miller_rabin (a, &b, &res)) != MP_OKAY) { + goto __B; + } + + if (res == MP_NO) { + goto __B; + } + } + + /* passed the test */ + *result = MP_YES; +__B:mp_clear (&b); + return err; +} + static const struct { int k, t; } sizes[] = { @@ -3574,57 +3625,6 @@ int mp_reduce_setup (mp_int * a, const mp_int * b) return mp_div (a, b, a, NULL); } -/* shift right a certain amount of digits */ -void mp_rshd (mp_int * a, int b) -{ - int x; - - /* if b <= 0 then ignore it */ - if (b <= 0) { - return; - } - - /* if b > used then simply zero it and return */ - if (a->used <= b) { - mp_zero (a); - return; - } - - { - register mp_digit *bottom, *top; - - /* shift the digits down */ - - /* bottom */ - bottom = a->dp; - - /* top [offset into digits] */ - top = a->dp + b; - - /* this is implemented as a sliding window where - * the window is b-digits long and digits from - * the top of the window are copied to the bottom - * - * e.g. - - b-2 | b-1 | b0 | b1 | b2 | ... | bb | ----> - /\ | ----> - \-------------------/ ----> - */ - for (x = 0; x < (a->used - b); x++) { - *bottom++ = *top++; - } - - /* zero the top digits */ - for (; x < a->used; x++) { - *bottom++ = 0; - } - } - - /* remove excess digits */ - a->used -= b; -} - /* set to a digit */ void mp_set (mp_int * a, mp_digit b) { diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index 0efa086..aaaac98 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -275,12 +275,6 @@ void mp_clamp(mp_int *a); /* ---> digit manipulation <--- */ -/* right shift by "b" digits */ -void mp_rshd(mp_int *a, int b); - -/* computes a = 2**b */ -int mp_2expt(mp_int *a, int b); - /* Counts the number of lsbs which are zero before the first zero bit */ int mp_cnt_lsb(const mp_int *a); @@ -304,9 +298,6 @@ int mp_and(mp_int *a, mp_int *b, mp_int *c); /* b = -a */ int mp_neg(mp_int *a, mp_int *b); -/* b = |a| */ -int mp_abs(const mp_int *a, mp_int *b); - /* compare a to b */ int mp_cmp(const mp_int *a, const mp_int *b); @@ -333,9 +324,6 @@ int mp_mod(const mp_int *a, mp_int *b, mp_int *c); /* compare against a single digit */ int mp_cmp_d(const mp_int *a, mp_digit b); -/* c = a + b */ -int mp_add_d(mp_int *a, mp_digit b, mp_int *c); - /* c = a - b */ int mp_sub_d(mp_int *a, mp_digit b, mp_int *c); @@ -427,33 +415,16 @@ int mp_exptmod(const mp_int *a, const mp_int *b, mp_int *c, mp_int *d); /* number of primes */ #define PRIME_SIZE 256 -/* result=1 if a is divisible by one of the first PRIME_SIZE primes */ -int mp_prime_is_divisible(const mp_int *a, int *result); - /* performs one Fermat test of "a" using base "b". * Sets result to 0 if composite or 1 if probable prime */ int mp_prime_fermat(mp_int *a, mp_int *b, int *result); -/* performs one Miller-Rabin test of "a" using base "b". - * Sets result to 0 if composite or 1 if probable prime - */ -int mp_prime_miller_rabin(mp_int *a, const mp_int *b, int *result); - /* This gives [for a given bit size] the number of trials required * such that Miller-Rabin gives a prob of failure lower than 2^-96 */ int mp_prime_rabin_miller_trials(int size); -/* performs t rounds of Miller-Rabin on "a" using the first - * t prime bases. Also performs an initial sieve of trial - * division. Determines if "a" is prime with probability - * of error no more than (1/4)**t. - * - * Sets result to 1 if probably prime, 0 otherwise - */ -int mp_prime_is_prime(mp_int *a, int t, int *result); - /* finds the next prime after the number "a" using "t" trials * of Miller-Rabin. *

1 0

Jacek Caban : shdocvw: Fixed tests on IE7.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: da5372beed92930d79c7c3ec0decfff49c9df8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5372beed92930d79c7c3ec0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 23 02:06:09 2009 +0100 shdocvw: Fixed tests on IE7. --- dlls/shdocvw/tests/webbrowser.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 76dfbf7..dc8b6b2 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -582,7 +582,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe break; case DISPID_SETSECURELOCKICON: - CHECK_EXPECT(Invoke_SETSECURELOCKICON); + CHECK_EXPECT2(Invoke_SETSECURELOCKICON); ok(pDispParams->rgvarg != NULL, "rgvarg == NULL\n"); ok(pDispParams->cArgs == 1, "cArgs=%d, expected 1\n", pDispParams->cArgs); @@ -1081,10 +1081,10 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo) { - CHECK_EXPECT(GetHostInfo); + CHECK_EXPECT2(GetHostInfo); ok(pInfo != NULL, "pInfo=NULL\n"); if(pInfo) { - ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO), "pInfo->cbSize=%u\n", pInfo->cbSize); + ok(pInfo->cbSize == sizeof(DOCHOSTUIINFO) || broken(!pInfo->cbSize), "pInfo->cbSize=%u\n", pInfo->cbSize); ok(!pInfo->dwFlags, "pInfo->dwFlags=%08x, expected 0\n", pInfo->dwFlags); ok(!pInfo->dwDoubleClick, "pInfo->dwDoubleClick=%08x, expected 0\n", pInfo->dwDoubleClick); ok(!pInfo->pchHostCss, "pInfo->pchHostCss=%p, expected NULL\n", pInfo->pchHostCss);

1 0

Gerald Pfeifer : comctl32: Simplify ten functions by removing unused parameters.
by Alexandre Julliard Jan. 23, 2009

Jan. 23, 2009

Module: wine Branch: master Commit: bcfc2027fb33456958d864b845a24be93f212791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcfc2027fb33456958d864b84… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jan 22 09:09:39 2009 +0100 comctl32: Simplify ten functions by removing unused parameters. --- dlls/comctl32/toolbar.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index edf15df..fb2745f 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3310,7 +3310,7 @@ TOOLBAR_GetBitmap (HWND hwnd, WPARAM wParam) static inline LRESULT -TOOLBAR_GetBitmapFlags (HWND hwnd) +TOOLBAR_GetBitmapFlags () { return (GetDeviceCaps (0, LOGPIXELSX) >= 120) ? TBBF_LARGE : 0; } @@ -3876,7 +3876,7 @@ TOOLBAR_IsButtonHighlighted (HWND hwnd, WPARAM wParam) static LRESULT -TOOLBAR_IsButtonIndeterminate (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_IsButtonIndeterminate (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); INT nIndex; @@ -4089,7 +4089,7 @@ TOOLBAR_PressButton (HWND hwnd, WPARAM wParam, LPARAM lParam) /* FIXME: there might still be some confusion her between number of buttons * and number of bitmaps */ static LRESULT -TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_ReplaceBitmap (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); LPTBREPLACEBITMAP lpReplace = (LPTBREPLACEBITMAP) lParam; @@ -4168,7 +4168,7 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam) /* helper for TOOLBAR_SaveRestoreW */ static BOOL -TOOLBAR_Save(const TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) +TOOLBAR_Save(const TBSAVEPARAMSW *lpSave) { FIXME("save to %s %s\n", debugstr_w(lpSave->pszSubKey), debugstr_w(lpSave->pszValueName)); @@ -4308,7 +4308,7 @@ TOOLBAR_SaveRestoreW (HWND hwnd, WPARAM wParam, const TBSAVEPARAMSW *lpSave) if (lpSave == NULL) return 0; if (wParam) - return TOOLBAR_Save(infoPtr, lpSave); + return TOOLBAR_Save(lpSave); else return TOOLBAR_Restore(infoPtr, lpSave); } @@ -4562,7 +4562,7 @@ TOOLBAR_SetButtonSize (HWND hwnd, LPARAM lParam) static LRESULT -TOOLBAR_SetButtonWidth (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetButtonWidth (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -4825,7 +4825,7 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetIndent (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetIndent (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -4846,7 +4846,7 @@ TOOLBAR_SetIndent (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetInsertMark (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetInsertMark (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TBINSERTMARK *lptbim = (TBINSERTMARK*)lParam; @@ -4875,7 +4875,7 @@ TOOLBAR_SetInsertMark (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetInsertMarkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetInsertMarkColor (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -5117,7 +5117,7 @@ TOOLBAR_SetToolTips (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_SetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetUnicodeFormat (HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); BOOL bTemp; @@ -5171,7 +5171,7 @@ TOOLBAR_SetVersion (HWND hwnd, INT iVersion) infoPtr->iVersion = iVersion; if (infoPtr->iVersion >= 5) - TOOLBAR_SetUnicodeFormat(hwnd, TRUE, 0); + TOOLBAR_SetUnicodeFormat(hwnd, TRUE); return iOldVersion; } @@ -5270,7 +5270,7 @@ TOOLBAR_SetHotItem2 (HWND hwnd, WPARAM wParam, LPARAM lParam) /* Sets the toolbar global iListGap parameter which controls the amount of * spacing between the image and the text of buttons for TBSTYLE_LIST * toolbars. */ -static LRESULT TOOLBAR_SetListGap(HWND hwnd, WPARAM wParam, LPARAM lParam) +static LRESULT TOOLBAR_SetListGap(HWND hwnd, WPARAM wParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr(hwnd); @@ -5355,7 +5355,7 @@ static LRESULT TOOLBAR_Unkwn464(HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_Create (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); @@ -6701,7 +6701,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_GetBitmap (hwnd, wParam); case TB_GETBITMAPFLAGS: - return TOOLBAR_GetBitmapFlags (hwnd); + return TOOLBAR_GetBitmapFlags (); case TB_GETBUTTON: return TOOLBAR_GetButton (hwnd, wParam, lParam); @@ -6810,7 +6810,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_IsButtonHighlighted (hwnd, wParam); case TB_ISBUTTONINDETERMINATE: - return TOOLBAR_IsButtonIndeterminate (hwnd, wParam, lParam); + return TOOLBAR_IsButtonIndeterminate (hwnd, wParam); case TB_ISBUTTONPRESSED: return TOOLBAR_IsButtonPressed (hwnd, wParam); @@ -6832,7 +6832,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_PressButton (hwnd, wParam, lParam); case TB_REPLACEBITMAP: - return TOOLBAR_ReplaceBitmap (hwnd, wParam, lParam); + return TOOLBAR_ReplaceBitmap (hwnd, lParam); case TB_SAVERESTOREA: return TOOLBAR_SaveRestoreA (hwnd, wParam, (LPTBSAVEPARAMSA)lParam); @@ -6856,7 +6856,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetButtonSize (hwnd, lParam); case TB_SETBUTTONWIDTH: - return TOOLBAR_SetButtonWidth (hwnd, wParam, lParam); + return TOOLBAR_SetButtonWidth (hwnd, lParam); case TB_SETCMDID: return TOOLBAR_SetCmdId (hwnd, wParam, lParam); @@ -6880,13 +6880,13 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetImageList (hwnd, wParam, lParam); case TB_SETINDENT: - return TOOLBAR_SetIndent (hwnd, wParam, lParam); + return TOOLBAR_SetIndent (hwnd, wParam); case TB_SETINSERTMARK: - return TOOLBAR_SetInsertMark (hwnd, wParam, lParam); + return TOOLBAR_SetInsertMark (hwnd, lParam); case TB_SETINSERTMARKCOLOR: - return TOOLBAR_SetInsertMarkColor (hwnd, wParam, lParam); + return TOOLBAR_SetInsertMarkColor (hwnd, lParam); case TB_SETMAXTEXTROWS: return TOOLBAR_SetMaxTextRows (hwnd, wParam); @@ -6910,7 +6910,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetToolTips (hwnd, wParam, lParam); case TB_SETUNICODEFORMAT: - return TOOLBAR_SetUnicodeFormat (hwnd, wParam, lParam); + return TOOLBAR_SetUnicodeFormat (hwnd, wParam); case TB_UNKWN45D: return TOOLBAR_Unkwn45D(hwnd, wParam, lParam); @@ -6919,7 +6919,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetHotItem2 (hwnd, wParam, lParam); case TB_SETLISTGAP: - return TOOLBAR_SetListGap(hwnd, wParam, lParam); + return TOOLBAR_SetListGap(hwnd, wParam); case TB_GETIMAGELISTCOUNT: return TOOLBAR_GetImageListCount(hwnd, wParam, lParam); @@ -6950,7 +6950,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case WM_CHAR: */ case WM_CREATE: - return TOOLBAR_Create (hwnd, wParam, lParam); + return TOOLBAR_Create (hwnd, lParam); case WM_DESTROY: return TOOLBAR_Destroy (hwnd, wParam, lParam);

1 0

Christoph Korn : German deb.template: Fix dimensions of screenshots.
by Jeremy Newman Jan. 22, 2009

Jan. 22, 2009

Module: website Branch: master Commit: 41789eaf9e4ff50717138d09cc0b4a7ca824b440 URL: http://source.winehq.org/git/website.git/?a=commit;h=41789eaf9e4ff50717138d… Author: Christoph Korn <c_korn(a)gmx.de> Date: Thu Jan 22 16:45:50 2009 +0100 German deb.template: Fix dimensions of screenshots. This fixes the height and width properties of the screenshots. Best regards Christoph Korn >From 3e8edf259cdfa4fd3c065c0f69e565d4e57d7d9d Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Thu, 22 Jan 2009 16:42:15 +0100 Subject: German deb.template: Fix dimensions of screenshots. --- templates/de/download/deb.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index f59e568..5b0bbcd 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -27,7 +27,7 @@ wahrscheinlich nicht benutzen. System->Systemverwaltung->Software-Paketquellen. Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinzufügen. -<img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="531" height="509" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> +<img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="686" height="516" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> Dann, copy-paste eine der unteren Zeilen in Abhängigkeit welche Version du benutzt. @@ -48,7 +48,7 @@ und speichere Scott Ritchie's Schlüssel</a> auf deinen Desktop. Ö Schlüsseldatei, die du gerade gespeichert hast (Scott Ritchie.gpg). Es ist sicher, diese Datei nach diesem Schritt zu löschen. -<img src="{$root}/images/distro/de_ubuntu-softwaresources2.png" width="531" height="509" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> +<img src="{$root}/images/distro/de_ubuntu-softwaresources2.png" width="686" height="514" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> Klick auf Schließen zum Beenden, anschließend lade die Paketinformationen neu, wenn Du dazu aufgefordert wirst. Wenn Du Wine installiert hast, wird die Aktualisierungsverwaltung

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument3 getElementsByTagName.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: a44ff54d814d4c54bebcf88144b6bedad8521602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44ff54d814d4c54bebcf8814… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 20 21:22:24 2009 +1100 mshtml: Implement IHTMLDocument3 getElementsByTagName. --- dlls/mshtml/htmldoc3.c | 28 ++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 19 +++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 533dedd..5cf06ca 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -458,8 +458,32 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, IHTMLElementCollection **pelColl) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); - return E_NOTIMPL; + nsIDOMNodeList *nslist; + nsAString id_str, ns_str; + nsresult nsres; + static const WCHAR str[] = {'*',0}; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&id_str, v); + nsAString_Init(&ns_str, str); + nsres = nsIDOMHTMLDocument_GetElementsByTagNameNS(This->nsdoc, &ns_str, &id_str, &nslist); + nsAString_Finish(&id_str); + nsAString_Finish(&ns_str); + if(FAILED(nsres)) { + ERR("GetElementByName failed: %08x\n", nsres); + return E_FAIL; + } + + *pelColl = (IHTMLElementCollection*)create_collection_from_nodelist(This, (IUnknown*)HTMLDOC3(This), nslist); + nsIDOMNodeList_Release(nslist); + + return S_OK; } #undef HTMLDOC3_THIS diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e0a5f69..88eddc5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3418,6 +3418,8 @@ static void test_elems(IHTMLDocument2 *doc) long type; HRESULT hres; IHTMLElementCollection *collection; + IHTMLDocument3 *doc3; + BSTR str; static const WCHAR imgidW[] = {'i','m','g','i','d',0}; static const WCHAR inW[] = {'i','n',0}; @@ -3804,6 +3806,23 @@ static void test_elems(IHTMLDocument2 *doc) } } IDispatch_Release(disp); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); + ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); + + str = a2bstr("img"); + hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); + SysFreeString(str); + ok(hres == S_OK, "getElementByTag(%s) failed: %08x\n", dbgstr_w(ifrW), hres); + if(hres == S_OK) + { + static const elem_type_t img_types[] = { ET_IMG }; + + test_elem_collection((IUnknown*)col, img_types, sizeof(img_types)/sizeof(img_types[0])); + IHTMLElementCollection_Release(col); + } + + IHTMLDocument3_Release(doc3); } static void test_create_elems(IHTMLDocument2 *doc)

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMDocument2 IPersistStream_Save.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: d77acecbff1d27584a3988bad7c2e0224109d30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77acecbff1d27584a3988bad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 22 20:21:45 2009 +1100 msxml3: Implement IXMLDOMDocument2 IPersistStream_Save. --- dlls/msxml3/domdoc.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a758d9f..49f18cc 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -357,8 +357,26 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( static HRESULT WINAPI xmldoc_IPersistStream_Save( IPersistStream *iface, LPSTREAM pStm, BOOL fClearDirty) { - FIXME("(%p, %p, %d): stub!\n", iface, pStm, fClearDirty); - return E_NOTIMPL; + domdoc *This = impl_from_IPersistStream(iface); + HRESULT hr; + BSTR xmlString; + + TRACE("(%p, %p, %d)\n", iface, pStm, fClearDirty); + + hr = IXMLDOMNode_get_xml( This->node, &xmlString ); + if(hr == S_OK) + { + DWORD count; + DWORD len = strlenW(xmlString) * sizeof(WCHAR); + + hr = IStream_Write( pStm, xmlString, len, &count ); + + SysFreeString(xmlString); + } + + TRACE("ret 0x%08x\n", hr); + + return hr; } static HRESULT WINAPI xmldoc_IPersistStream_GetSizeMax(

1 0

Austin English : updspapi: Add missing functions and forward to setupapi.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: b0e000ca885d36b225a5ac109b341a57e09dc487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e000ca885d36b225a5ac109… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 22 00:34:19 2009 -0600 updspapi: Add missing functions and forward to setupapi. --- dlls/updspapi/updspapi.spec | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/updspapi/updspapi.spec b/dlls/updspapi/updspapi.spec index ca4ef7c..dc6b25f 100644 --- a/dlls/updspapi/updspapi.spec +++ b/dlls/updspapi/updspapi.spec @@ -67,4 +67,12 @@ @ stub UpdSpSetDynamicStringExA @ stub UpdSpSetDynamicStringExW @ stub UpdSpSetDynamicStringW +@ stdcall UpdSpStringTableAddString(ptr wstr long) setupapi.StringTableAddString +@ stdcall UpdSpStringTableAddStringEx(ptr wstr long ptr long) setupapi.StringTableAddStringEx +@ stdcall UpdSpStringTableDestroy(ptr) setupapi.StringTableDestroy +@ stub UpdSpStringTableEnum +@ stdcall UpdSpStringTableInitialize() setupapi.StringTableInitialize +@ stdcall UpdSpStringTableInitializeEx(long long) setupapi.StringTableInitializeEx +@ stdcall UpdSpStringTableLookUpString(ptr wstr long) setupapi.StringTableLookUpString +@ stdcall UpdSpStringTableLookUpStringEx(ptr wstr long ptr long) setupapi.StringTableLookUpStringEx @ stdcall UpdSpTermDefaultQueueCallback(ptr) setupapi.SetupTermDefaultQueueCallback

1 0

Alistair Leslie-Hughes : msxml3: IXMLDOMDocument2 async default value is VARIANT_TRUE.
by Alexandre Julliard Jan. 22, 2009

Jan. 22, 2009

Module: wine Branch: master Commit: 5bedc409d5244e2f14fe53d643de8df04406aabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bedc409d5244e2f14fe53d64… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 21 21:58:31 2009 +1100 msxml3: IXMLDOMDocument2 async default value is VARIANT_TRUE. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/tests/domdoc.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 11136ab..a758d9f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2192,7 +2192,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu doc->lpvtblIObjectSafety = &domdocObjectSafetyVtbl; doc->lpvtblISupportErrorInfo = &support_error_vtbl; doc->ref = 1; - doc->async = 0; + doc->async = VARIANT_TRUE; doc->validating = 0; doc->resolving = 0; doc->preserving = 0; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3d2944a..584eab3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -455,6 +455,10 @@ static void test_domdoc( void ) ok( b == VARIANT_FALSE, "failed to load XML string\n"); SysFreeString( str ); + r = IXMLDOMDocument_get_async( doc, &b ); + ok( r == S_OK, "get_async failed (%08x)\n", r); + ok( b == VARIANT_TRUE, "Wrong default value\n"); + /* check that there's no document element */ element = NULL; r = IXMLDOMDocument_get_documentElement( doc, &element );

1 0