wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Alexandre Julliard : configure: Check that the cross-compiler that we found actually works.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: c2a29dbb9c61af31f5031cd9c6e4d0c532fabce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a29dbb9c61af31f5031cd9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 4 13:16:19 2010 +0200 configure: Check that the cross-compiler that we found actually works. --- configure | 54 +++++++++++++++++++++++++++++++++++++++--------------- configure.ac | 37 ++++++++++++++++++++++--------------- 2 files changed, 61 insertions(+), 30 deletions(-) diff --git a/configure b/configure index 9b94f09..05a9317 100755 --- a/configure +++ b/configure @@ -7054,22 +7054,46 @@ test -n "$CROSSCC" || CROSSCC="false" if test "$CROSSCC" != "false" then - CROSSTEST_DISABLE="" - set x $CROSSCC - shift - target="" - while test $# -ge 1 - do - case "$1" in - *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; - esac - shift - done - if test -n "$target" - then - CROSSTARGET="$target" + ac_save_CC="$CC" + CC="$CROSSCC" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CROSSCC works" >&5 +$as_echo_n "checking whether $CROSSCC works... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - fi +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + set x $CROSSCC + shift + target="" + while test $# -ge 1 + do + case "$1" in + *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; + esac + shift + done + if test -n "$target" + then + CROSSTEST_DISABLE="" + CROSSTARGET="$target" + + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CC="$ac_save_CC" fi fi diff --git a/configure.ac b/configure.ac index 30f04ac..eedfec5 100644 --- a/configure.ac +++ b/configure.ac @@ -838,21 +838,28 @@ then WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) if test "$CROSSCC" != "false" then - CROSSTEST_DISABLE="" - set x $CROSSCC - shift - target="" - while test $# -ge 1 - do - case "$1" in - *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; - esac - shift - done - if test -n "$target" - then - AC_SUBST(CROSSTARGET,"$target") - fi + ac_save_CC="$CC" + CC="$CROSSCC" + AC_MSG_CHECKING([whether $CROSSCC works]) + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), + [AC_MSG_RESULT([yes]) + set x $CROSSCC + shift + target="" + while test $# -ge 1 + do + case "$1" in + *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; + esac + shift + done + if test -n "$target" + then + CROSSTEST_DISABLE="" + AC_SUBST(CROSSTARGET,"$target") + fi], + [AC_MSG_RESULT([no])]) + CC="$ac_save_CC" fi fi

1 0

Dmitry Timoshkov : ws2_32: Rearrange the code to avoid a needless release_sock_fd().
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: e0bbcea6fb99cca17e33b063d876e04f53800b9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bbcea6fb99cca17e33b063d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 4 12:14:52 2010 +0900 ws2_32: Rearrange the code to avoid a needless release_sock_fd(). --- dlls/ws2_32/socket.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 22c72f3..f129b08 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1902,20 +1902,21 @@ int WINAPI WSAConnect( SOCKET s, const struct WS_sockaddr* name, int namelen, /*********************************************************************** * ConnectEx */ -BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int namelen, +static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int namelen, PVOID sendBuf, DWORD sendBufLen, LPDWORD sent, LPOVERLAPPED ov) { - int fd = get_sock_fd( s, FILE_READ_DATA, NULL ); - int ret, status; - if (fd == -1) + int fd, ret, status; + + if (!ov) { - SetLastError( WSAENOTSOCK ); + SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - if (!ov) + + fd = get_sock_fd( s, FILE_READ_DATA, NULL ); + if (fd == -1) { - release_sock_fd(s, fd); - SetLastError( ERROR_INVALID_PARAMETER ); + SetLastError( WSAENOTSOCK ); return FALSE; }

1 0

Oldřich Jedlička : ddraw/tests: New attachment/ flipping tests for back buffers.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 5c05b141678be7c3049eedef41fee1d1c6cee9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c05b141678be7c3049eedef4… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Tue Aug 3 21:26:15 2010 +0200 ddraw/tests: New attachment/flipping tests for back buffers. --- dlls/ddraw/tests/dsurface.c | 118 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b5f6f2c..76bfc7e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3452,6 +3452,123 @@ static void BackBufferCreateSurfaceTest(void) IDirectDraw7_Release(dd7); } +static void BackBufferAttachmentFlipTest(void) +{ + HRESULT hr; + IDirectDrawSurface *surface1, *surface2, *surface3, *surface4; + DDSURFACEDESC ddsd; + HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + + hr = IDirectDraw_SetCooperativeLevel(lpDD, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + /* Perform attachment tests on a back-buffer */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface2, NULL); + todo_wine ok(SUCCEEDED(hr), "CreateSurface returned: %x\n",hr); + + if (surface2 != NULL) + { + /* Try a single primary and a two back buffers */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface1, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + ddsd.dwWidth = GetSystemMetrics(SM_CXSCREEN); + ddsd.dwHeight = GetSystemMetrics(SM_CYSCREEN); + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface3, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + /* This one has a different size */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surface4, NULL); + ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to a front buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try flipping the surfaces */ + hr = IDirectDrawSurface_Flip(surface1, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DD_OK, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface2, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + + /* Try the reverse without detaching first */ + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + ok(hr == DDERR_SURFACEALREADYATTACHED, "Attaching an attached surface to its attachee returned %08x\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface1); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a front buffer to a back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try flipping the surfaces */ + hr = IDirectDrawSurface_Flip(surface1, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DD_OK, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface2, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + + /* Try to detach reversed */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface2); + ok(hr == DDERR_CANNOTDETACHSURFACE, "DeleteAttachedSurface returned %08x\n", hr); + /* Now the proper detach */ + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); + todo_wine ok(hr == DD_OK || broken(hr == DDERR_CANNOTATTACHSURFACE), + "Attaching a back buffer to another back buffer returned %08x\n", hr); + if(SUCCEEDED(hr)) + { + /* Try flipping the surfaces */ + hr = IDirectDrawSurface_Flip(surface3, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DD_OK, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface2, NULL, DDFLIP_WAIT); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + hr = IDirectDrawSurface_Flip(surface1, NULL, DDFLIP_WAIT); + ok(hr == DDERR_NOTFLIPPABLE, "IDirectDrawSurface_Flip returned 0x%08x\n", hr); + + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface3); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a back buffer to a front buffer of different size returned %08x\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface4, surface1); + ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a front buffer to a back buffer of different size returned %08x\n", hr); + + IDirectDrawSurface_Release(surface4); + IDirectDrawSurface_Release(surface3); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface1); + } + + hr =IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); + + DestroyWindow(window); +} + START_TEST(dsurface) { HRESULT ret; @@ -3506,5 +3623,6 @@ START_TEST(dsurface) GetDCTest(); GetDCFormatTest(); BackBufferCreateSurfaceTest(); + BackBufferAttachmentFlipTest(); ReleaseDirectDraw(); }

1 0

Oldřich Jedlička : ddraw/tests: New CreateSurface for DDSCAPS_BACKBUFFER tests.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 109cb9fee483dc47604565647858d24dd395f1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=109cb9fee483dc47604565647… Author: Oldřich Jedlička <oldium.pro(a)seznam.cz> Date: Tue Aug 3 21:26:14 2010 +0200 ddraw/tests: New CreateSurface for DDSCAPS_BACKBUFFER tests. --- dlls/ddraw/tests/dsurface.c | 91 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 20e8634..b5f6f2c 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -30,6 +30,7 @@ #include "unknwn.h" static LPDIRECTDRAW lpDD = NULL; +static DDCAPS ddcaps; static BOOL CreateDirectDraw(void) { @@ -2851,16 +2852,12 @@ static void SurfaceCapsTest(void) DDSCAPS_PRIMARYSURFACE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_VISIBLE }; UINT i; - DDCAPS ddcaps; /* Tests various surface flags, what changes do they undergo during surface creation. Forsaken * engine expects texture surfaces without memory flag to get a video memory flag right after * creation. Currently, Wine adds DDSCAPS_FRONTBUFFER to primary surface, but native doesn't do this * for single buffered primaries. Because of this primary surface creation tests are todo_wine. No real * app is known so far to care about this. */ - ddcaps.dwSize = sizeof(DDCAPS); - hr = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL); - ok(hr == DD_OK, "IDirectDraw_GetCaps failed with %08x\n", hr); if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { @@ -3378,6 +3375,83 @@ static void GetDCFormatTest(void) IDirectDraw7_Release(dd7); } +static void BackBufferCreateSurfaceTest(void) +{ + DDSURFACEDESC ddsd; + DDSURFACEDESC created_ddsd; + DDSURFACEDESC2 ddsd2; + IDirectDrawSurface *surf; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7; + HRESULT hr; + IDirectDraw2 *dd2; + IDirectDraw4 *dd4; + IDirectDraw7 *dd7; + + const DWORD caps = DDSCAPS_BACKBUFFER; + const DWORD expected_caps = DDSCAPS_BACKBUFFER | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM; + + if (!(ddcaps.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + { + skip("DDraw reported no VIDEOMEMORY cap. Broken video driver? Skipping surface caps tests.\n"); + return ; + } + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd.dwWidth = 64; + ddsd.dwHeight = 64; + ddsd.ddsCaps.dwCaps = caps; + memset(&ddsd2, 0, sizeof(ddsd2)); + ddsd2.dwSize = sizeof(ddsd2); + ddsd2.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + ddsd2.dwWidth = 64; + ddsd2.dwHeight = 64; + ddsd2.ddsCaps.dwCaps = caps; + memset(&created_ddsd, 0, sizeof(created_ddsd)); + created_ddsd.dwSize = sizeof(DDSURFACEDESC); + + hr = IDirectDraw_CreateSurface(lpDD, &ddsd, &surf, NULL); + todo_wine ok(SUCCEEDED(hr), "IDirectDraw_CreateSurface failed: 0x%08x\n", hr); + if (surf != NULL) + { + hr = IDirectDrawSurface_GetSurfaceDesc(surf, &created_ddsd); + ok(SUCCEEDED(hr), "IDirectDraw_GetSurfaceDesc failed: 0x%08x\n", hr); + ok(created_ddsd.ddsCaps.dwCaps == expected_caps, + "GetSurfaceDesc returned caps %x, expected %x\n", created_ddsd.ddsCaps.dwCaps, + expected_caps); + IDirectDrawSurface_Release(surf); + } + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw2_CreateSurface(dd2, &ddsd, &surf, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw2_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw2_Release(dd2); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw4_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw4_Release(dd4); + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2, &surf7, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7_CreateSurface didn't return %x08x, but %x08x\n", + DDERR_INVALIDCAPS, hr); + + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { HRESULT ret; @@ -3401,6 +3475,14 @@ START_TEST(dsurface) return; } + ddcaps.dwSize = sizeof(DDCAPS); + ret = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL); + if (ret != DD_OK) + { + skip("IDirectDraw_GetCaps failed with %08x\n", ret); + return; + } + MipMapCreationTest(); SrcColorKey32BlitTest(); QueryInterface(); @@ -3423,5 +3505,6 @@ START_TEST(dsurface) SurfaceCapsTest(); GetDCTest(); GetDCFormatTest(); + BackBufferCreateSurfaceTest(); ReleaseDirectDraw(); }

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: ebacf49f0297fefbc112b59835443abfb9f6e19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebacf49f0297fefbc112b5983… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 3 23:23:26 2010 +0100 comctl32: Constify some variables. --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tab.c | 2 +- dlls/comctl32/treeview.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 354ab66..8ecfee3 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2661,7 +2661,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, INT iBand, const REBARBANDINFOW *lprbbi, static LRESULT -REBAR_SetBarInfo (REBAR_INFO *infoPtr, LPREBARINFO lpInfo) +REBAR_SetBarInfo (REBAR_INFO *infoPtr, const REBARINFO *lpInfo) { REBAR_BAND *lpBand; UINT i; diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index c99153e..7057531 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2620,7 +2620,7 @@ static inline LRESULT TAB_Paint (TAB_INFO *infoPtr, HDC hdcPaint) } static LRESULT -TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, TCITEMW *pti, BOOL bUnicode) +TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode) { TAB_ITEM *item; RECT rect; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e4c465b..2745ce9 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5829,10 +5829,10 @@ TREEVIEW_Unregister(void) /* Tree Verification ****************************************************/ static inline void -TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item); +TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item); static inline void TREEVIEW_VerifyItemCommon(TREEVIEW_INFO *infoPtr, - TREEVIEW_ITEM *item) + const TREEVIEW_ITEM *item) { assert(infoPtr != NULL); assert(item != NULL); @@ -5871,7 +5871,7 @@ static inline void TREEVIEW_VerifyItemCommon(TREEVIEW_INFO *infoPtr, } static inline void -TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) +TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { assert(item != NULL); @@ -5887,9 +5887,9 @@ TREEVIEW_VerifyItem(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) } static inline void -TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) +TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) { - TREEVIEW_ITEM *child; + const TREEVIEW_ITEM *child; assert(item != NULL); for (child = item->firstChild; child != NULL; child = child->nextSibling)

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetPathAndQuery.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: b5e70534c611cfff36fed8227d8746f80f9ee20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5e70534c611cfff36fed8227… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:43:10 2010 -0400 urlmon: Implemented IUri_GetPathAndQuery. --- dlls/urlmon/tests/uri.c | 235 ++++++++++++++++++++++++++--------------------- dlls/urlmon/uri.c | 29 +++++-- 2 files changed, 154 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5e70534c611cfff36fed…

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetQuery.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 45069a33307abeaeceb53c04d866b4e3ee126cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=45069a33307abeaeceb53c04d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:21:16 2010 -0400 urlmon: Implemented IUri_GetQuery. --- dlls/urlmon/tests/uri.c | 206 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 26 +++++-- 2 files changed, 122 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45069a33307abeaeceb53…

1 0

Thomas Mullaly : urlmon: Implemented canonicalization of query strings.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: fdfcfc6aa05ea03138ce298f85906448b2ee9fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfcfc6aa05ea03138ce298f8… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Jul 27 20:03:47 2010 -0400 urlmon: Implemented canonicalization of query strings. --- dlls/urlmon/tests/uri.c | 210 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 74 +++++++++++++++++ 2 files changed, 284 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdfcfc6aa05ea03138ce2…

1 0

Thomas Mullaly : urlmon: Implemented a parser for URI query strings.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 36b1006c6b30a3fc5ca1ffe066b98c226cbb9ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36b1006c6b30a3fc5ca1ffe06… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 26 20:30:21 2010 -0400 urlmon: Implemented a parser for URI query strings. --- dlls/urlmon/tests/uri.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 47 +++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index be43751..9a0e6ff 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -2861,6 +2861,66 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_UNKNOWN,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* Unknown scheme types can have invalid % encoded data in query string. */ + { "zip://www.winehq.org/tests/..?query=%xx&return=y", 0, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN|Uri_HAS_HOST| + Uri_HAS_DOMAIN|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_QUERY|Uri_HAS_RAW_URI| + Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"zip://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"zip://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,FALSE}, + {"/?query=%xx&return=y",S_OK,TRUE}, + {"?query=%xx&return=y",S_OK,TRUE}, + {"zip://www.winehq.org/tests/..?query=%xx&return=y",S_OK,FALSE}, + {"zip",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_UNKNOWN,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, + } + }, + /* Known scheme types can have invalid % encoded data with the right flags. */ + { "http://www.winehq.org/tests/..?query=%xx&return=y", Uri_CREATE_NO_DECODE_EXTRA_INFO, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN|Uri_HAS_HOST| + Uri_HAS_DOMAIN|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_PORT|Uri_HAS_QUERY|Uri_HAS_RAW_URI| + Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE|Uri_HAS_SCHEME, + TRUE, + { + {"http://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"http://www.winehq.org/?query=%xx&return=y",S_OK,TRUE}, + {"winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,TRUE}, + {"www.winehq.org",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/",S_OK,FALSE}, + {"/?query=%xx&return=y",S_OK,TRUE}, + {"?query=%xx&return=y",S_OK,TRUE}, + {"http://www.winehq.org/tests/..?query=%xx&return=y",S_OK,FALSE}, + {"http",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {80,S_OK,FALSE}, + {URL_SCHEME_HTTP,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, + } } }; @@ -2913,7 +2973,9 @@ static const invalid_uri invalid_uri_tests[] = { {"gopher://www.google.com\\test",Uri_CREATE_NO_CANONICALIZE,FALSE}, /* Not allowed to have invalid % encoded data in opaque URI path. */ {"news:test%XX",0,FALSE}, - {"mailto:wine@winehq%G8.com",0,FALSE} + {"mailto:wine@winehq%G8.com",0,FALSE}, + /* Known scheme types can't have invalid % encoded data in query string. */ + {"http://google.com/?query=te%xx",0,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4950331..c63cffa 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -120,6 +120,9 @@ typedef struct { const WCHAR *path; DWORD path_len; + + const WCHAR *query; + DWORD query_len; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -1738,6 +1741,45 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } +/* Attempts to parse the query string from the URI. + * + * NOTES: + * If NO_DECODE_EXTRA_INFO flag is set, then invalid percent encoded + * data is allowed appear in the query string. For unknown scheme types + * invalid percent encoded data is allowed to appear reguardless. + */ +static BOOL parse_query(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + + if(**ptr != '?') { + TRACE("(%p %p %x): URI didn't contain a query string.\n", ptr, data, flags); + return TRUE; + } + + data->query = *ptr; + + ++(*ptr); + while(**ptr && **ptr != '#') { + if(**ptr == '%' && known_scheme && + !(flags & Uri_CREATE_NO_DECODE_EXTRA_INFO)) { + if(!check_pct_encoded(ptr)) { + *ptr = data->query; + data->query = NULL; + return FALSE; + } else + continue; + } + + ++(*ptr); + } + + data->query_len = *ptr - data->query; + + TRACE("(%p %p %x): Parsed query string %s len=%d\n", ptr, data, flags, + debugstr_wn(data->query, data->query_len), data->query_len); + return TRUE; +} + /* Parses and validates the components of the specified by data->uri * and stores the information it parses into 'data'. * @@ -1758,7 +1800,10 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { if(!parse_hierpart(pptr, data, flags)) return FALSE; - /* TODO: Parse query and fragment (if the URI has one). */ + if(!parse_query(pptr, data, flags)) + return FALSE; + + /* TODO: Parse fragment (if the URI has one). */ TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); return TRUE;

1 0

Sven Baars : shdocvw: Update the Dutch translation.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 811c705ad9e81f2131ea3b6583569f4b897dacc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811c705ad9e81f2131ea3b658… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Aug 3 21:50:32 2010 +0200 shdocvw: Update the Dutch translation. --- dlls/shdocvw/Nl.rc | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Nl.rc b/dlls/shdocvw/Nl.rc index 2237c5f..418a36d 100644 --- a/dlls/shdocvw/Nl.rc +++ b/dlls/shdocvw/Nl.rc @@ -60,3 +60,18 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "&Over Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Terug" + IDS_TB_FORWARD "Vooruit" + IDS_TB_STOP "Stoppen" + IDS_TB_REFRESH "Vernieuwen" + IDS_TB_HOME "Startpagina" + IDS_TB_PRINT "Printen" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adres" +}

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010