July 2008 - Wine-Commits - list.winehq.org

Zac Brown : winhttp: Add stub implementation for WinHttpQueryOption.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 7a39e23db65db784856ac6fc6f8f92b11f1ddd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a39e23db65db784856ac6fc6… Author: Zac Brown <zac(a)zacbrown.org> Date: Mon Jul 7 13:20:42 2008 -0700 winhttp: Add stub implementation for WinHttpQueryOption. --- dlls/winhttp/main.c | 11 +++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 2b1c9b0..cef78d9 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -180,3 +180,14 @@ BOOL WINAPI WinHttpSendRequest (HINTERNET hRequest, LPCWSTR pwszHeaders, DWORD d SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/*********************************************************************** + * WinHttpQueryOption (winhttp.@) + */ +BOOL WINAPI WinHttpQueryOption (HINTERNET hInternet, DWORD dwOption, LPVOID lpBuffer, LPDWORD lpdwBufferLength) +{ + FIXME("(%d): stub\n", dwOption); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 780b99b..6ad63c9 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -17,7 +17,7 @@ @ stub WinHttpQueryAuthSchemes @ stub WinHttpQueryDataAvailable @ stub WinHttpQueryHeaders -@ stub WinHttpQueryOption +@ stdcall WinHttpQueryOption(ptr long ptr ptr) @ stub WinHttpReadData @ stub WinHttpReceiveResponse @ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr)

1 0

Alistair Leslie-Hughes : oleview: Fixed crash with loading typelib information.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: d4f0685173a0a20b39176540047aab2f251de1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f0685173a0a20b391765400… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 8 17:52:43 2008 +1000 oleview: Fixed crash with loading typelib information. --- programs/oleview/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 5dbffb0..e1d39a3 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -677,7 +677,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen if (V_VT(param) == VT_BSTR) { AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, V_BSTR(&var)); + AddToTLDataStrW(tld, V_BSTR(param)); AddToTLDataStrW(tld, wszInvertedComa); } else if (VariantChangeType(&var, param, 0, VT_BSTR) == S_OK) AddToTLDataStrW(tld, V_BSTR(&var));

1 0

Jon Griffiths : msvcrt: Implement ___setlc_active_func/ ___unguarded_readlc_active_add_func.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: a4037eb463651db652fa84dc7d5f73ef3e67440e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4037eb463651db652fa84dc7… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 10:48:54 2008 -0700 msvcrt: Implement ___setlc_active_func/___unguarded_readlc_active_add_func. --- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcrt/data.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 38c314a..7fb298e 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -94,8 +94,8 @@ @ stub ___lc_collate_cp_func @ stub ___lc_handle_func @ stub ___mb_cur_max_func -@ stub ___setlc_active_func -@ stub ___unguarded_readlc_active_add_func +@ cdecl ___setlc_active_func() msvcrt.___setlc_active_func +@ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv @ extern __badioinfo msvcrt.__badioinfo diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 578130b..b0f78d5 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -239,6 +239,22 @@ MSVCRT_wchar_t *msvcrt_wstrdupa(const char *str) return wstr; } +/********************************************************************* + * ___unguarded_readlc_active_add_func (MSVCRT.@) + */ +unsigned int * CDECL MSVCRT____unguarded_readlc_active_add_func(void) +{ + return &MSVCRT___unguarded_readlc_active; +} + +/********************************************************************* + * ___setlc_active_func (MSVCRT.@) + */ +unsigned int CDECL MSVCRT____setlc_active_func(void) +{ + return MSVCRT___setlc_active; +} + /* INTERNAL: Since we can't rely on Winelib startup code calling w/getmainargs, * we initialise data values during DLL loading. When called by a native * program we simply return the data we've already initialised. This also means diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 23b6acd..ecdce4f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -140,6 +140,7 @@ @ stub __pxcptinfoptrs #() @ cdecl __set_app_type(long) MSVCRT___set_app_type @ extern __setlc_active MSVCRT___setlc_active +@ cdecl ___setlc_active_func() MSVCRT____setlc_active_func @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @@ -147,6 +148,7 @@ @ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active +@ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __wargv MSVCRT___wargv @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv

1 0

Jon Griffiths : oleaut32: Implement ICreateTypeLib2::SetHelpStringContext/ SetHelpStringDll.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: bc6f1b0ceb4a8ae2e32391d8f0b29715ab16834c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6f1b0ceb4a8ae2e32391d8f… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 6 13:23:26 2008 -0700 oleaut32: Implement ICreateTypeLib2::SetHelpStringContext/SetHelpStringDll. --- dlls/oleaut32/typelib2.c | 51 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 38 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 6b773dc..7b14b4f 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -152,6 +152,7 @@ typedef struct tagICreateTypeLib2Impl WCHAR *filename; MSFT_Header typelib_header; + INT helpStringDll; MSFT_pSeg typelib_segdir[MSFT_SEG_MAX]; char *typelib_segment_data[MSFT_SEG_MAX]; int typelib_segment_block_length[MSFT_SEG_MAX]; @@ -231,6 +232,7 @@ static void ctl2_init_header( This->typelib_header.res48 = 0x80; This->typelib_header.dispatchpos = -1; This->typelib_header.nimpinfos = 0; + This->helpStringDll = -1; } /**************************************************************************** @@ -3331,6 +3333,8 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 * iface) ctl2_finalize_typeinfos(This, filepos); if (!ctl2_write_chunk(hFile, &This->typelib_header, sizeof(This->typelib_header))) return retval; + if (This->typelib_header.varflags & HELPDLLFLAG) + if (!ctl2_write_chunk(hFile, &This->helpStringDll, sizeof(This->helpStringDll))) return retval; if (!ctl2_write_chunk(hFile, This->typelib_typeinfo_offsets, This->typelib_header.nrtypeinfos * 4)) return retval; if (!ctl2_write_chunk(hFile, &This->typelib_segdir, sizeof(This->typelib_segdir))) return retval; if (!ctl2_write_segment(This, hFile, MSFT_SEG_TYPEINFO )) return retval; @@ -3401,35 +3405,56 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetCustData( * * Sets a context number for the library help string. * - * RETURNS + * PARAMS + * iface [I] The type library to set the help string context for. + * dwContext [I] The help string context. * + * RETURNS * Success: S_OK * Failure: E_OUTOFMEMORY or E_INVALIDARG. */ -static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext( - ICreateTypeLib2 * iface, /* [I] The type library to set the help string context for. */ - ULONG dwHelpStringContext) /* [I] The help string context. */ +static +HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringContext(ICreateTypeLib2 * iface, + ULONG dwContext) { - FIXME("(%p,%d), stub!\n", iface, dwHelpStringContext); - return E_OUTOFMEMORY; + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; + + TRACE("(%p,%d)\n", iface, dwContext); + + This->typelib_header.helpstringcontext = dwContext; + return S_OK; } /****************************************************************************** * ICreateTypeLib2_SetHelpStringDll {OLEAUT32} * - * Sets the DLL used to look up localized help strings. + * Set the DLL used to look up localized help strings. * - * RETURNS + * PARAMS + * iface [I] The type library to set the help DLL for. + * szDllName [I] The name of the help DLL. * + * RETURNS * Success: S_OK * Failure: E_OUTOFMEMORY or E_INVALIDARG. */ -static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringDll( - ICreateTypeLib2 * iface, /* [I] The type library to set the help DLL for. */ - LPOLESTR szFileName) /* [I] The name of the help DLL. */ +static +HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringDll(ICreateTypeLib2 * iface, + LPOLESTR szDllName) { - FIXME("(%p,%s), stub!\n", iface, debugstr_w(szFileName)); - return E_OUTOFMEMORY; + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; + int offset; + + TRACE("(%p,%s)\n", iface, debugstr_w(szDllName)); + if (!szDllName) + return E_INVALIDARG; + + offset = ctl2_alloc_string(This, szDllName); + if (offset == -1) + return E_OUTOFMEMORY; + This->typelib_header.varflags |= HELPDLLFLAG; + This->helpStringDll = offset; + return S_OK; } /*================== ITypeLib2 Implementation ===================================*/

1 0

Jeff Latimer : usp10/tests: Remove incorrect tests.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 85d191937bedf165ed80d40d0833f058a21991a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d191937bedf165ed80d40d0… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Jul 6 13:54:16 2008 +1000 usp10/tests: Remove incorrect tests. --- dlls/usp10/tests/usp10.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 3902e2b..0705904 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -486,19 +486,17 @@ static void test_ScriptTextOut(HDC hdc) "got %08x\n", hr); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - /* Set psc to NULL, to be able to check if a pointer is returned in psc - * hdc is required for this one rather than the usual optional */ + /* hdc is required for this one rather than the usual optional */ psc = NULL; hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok( hr == E_INVALIDARG, "(NULL,&psc,), expected E_INVALIDARG, got %08x\n", hr); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - /* Set that is gets a psc and that returns 0 status */ + /* Set that it returns 0 status */ hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); - ok (psc == NULL, "psc should be null\n"); /* Test Rect Rgn is acceptable */ rect.top = 10; @@ -508,7 +506,6 @@ static void test_ScriptTextOut(HDC hdc) hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); - ok (psc == NULL, "psc should be null\n"); iCP = 1; hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust,

1 0

Gerald Pfeifer : comctl32: Fix signedness of two variables.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 0f35109915a426ec1e20ae454de58b47d22b9b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f35109915a426ec1e20ae454… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 5 13:52:32 2008 +0200 comctl32: Fix signedness of two variables. --- dlls/comctl32/trackbar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index a25f81e..a225ddf 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -146,7 +146,8 @@ notify_with_scroll (const TRACKBAR_INFO *infoPtr, UINT code) static void TRACKBAR_RecalculateTics (TRACKBAR_INFO *infoPtr) { - int i, tic, nrTics; + int tic; + unsigned nrTics, i; if (infoPtr->uTicFreq && infoPtr->lRangeMax >= infoPtr->lRangeMin) nrTics=(infoPtr->lRangeMax - infoPtr->lRangeMin)/infoPtr->uTicFreq;

1 0

Gerald Pfeifer : comctl32: Simplify functions by shedding off unused parameters.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: c6db778f4c353fd79428b9fddd9aa91dc684f96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6db778f4c353fd79428b9fdd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 5 14:03:19 2008 +0200 comctl32: Simplify functions by shedding off unused parameters. --- dlls/comctl32/trackbar.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index a225ddf..fbd03dd 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1462,7 +1462,7 @@ TRACKBAR_Destroy (TRACKBAR_INFO *infoPtr) static LRESULT -TRACKBAR_KillFocus (TRACKBAR_INFO *infoPtr, HWND hwndGetFocus) +TRACKBAR_KillFocus (TRACKBAR_INFO *infoPtr) { TRACE("\n"); infoPtr->bFocussed = FALSE; @@ -1472,7 +1472,7 @@ TRACKBAR_KillFocus (TRACKBAR_INFO *infoPtr, HWND hwndGetFocus) } static LRESULT -TRACKBAR_LButtonDown (TRACKBAR_INFO *infoPtr, DWORD fwKeys, INT x, INT y) +TRACKBAR_LButtonDown (TRACKBAR_INFO *infoPtr, INT x, INT y) { POINT clickPoint; @@ -1501,7 +1501,7 @@ TRACKBAR_LButtonDown (TRACKBAR_INFO *infoPtr, DWORD fwKeys, INT x, INT y) static LRESULT -TRACKBAR_LButtonUp (TRACKBAR_INFO *infoPtr, DWORD fwKeys, INT x, INT y) +TRACKBAR_LButtonUp (TRACKBAR_INFO *infoPtr) { if (infoPtr->flags & TB_DRAG_MODE) { notify_with_scroll (infoPtr, TB_THUMBPOSITION | (infoPtr->lPos<<16)); @@ -1549,7 +1549,7 @@ TRACKBAR_Paint (TRACKBAR_INFO *infoPtr, HDC hdc) static LRESULT -TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr, HWND hwndLoseFocus) +TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr) { TRACE("\n"); infoPtr->bFocussed = TRUE; @@ -1560,7 +1560,7 @@ TRACKBAR_SetFocus (TRACKBAR_INFO *infoPtr, HWND hwndLoseFocus) static LRESULT -TRACKBAR_Size (TRACKBAR_INFO *infoPtr, DWORD fwSizeType, INT nWidth, INT nHeight) +TRACKBAR_Size (TRACKBAR_INFO *infoPtr) { TRACKBAR_InitializeThumb (infoPtr); TRACKBAR_AlignBuddies (infoPtr); @@ -1570,7 +1570,7 @@ TRACKBAR_Size (TRACKBAR_INFO *infoPtr, DWORD fwSizeType, INT nWidth, INT nHeight static LRESULT -TRACKBAR_Timer (TRACKBAR_INFO *infoPtr, INT wTimerID, const TIMERPROC *tmrpc) +TRACKBAR_Timer (TRACKBAR_INFO *infoPtr) { if (infoPtr->flags & TB_AUTO_PAGE) { POINT pt; @@ -1593,7 +1593,7 @@ static LRESULT theme_changed (const TRACKBAR_INFO* infoPtr) static LRESULT -TRACKBAR_MouseMove (TRACKBAR_INFO *infoPtr, DWORD fwKeys, INT x, INT y) +TRACKBAR_MouseMove (TRACKBAR_INFO *infoPtr, INT x, INT y) { DWORD dwStyle = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); INT clickPlace = (dwStyle & TBS_VERT) ? y : x; @@ -1657,7 +1657,7 @@ TRACKBAR_MouseMove (TRACKBAR_INFO *infoPtr, DWORD fwKeys, INT x, INT y) } static BOOL -TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) +TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey) { DWORD style = GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE); BOOL downIsLeft = style & TBS_DOWNISLEFT; @@ -1713,7 +1713,7 @@ TRACKBAR_KeyDown (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) static inline BOOL -TRACKBAR_KeyUp (const TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData) +TRACKBAR_KeyUp (const TRACKBAR_INFO *infoPtr, INT nVirtKey) { switch (nVirtKey) { case VK_LEFT: @@ -1866,19 +1866,19 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DLGC_WANTARROWS; case WM_KEYDOWN: - return TRACKBAR_KeyDown (infoPtr, (INT)wParam, (DWORD)lParam); + return TRACKBAR_KeyDown (infoPtr, (INT)wParam); case WM_KEYUP: - return TRACKBAR_KeyUp (infoPtr, (INT)wParam, (DWORD)lParam); + return TRACKBAR_KeyUp (infoPtr, (INT)wParam); case WM_KILLFOCUS: - return TRACKBAR_KillFocus (infoPtr, (HWND)wParam); + return TRACKBAR_KillFocus (infoPtr); case WM_LBUTTONDOWN: - return TRACKBAR_LButtonDown (infoPtr, wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return TRACKBAR_LButtonDown (infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_LBUTTONUP: - return TRACKBAR_LButtonUp (infoPtr, wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return TRACKBAR_LButtonUp (infoPtr); case WM_MOUSELEAVE: infoPtr->flags &= ~TB_THUMB_HOT; @@ -1886,23 +1886,23 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return 0; case WM_MOUSEMOVE: - return TRACKBAR_MouseMove (infoPtr, wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return TRACKBAR_MouseMove (infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_PRINTCLIENT: case WM_PAINT: return TRACKBAR_Paint (infoPtr, (HDC)wParam); case WM_SETFOCUS: - return TRACKBAR_SetFocus (infoPtr, (HWND)wParam); + return TRACKBAR_SetFocus (infoPtr); case WM_SIZE: - return TRACKBAR_Size (infoPtr, wParam, LOWORD(lParam), HIWORD(lParam)); + return TRACKBAR_Size (infoPtr); case WM_THEMECHANGED: return theme_changed (infoPtr); case WM_TIMER: - return TRACKBAR_Timer (infoPtr, (INT)wParam, (TIMERPROC *)lParam); + return TRACKBAR_Timer (infoPtr); case WM_WININICHANGE: return TRACKBAR_InitializeThumb (infoPtr);

1 0

Mikołaj Zalewski : shell32: Make new style Browse For Folders dialog resizable.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: abe87675a84719422beb276497699677b1855a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe87675a84719422beb27649… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jul 7 12:05:02 2008 +0200 shell32: Make new style Browse For Folders dialog resizable. --- dlls/shell32/brsfolder.c | 124 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/shell32_Da.rc | 2 +- dlls/shell32/shell32_De.rc | 2 +- dlls/shell32/shell32_En.rc | 2 +- dlls/shell32/shell32_Es.rc | 2 +- dlls/shell32/shell32_Fr.rc | 2 +- dlls/shell32/shell32_Ko.rc | 2 +- dlls/shell32/shell32_Nl.rc | 2 +- dlls/shell32/shell32_No.rc | 2 +- dlls/shell32/shell32_Pl.rc | 2 +- dlls/shell32/shell32_Ro.rc | 2 +- dlls/shell32/shell32_Ru.rc | 2 +- dlls/shell32/shell32_Si.rc | 2 +- 13 files changed, 135 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abe87675a84719422beb2…

1 0

Gerald Pfeifer : winecfg: Fix signedness of variable in enumerate_valuesW() .
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 7da2a20a1944c257248bdc2e48a8b0705a13e922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da2a20a1944c257248bdc2e4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Jul 5 14:15:17 2008 +0200 winecfg: Fix signedness of variable in enumerate_valuesW(). --- programs/winecfg/winecfg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 3fdc796..f1439a7 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -481,9 +481,8 @@ void set_reg_key_dwordW(HKEY root, const WCHAR *path, const WCHAR *name, DWORD v WCHAR **enumerate_valuesW(HKEY root, WCHAR *path) { HKEY key; - DWORD res, i = 0; + DWORD res, i = 0, valueslen = 0; WCHAR **values = NULL; - int valueslen = 0; struct list *cursor; res = RegOpenKeyW(root, path, &key);

1 0

Nikolay Sivov : gdiplus: GdipInvertMatrix implementation with tests.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: d7999a008be5d7e95fcd86019adc79b0359ae8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7999a008be5d7e95fcd86019… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 8 01:32:36 2008 +0400 gdiplus: GdipInvertMatrix implementation with tests. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 36 ++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/matrix.c | 32 ++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 34e094d..b40b8a2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -413,7 +413,7 @@ @ stdcall GdipImageSelectActiveFrame(ptr ptr long) @ stub GdipImageSetAbort @ stub GdipInitializePalette -@ stub GdipInvertMatrix +@ stdcall GdipInvertMatrix(ptr) @ stub GdipIsClipEmpty @ stdcall GdipIsEmptyRegion(ptr ptr ptr) @ stdcall GdipIsEqualRegion(ptr ptr ptr ptr) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index dcdc2bd..8714908 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -50,6 +50,11 @@ static void matrix_multiply(GDIPCONST REAL * left, GDIPCONST REAL * right, REAL memcpy(out, temp, 6 * sizeof(REAL)); } +static REAL matrix_det(GDIPCONST GpMatrix *matrix) +{ + return matrix->matrix[0]*matrix->matrix[3] - matrix->matrix[1]*matrix->matrix[2]; +} + GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy, GpMatrix **matrix) { @@ -158,16 +163,39 @@ GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix *matrix, return Ok; } -GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *result) +GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix *matrix) { + GpMatrix copy; REAL det; + BOOL invertible; - if(!matrix || !result) + if(!matrix) + return InvalidParameter; + + GdipIsMatrixInvertible(matrix, &invertible); + if(!invertible) return InvalidParameter; - det = matrix->matrix[0]*matrix->matrix[3] - matrix->matrix[1]*matrix->matrix[2]; + det = matrix_det(matrix); + + copy = *matrix; + /* store result */ + matrix->matrix[0] = copy.matrix[3] / det; + matrix->matrix[1] = -copy.matrix[1] / det; + matrix->matrix[2] = -copy.matrix[2] / det; + matrix->matrix[3] = copy.matrix[0] / det; + matrix->matrix[4] = (copy.matrix[2]*copy.matrix[5]-copy.matrix[3]*copy.matrix[4]) / det; + matrix->matrix[5] = -(copy.matrix[0]*copy.matrix[5]-copy.matrix[1]*copy.matrix[4]) / det; + + return Ok; +} + +GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix *matrix, BOOL *result) +{ + if(!matrix || !result) + return InvalidParameter; - *result = (fabs(det) >= 1e-5); + *result = (fabs(matrix_det(matrix)) >= 1e-5); return Ok; } diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 7d5e798..3d3c484 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -21,6 +21,7 @@ #include <math.h> #include "windows.h" +#include <stdio.h> #include "gdiplus.h" #include "wine/test.h" @@ -118,6 +119,36 @@ static void test_isinvertible(void) GdipDeleteMatrix(matrix); } +static void test_invert(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + GpMatrix *inverted = NULL; + BOOL equal; + + /* NULL */ + status = GdipInvertMatrix(NULL); + expect(InvalidParameter, status); + + /* noninvertible */ + GdipCreateMatrix2(2.0, -1.0, 6.0, -3.0, 2.2, 3.0, &matrix); + status = GdipInvertMatrix(matrix); + expect(InvalidParameter, status); + GdipDeleteMatrix(matrix); + + /* invertible */ + GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + status = GdipInvertMatrix(matrix); + expect(Ok, status); + + GdipCreateMatrix2(1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0, &inverted); + GdipIsMatrixEqual(matrix, inverted, &equal); + expect(TRUE, equal); + + GdipDeleteMatrix(inverted); + GdipDeleteMatrix(matrix); +} + START_TEST(matrix) { struct GdiplusStartupInput gdiplusStartupInput; @@ -133,6 +164,7 @@ START_TEST(matrix) test_constructor_destructor(); test_transform(); test_isinvertible(); + test_invert(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 92cb286..cdc2db0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -262,6 +262,7 @@ GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3(GDIPCONST GpRectF *,GDIPCONST GpPointF*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix3I(GDIPCONST GpRect*,GDIPCONST GpPoint*,GpMatrix**); +GpStatus WINGDIPAPI GdipInvertMatrix(GpMatrix*); GpStatus WINGDIPAPI GdipIsMatrixEqual(GDIPCONST GpMatrix*, GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixIdentity(GDIPCONST GpMatrix*, BOOL*); GpStatus WINGDIPAPI GdipIsMatrixInvertible(GDIPCONST GpMatrix*, BOOL*);

1 0