May 2011 - Wine-commits - list.winehq.org

Michael Stefaniuc : shell32: COM cleanup in shfldr_mycomp.c.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: d137259225ed979c1082b2434773ff82bff40e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d137259225ed979c1082b2434… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 31 14:12:07 2011 +0200 shell32: COM cleanup in shfldr_mycomp.c. --- dlls/shell32/shfldr_mycomp.c | 87 ++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d137259225ed979c1082b…

1 0

André Hentschel : documentation: Replaced CVS with Git .
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 51c7ab08972e08436671f761b7b217b213487e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c7ab08972e08436671f761b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 30 20:08:36 2011 +0200 documentation: Replaced CVS with Git. --- documentation/README.es | 4 ++-- documentation/README.hu | 4 ++-- documentation/README.pt | 4 ++-- documentation/README.pt_br | 4 ++-- documentation/README.tr | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/documentation/README.es b/documentation/README.es index 0603992..93a40b8 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -188,8 +188,8 @@ Bugs: Reporte bugs al Bugzilla de Wine en http://bugs.winehq.org IRC: Hay disponoble ayuda online en el canal #WineHQ de irc.freenode.net. -CVS: El �rbol actual de desarrollo de Wine est� disponible a trav�s de CVS. - Vaya a http://www.winehq.org/cvs para m�s informaci�n. +Git: El �rbol actual de desarrollo de Wine est� disponible a trav�s de Git. + Vaya a http://www.winehq.org/git para m�s informaci�n. Listas de correo: Hay varias listas de correo para desarrolladores de Wine; vea diff --git a/documentation/README.hu b/documentation/README.hu index 4fb81ab..f78165a 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -192,8 +192,8 @@ Hib IRC: Azonnali seg�ts�g el�rhet� a #WineHQ csatorn�n a irc.freenode.net-en. -CVS: A jelenlegi Wine fejleszt�i fa el�rhet� CVS-en kereszt�l. - L�togasson el ide a tov�bbi inform�ci�hoz: http://www.winehq.org/cvs +Git: A jelenlegi Wine fejleszt�i fa el�rhet� Git-en kereszt�l. + L�togasson el ide a tov�bbi inform�ci�hoz: http://www.winehq.org/git Levelez�list�k: El�rhet� n�h�ny levelez�lista a Wine fejleszt�k sz�m�ra; n�zze meg a diff --git a/documentation/README.pt b/documentation/README.pt index 0f85895d..8d17704 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -197,8 +197,8 @@ Usenet: Tu podes discutor t IRC: Ajuda online est� disponivel em #WineHQ on irc.freenode.net. -CVS: O currente desenvolvimento do Wine est� disponivel por CVS. - Vai a http://www.winehq.org/cvs para mais informa��o. +Git: O currente desenvolvimento do Wine est� disponivel por Git. + Vai a http://www.winehq.org/git para mais informa��o. Mailing Lists: H� algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 4e6ec9f..02eac91 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -190,8 +190,8 @@ Bugs: Relate erros ao Wine Bugzilla em http://bugs.winehq.org IRC: A ajuda online est� dispon�vel em #WineHQ em irc.freenode.net. -CVS: O �rvore de desenvolvimento atual do Wine est� dispon�vel por CVS. - V� em http://www.winehq.org/cvs para mais informa��o. +Git: O �rvore de desenvolvimento atual do Wine est� dispon�vel por Git. + V� em http://www.winehq.org/git para mais informa��o. Mailing Lists: H� diversas listas de mensagens para colaboradores no desenvolvimento diff --git a/documentation/README.tr b/documentation/README.tr index cc5ace5..a4c8819 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -197,8 +197,8 @@ Hatalar: IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. -CVS: Geçerli Wine geliştirme ağacı CVS üzerinden erişilebilir. - Daha fazla bilgi için http://www.winehq.org/cvs adresine gidiniz. +Git: Geçerli Wine geliştirme ağacı Git üzerinden erişilebilir. + Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. E-posta listeleri: Wine geliştiricileri için birtakım e-posta listeleri bulunmaktadır.

1 0

Dan Kegel : cmd: WCMD_delete: move "Delete *.* ?" processing into WCMD_delete_confirm_wildcard.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 3ccfbaef70a451beb694d28d583d9858b67916ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccfbaef70a451beb694d28d5… Author: Dan Kegel <dank(a)kegel.com> Date: Sun May 29 20:19:00 2011 -0700 cmd: WCMD_delete: move "Delete *.* ?" processing into WCMD_delete_confirm_wildcard. --- programs/cmd/builtins.c | 77 +++++++++++++++++------------ programs/cmd/tests/test_builtins.cmd | 12 +++++ programs/cmd/tests/test_builtins.cmd.exp | 3 + 3 files changed, 60 insertions(+), 32 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c8baef1..e329a8d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -579,6 +579,48 @@ static void WCMD_delete_parse_attributes(DWORD *wantSet, DWORD *wantClear) { } } +/* If filename part of parameter is * or *.*, + * and neither /Q nor /P options were given, + * prompt the user whether to proceed. + * Returns FALSE if user says no, TRUE otherwise. + * *pPrompted is set to TRUE if the user is prompted. + * (If /P supplied, del will prompt for individual files later.) + */ +static BOOL WCMD_delete_confirm_wildcard(WCHAR *filename, BOOL *pPrompted) { + static const WCHAR parmP[] = {'/','P','\0'}; + static const WCHAR parmQ[] = {'/','Q','\0'}; + + if ((strstrW(quals, parmQ) == NULL) && (strstrW(quals, parmP) == NULL)) { + static const WCHAR anyExt[]= {'.','*','\0'}; + WCHAR drive[10]; + WCHAR dir[MAX_PATH]; + WCHAR fname[MAX_PATH]; + WCHAR ext[MAX_PATH]; + WCHAR fpath[MAX_PATH]; + + /* Convert path into actual directory spec */ + GetFullPathNameW(filename, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); + WCMD_splitpath(fpath, drive, dir, fname, ext); + + /* Only prompt for * and *.*, not *a, a*, *.a* etc */ + if ((strcmpW(fname, starW) == 0) && + (*ext == 0x00 || (strcmpW(ext, anyExt) == 0))) { + + WCHAR question[MAXSTRING]; + static const WCHAR fmt[] = {'%','s',' ','\0'}; + + /* Caller uses this to suppress "file not found" warning later */ + *pPrompted = TRUE; + + /* Ask for confirmation */ + wsprintfW(question, fmt, fpath); + return WCMD_ask_confirm(question, TRUE, NULL); + } + } + /* No scary wildcard, or question suppressed, so it's ok to delete the file(s) */ + return TRUE; +} + /**************************************************************************** * WCMD_delete * @@ -598,7 +640,6 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { int argsProcessed = 0; WCHAR *argN = command; BOOL foundAny = FALSE; - static const WCHAR parmQ[] = {'/','Q','\0'}; static const WCHAR parmP[] = {'/','P','\0'}; static const WCHAR parmS[] = {'/','S','\0'}; static const WCHAR parmF[] = {'/','F','\0'}; @@ -623,43 +664,15 @@ BOOL WCMD_delete (WCHAR *command, BOOL expectDir) { WCHAR *p; BOOL handleParm = TRUE; BOOL found = FALSE; - static const WCHAR anyExt[]= {'.','*','\0'}; strcpyW(argCopy, thisArg); WINE_TRACE("del: Processing arg %s (quals:%s)\n", wine_dbgstr_w(argCopy), wine_dbgstr_w(quals)); argsProcessed++; - /* If filename part of parameter is * or *.*, prompt unless - /Q supplied. */ - if ((strstrW (quals, parmQ) == NULL) && (strstrW (quals, parmP) == NULL)) { - - WCHAR drive[10]; - WCHAR dir[MAX_PATH]; - WCHAR fname[MAX_PATH]; - WCHAR ext[MAX_PATH]; - - /* Convert path into actual directory spec */ - GetFullPathNameW(argCopy, sizeof(fpath)/sizeof(WCHAR), fpath, NULL); - WCMD_splitpath(fpath, drive, dir, fname, ext); - - /* Only prompt for * and *.*, not *a, a*, *.a* etc */ - if ((strcmpW(fname, starW) == 0) && - (*ext == 0x00 || (strcmpW(ext, anyExt) == 0))) { - BOOL ok; - WCHAR question[MAXSTRING]; - static const WCHAR fmt[] = {'%','s',' ','\0'}; - - /* Note: Flag as found, to avoid file not found message */ - found = TRUE; - - /* Ask for confirmation */ - wsprintfW(question, fmt, fpath); - ok = WCMD_ask_confirm(question, TRUE, NULL); - - /* Abort if answer is 'N' */ - if (!ok) continue; - } + if (!WCMD_delete_confirm_wildcard(argCopy, &found)) { + /* Skip this arg if user declines to delete *.* */ + continue; } /* First, try to delete in the current directory */ diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2763d7c..c287fca 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -94,6 +94,18 @@ del /a:r *.test if not exist r.test echo r.test not found after delete, good if exist r.test echo r.test found after delete, bad +echo ------------ Testing del /q -------------- +mkdir del_q_dir +cd del_q_dir +echo abc > file1 +echo abc > file2.dat +rem If /q doesn't work, cmd will prompt and the test case should hang +del /q * > nul +for %%a in (1 2.dat) do if exist file%%a echo del /q * failed on file%%a +for %%a in (1 2.dat) do if not exist file%%a echo del /q * succeeded on file%%a +cd .. +rmdir del_q_dir + echo -----------Testing Errorlevel----------- rem nt 4.0 doesn't really support a way of setting errorlevel, so this is weak rem See http://www.robvanderwoude.com/exit.php diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c185eb0..1f9bf66 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -82,6 +82,9 @@ if /I seems to work not-r.test not found after delete, good r.test found before delete, good r.test not found after delete, good +------------ Testing del /q -------------- +del /q * succeeded on file1 +del /q * succeeded on file2.dat -----------Testing Errorlevel----------- 1 errorlevel just right, good

1 0

Andrew Nguyen : advapi32/tests: Add tests for GetUserNameA/W.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 750cadd2ffd1c82b97eef44c0ad081bbc68a42e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750cadd2ffd1c82b97eef44c0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue May 31 11:05:25 2011 -0500 advapi32/tests: Add tests for GetUserNameA/W. --- dlls/advapi32/tests/security.c | 155 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4b7473f..1d677ac 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3723,6 +3723,159 @@ static void test_EqualSid(void) FreeSid(sid2); } +static void test_GetUserNameA(void) +{ + char buffer[UNLEN + 1], filler[UNLEN + 1]; + DWORD required_len, buffer_len; + BOOL ret; + + /* Test crashes on Windows. */ + if (0) + { + SetLastError(0xdeadbeef); + GetUserNameA(NULL, NULL); + } + + SetLastError(0xdeadbeef); + required_len = 0; + ret = GetUserNameA(NULL, &required_len); + ok(ret == FALSE, "GetUserNameA returned %d\n", ret); + ok(required_len != 0, "Outputted buffer length was %u\n", required_len); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + required_len = 1; + ret = GetUserNameA(NULL, &required_len); + ok(ret == FALSE, "GetUserNameA returned %d\n", ret); + ok(required_len != 0 && required_len != 1, "Outputted buffer length was %u\n", required_len); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); + + /* Tests crashes on Windows. */ + if (0) + { + SetLastError(0xdeadbeef); + required_len = UNLEN + 1; + GetUserNameA(NULL, &required_len); + + SetLastError(0xdeadbeef); + GetUserNameA(buffer, NULL); + } + + memset(filler, 'x', sizeof(filler)); + + /* Note that GetUserNameA on XP and newer outputs the number of bytes + * required for a Unicode string, which affects a test in the next block. */ + SetLastError(0xdeadbeef); + memcpy(buffer, filler, sizeof(filler)); + required_len = 0; + ret = GetUserNameA(buffer, &required_len); + ok(ret == FALSE, "GetUserNameA returned %d\n", ret); + ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was altered\n"); + ok(required_len != 0, "Outputted buffer length was %u\n", required_len); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buffer, filler, sizeof(filler)); + buffer_len = required_len; + ret = GetUserNameA(buffer, &buffer_len); + ok(ret == TRUE, "GetUserNameA returned %d, last error %u\n", ret, GetLastError()); + ok(memcmp(buffer, filler, sizeof(filler)) != 0, "Output buffer was untouched\n"); + todo_wine + ok(buffer_len == required_len || + broken(buffer_len == required_len / sizeof(WCHAR)), /* XP+ */ + "Outputted buffer length was %u\n", buffer_len); + + /* Use the reported buffer size from the last GetUserNameA call and pass + * a length that is one less than the required value. */ + SetLastError(0xdeadbeef); + memcpy(buffer, filler, sizeof(filler)); + buffer_len--; + ret = GetUserNameA(buffer, &buffer_len); + ok(ret == FALSE, "GetUserNameA returned %d\n", ret); + todo_wine { + ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was untouched\n"); + ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); + } +} + +static void test_GetUserNameW(void) +{ + WCHAR buffer[UNLEN + 1], filler[UNLEN + 1]; + DWORD required_len, buffer_len; + BOOL ret; + + /* Test crashes on Windows. */ + if (0) + { + SetLastError(0xdeadbeef); + GetUserNameW(NULL, NULL); + } + + SetLastError(0xdeadbeef); + required_len = 0; + ret = GetUserNameW(NULL, &required_len); + ok(ret == FALSE, "GetUserNameW returned %d\n", ret); + ok(required_len != 0, "Outputted buffer length was %u\n", required_len); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + required_len = 1; + ret = GetUserNameW(NULL, &required_len); + ok(ret == FALSE, "GetUserNameW returned %d\n", ret); + ok(required_len != 0 && required_len != 1, "Outputted buffer length was %u\n", required_len); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); + + /* Tests crash on Windows. */ + if (0) + { + SetLastError(0xdeadbeef); + required_len = UNLEN + 1; + GetUserNameW(NULL, &required_len); + + SetLastError(0xdeadbeef); + GetUserNameW(buffer, NULL); + } + + memset(filler, 'x', sizeof(filler)); + + SetLastError(0xdeadbeef); + memcpy(buffer, filler, sizeof(filler)); + required_len = 0; + ret = GetUserNameW(buffer, &required_len); + ok(ret == FALSE, "GetUserNameW returned %d\n", ret); + ok(!memcmp(buffer, filler, sizeof(filler)), "Output buffer was altered\n"); + ok(required_len != 0, "Outputted buffer length was %u\n", required_len); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buffer, filler, sizeof(filler)); + buffer_len = required_len; + ret = GetUserNameW(buffer, &buffer_len); + ok(ret == TRUE, "GetUserNameW returned %d, last error %u\n", ret, GetLastError()); + ok(memcmp(buffer, filler, sizeof(filler)) != 0, "Output buffer was untouched\n"); + ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); + + /* GetUserNameW on XP and newer writes a truncated portion of the username string to the buffer. */ + SetLastError(0xdeadbeef); + memcpy(buffer, filler, sizeof(filler)); + buffer_len--; + ret = GetUserNameW(buffer, &buffer_len); + ok(ret == FALSE, "GetUserNameW returned %d\n", ret); + ok(!memcmp(buffer, filler, sizeof(filler)) || + broken(memcmp(buffer, filler, sizeof(filler)) != 0), /* XP+ */ + "Output buffer was altered\n"); + ok(buffer_len == required_len, "Outputted buffer length was %u\n", buffer_len); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); +} + START_TEST(security) { init(); @@ -3756,4 +3909,6 @@ START_TEST(security) test_GetSidSubAuthority(); test_CheckTokenMembership(); test_EqualSid(); + test_GetUserNameA(); + test_GetUserNameW(); }

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface3() for application provided interfaces.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: fb6ceb971b3afad0dff63bb860d8595396cf3e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb6ceb971b3afad0dff63bb86… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue May 31 15:49:37 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface3() for application provided interfaces. --- dlls/ddraw/ddraw.c | 21 +++++++++++---------- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/surface.c | 27 ++++++++++++++++++++------- 3 files changed, 33 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb6ceb971b3afad0dff63…

1 0

Ričardas Barkauskas : ddraw: Rename surface_from_surface3() to impl_from_IDirectDrawSurface3().
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 7df083193ddfc965e481864760c2c03c1a32d87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df083193ddfc965e48186476… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue May 31 15:03:07 2011 +0300 ddraw: Rename surface_from_surface3() to impl_from_IDirectDrawSurface3(). --- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/surface.c | 80 ++++++++++++++++++++++---------------------- 2 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7df083193ddfc965e4818…

1 0

Ričardas Barkauskas : ddraw: Use a This variable in the IDirectDraw3 methods that lack one.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: ecfb5c7a699cf9eb2ddc4e95853a40b0d82ca74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfb5c7a699cf9eb2ddc4e958… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue May 31 15:34:47 2011 +0300 ddraw: Use a This variable in the IDirectDraw3 methods that lack one. --- dlls/ddraw/surface.c | 130 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 84 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecfb5c7a699cf9eb2ddc4…

1 0

Ričardas Barkauskas : ddraw: Change IDirectDrawSurface3_vtbl to IDirectDrawSurface3_iface.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 6d5be5033e96a493ac92067214cbde45d937ea8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5be5033e96a493ac9206721… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue May 31 14:57:04 2011 +0300 ddraw: Change IDirectDrawSurface3_vtbl to IDirectDrawSurface3_iface. --- dlls/ddraw/ddraw.c | 22 +++++++++++----------- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d4fbf3b..3365c35 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2023,7 +2023,7 @@ static HRESULT WINAPI ddraw3_GetGDISurface(IDirectDraw3 *iface, IDirectDrawSurfa TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_vtbl : NULL; + *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; return hr; } @@ -2037,7 +2037,7 @@ static HRESULT WINAPI ddraw2_GetGDISurface(IDirectDraw2 *iface, IDirectDrawSurfa TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_vtbl : NULL; + *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; return hr; } @@ -2051,7 +2051,7 @@ static HRESULT WINAPI ddraw1_GetGDISurface(IDirectDraw *iface, IDirectDrawSurfac TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_vtbl : NULL; + *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; return hr; } @@ -2416,7 +2416,7 @@ static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, if (!surface) return E_INVALIDARG; hr = ddraw7_GetSurfaceFromDC(&This->IDirectDraw7_iface, dc, &surface7); - *surface = surface7 ? (IDirectDrawSurface4 *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_vtbl : NULL; + *surface = surface7 ? (IDirectDrawSurface4 *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; return hr; } @@ -3508,7 +3508,7 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s } impl = (IDirectDrawSurfaceImpl *)surface7; - *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 3); IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw3_AddRef(iface); @@ -3554,7 +3554,7 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, } impl = (IDirectDrawSurfaceImpl *)surface7; - *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 2); IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; @@ -3590,7 +3590,7 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, } impl = (IDirectDrawSurfaceImpl *)surface7; - *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_vtbl; + *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 1); IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; @@ -3721,7 +3721,7 @@ static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface, { struct surfacescallback_context *cbcontext = context; - return cbcontext->func((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_vtbl, + return cbcontext->func((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_iface, (DDSURFACEDESC *)surface_desc, cbcontext->context); } @@ -4168,7 +4168,7 @@ static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, IDirectDrawSu hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; + *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; return hr; } @@ -4184,7 +4184,7 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; + *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; return hr; } @@ -4200,7 +4200,7 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_vtbl; + *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e768659..c9c1b46 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -153,7 +153,7 @@ struct IDirectDrawSurfaceImpl { /* IUnknown fields */ const IDirectDrawSurface7Vtbl *lpVtbl; - const IDirectDrawSurface3Vtbl *IDirectDrawSurface3_vtbl; + IDirectDrawSurface3 IDirectDrawSurface3_iface; const IDirectDrawGammaControlVtbl *IDirectDrawGammaControl_vtbl; const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; @@ -222,7 +222,7 @@ static inline IDirectDrawSurfaceImpl *surface_from_texture2(IDirect3DTexture2 *i static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) { - return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 728d9b1..3bbc682 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1967,7 +1967,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *if hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 **)RenderTarget); if(hr != D3D_OK) return hr; *RenderTarget = *RenderTarget ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)*RenderTarget)->IDirectDrawSurface3_vtbl : NULL; + (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)*RenderTarget)->IDirectDrawSurface3_iface : NULL; return D3D_OK; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1fb9630..d63b530 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -84,7 +84,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, || IsEqualGUID(riid, &IID_IDirectDrawSurface) ) { IUnknown_AddRef(iface); - *obj = &This->IDirectDrawSurface3_vtbl; + *obj = &This->IDirectDrawSurface3_iface; TRACE("(%p) returning IDirectDrawSurface3 interface at %p\n", This, *obj); return S_OK; } @@ -567,7 +567,7 @@ static HRESULT WINAPI ddraw_surface3_GetAttachedSurface(IDirectDrawSurface3 *ifa &caps2, &attachment7); if (FAILED(hr)) *attachment = NULL; else *attachment = attachment7 ? - (IDirectDrawSurface3 *)&((IDirectDrawSurfaceImpl *)attachment7)->IDirectDrawSurface3_vtbl : NULL; + &((IDirectDrawSurfaceImpl *)attachment7)->IDirectDrawSurface3_iface : NULL; return hr; } @@ -1561,7 +1561,7 @@ static HRESULT CALLBACK EnumCallback(IDirectDrawSurface7 *surface, DDSURFACEDESC { const struct callback_info *info = context; - return info->callback((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_vtbl, + return info->callback((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_iface, (DDSURFACEDESC *)surface_desc, info->context); } @@ -3447,7 +3447,7 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 { if (!iface) return NULL; assert(iface->lpVtbl == &ddraw_surface3_vtbl); - return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface3_iface); } static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *parent) @@ -3608,7 +3608,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr } surface->lpVtbl = &ddraw_surface7_vtbl; - surface->IDirectDrawSurface3_vtbl = &ddraw_surface3_vtbl; + surface->IDirectDrawSurface3_iface.lpVtbl = &ddraw_surface3_vtbl; surface->IDirectDrawGammaControl_vtbl = &ddraw_gamma_control_vtbl; surface->IDirect3DTexture2_vtbl = &d3d_texture2_vtbl; surface->IDirect3DTexture_vtbl = &d3d_texture1_vtbl;

1 0

David Hedberg : oleaut32: Don' t crash in wrapper if variant resides in read-only memory.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: fd543f5aa36e35669a97402707d0a7e07bc86284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd543f5aa36e35669a9740270… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 30 12:45:32 2011 +0200 oleaut32: Don't crash in wrapper if variant resides in read-only memory. --- dlls/oleaut32/variant.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5d32c3b..5c17eb8 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2719,15 +2719,10 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) static HRESULT _VarChangeTypeExWrap (VARIANTARG* pvargDest, VARIANTARG* pvargSrc, LCID lcid, USHORT wFlags, VARTYPE vt) { - HRESULT res; - VARTYPE flags; + VARIANTARG vtmpsrc = *pvargSrc; - flags = V_VT(pvargSrc) & ~VT_TYPEMASK; - V_VT(pvargSrc) &= ~VT_RESERVED; - res = VariantChangeTypeEx(pvargDest,pvargSrc,lcid,wFlags,vt); - V_VT(pvargSrc) |= flags; - - return res; + V_VT(&vtmpsrc) &= ~VT_RESERVED; + return VariantChangeTypeEx(pvargDest,&vtmpsrc,lcid,wFlags,vt); } /**********************************************************************

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_mimeTypes implementation.
by Alexandre Julliard 31 May '11

31 May '11

Module: wine Branch: master Commit: 9dcceab0618114f5c40332ed6bb32d6246b54d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcceab0618114f5c40332ed6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 12:19:40 2011 +0200 mshtml: Added IOmNavigator::get_mimeTypes implementation. --- dlls/mshtml/omnavigator.c | 146 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 144 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index f5a3573..95e8930 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct HTMLPluginsCollection HTMLPluginsCollection; +typedef struct HTMLMimeTypesCollection HTMLMimeTypesCollection; typedef struct { DispatchEx dispex; @@ -40,6 +41,7 @@ typedef struct { LONG ref; HTMLPluginsCollection *plugins; + HTMLMimeTypesCollection *mime_types; } OmNavigator; static inline OmNavigator *impl_from_IOmNavigator(IOmNavigator *iface) @@ -196,6 +198,131 @@ static HRESULT create_plugins_collection(OmNavigator *navigator, HTMLPluginsColl return S_OK; } +struct HTMLMimeTypesCollection { + IHTMLMimeTypesCollection IHTMLMimeTypesCollection_iface; + + LONG ref; + + OmNavigator *navigator; +}; + +static inline HTMLMimeTypesCollection *impl_from_IHTMLMimeTypesCollection(IHTMLMimeTypesCollection *iface) +{ + return CONTAINING_RECORD(iface, HTMLMimeTypesCollection, IHTMLMimeTypesCollection_iface); +} + +static HRESULT WINAPI HTMLMimeTypesCollection_QueryInterface(IHTMLMimeTypesCollection *iface, REFIID riid, void **ppv) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IHTMLMimeTypesCollection_iface; + }else if(IsEqualGUID(&IID_IHTMLMimeTypesCollection, riid)) { + TRACE("(%p)->(IID_IHTMLMimeTypesCollection %p)\n", This, ppv); + *ppv = &This->IHTMLMimeTypesCollection_iface; + }else { + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLMimeTypesCollection_AddRef(IHTMLMimeTypesCollection *iface) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLMimeTypesCollection_Release(IHTMLMimeTypesCollection *iface) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->navigator) + This->navigator->mime_types = NULL; + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLMimeTypesCollection_GetTypeInfoCount(IHTMLMimeTypesCollection *iface, UINT *pctinfo) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLMimeTypesCollection_GetTypeInfo(IHTMLMimeTypesCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLMimeTypesCollection_GetIDsOfNames(IHTMLMimeTypesCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLMimeTypesCollection_Invoke(IHTMLMimeTypesCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLMimeTypesCollection_get_length(IHTMLMimeTypesCollection *iface, LONG *p) +{ + HTMLMimeTypesCollection *This = impl_from_IHTMLMimeTypesCollection(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLMimeTypesCollectionVtbl HTMLMimeTypesCollectionVtbl = { + HTMLMimeTypesCollection_QueryInterface, + HTMLMimeTypesCollection_AddRef, + HTMLMimeTypesCollection_Release, + HTMLMimeTypesCollection_GetTypeInfoCount, + HTMLMimeTypesCollection_GetTypeInfo, + HTMLMimeTypesCollection_GetIDsOfNames, + HTMLMimeTypesCollection_Invoke, + HTMLMimeTypesCollection_get_length +}; + +static HRESULT create_mime_types_collection(OmNavigator *navigator, HTMLMimeTypesCollection **ret) +{ + HTMLMimeTypesCollection *col; + + col = heap_alloc_zero(sizeof(*col)); + if(!col) + return E_OUTOFMEMORY; + + col->IHTMLMimeTypesCollection_iface.lpVtbl = &HTMLMimeTypesCollectionVtbl; + col->ref = 1; + col->navigator = navigator; + + *ret = col; + return S_OK; +} + static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID riid, void **ppv) { OmNavigator *This = impl_from_IOmNavigator(iface); @@ -243,6 +370,8 @@ static ULONG WINAPI OmNavigator_Release(IOmNavigator *iface) This->plugins->navigator = NULL; IHTMLPluginsCollection_Release(&This->plugins->IHTMLPluginsCollection_iface); } + if(This->mime_types) + This->mime_types->navigator = NULL; release_dispex(&This->dispex); heap_free(This); } @@ -387,8 +516,21 @@ static HRESULT WINAPI OmNavigator_taintEnabled(IOmNavigator *iface, VARIANT_BOOL static HRESULT WINAPI OmNavigator_get_mimeTypes(IOmNavigator *iface, IHTMLMimeTypesCollection **p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->mime_types) { + HRESULT hres; + + hres = create_mime_types_collection(This, &This->mime_types); + if(FAILED(hres)) + return hres; + }else { + IHTMLMimeTypesCollection_AddRef(&This->mime_types->IHTMLMimeTypesCollection_iface); + } + + *p = &This->mime_types->IHTMLMimeTypesCollection_iface; + return S_OK; } static HRESULT WINAPI OmNavigator_get_plugins(IOmNavigator *iface, IHTMLPluginsCollection **p)

1 0