May 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : Release 0.9.14.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: a9e2fc287c4fd4e0eda5e88632ae1885cabf9324 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9e2fc287c4fd4e0eda5e88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 19:39:31 2006 +0200 Release 0.9.14. --- ANNOUNCE | 13 ChangeLog | 3154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 4 files changed, 3170 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a9e2fc287c4fd4e0eda…

1 0

Tag wine-0.9.14 : Alexandre Julliard : Release 0.9.14
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/tags/wine-0.9.14 Tag: 0571b6a53af1bbbf4a454fc10427e7947a5ada8b URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=0571b6a53af1bbbf4a454fc104… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 19:39:32 2006 +0200 Release 0.9.14

1 0

Alexandre Julliard : usp10: Fixed a compiler warning.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: 94d0478ee52ac88e2ed0274158346b55d8175951 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94d0478ee52ac88e2ed0274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 18:30:34 2006 +0200 usp10: Fixed a compiler warning. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 48ded43..15d4c40 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -474,7 +474,7 @@ static void test_ScriptString(void) BOOL fDisabled = FALSE; hr = ScriptStringAnalyse( hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, &psControl, &psState, piDx, &pTabdef, - pbInClass, &pssa); + &pbInClass, &pssa); ok(hr == E_INVALIDARG, "ScriptStringAnalyse Stub should return E_INVALIDARG not %08x\n", (unsigned int) hr); hr = ScriptStringOut(pssa, iX, iY, uOptions, &prc, iMinSel, iMaxSel,fDisabled); ok(hr == E_NOTIMPL, "ScriptStringOut Stub should return E_NOTIMPL not %08x\n", (unsigned int) hr);

1 0

Alexandre Julliard : Link against libwine_unicode everywhere we use Unicode functions.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: 9ca8a86914ab7659e934b42840862218bb4153c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ca8a86914ab7659e934b42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 18:05:40 2006 +0200 Link against libwine_unicode everywhere we use Unicode functions. --- dlls/avifil32/Makefile.in | 2 +- dlls/comdlg32/Makefile.in | 2 +- dlls/dmloader/Makefile.in | 2 +- dlls/dmusic/Makefile.in | 2 +- dlls/dplayx/Makefile.in | 2 +- dlls/hhctrl.ocx/Makefile.in | 2 +- dlls/mciavi32/Makefile.in | 1 + dlls/mciseq/Makefile.in | 1 + dlls/mciwave/Makefile.in | 1 + dlls/midimap/Makefile.in | 1 + dlls/msacm32.drv/Makefile.in | 1 + dlls/msdmo/Makefile.in | 2 +- dlls/odbc32/Makefile.in | 1 + dlls/rpcrt4/Makefile.in | 2 +- dlls/shdocvw/Makefile.in | 2 +- dlls/urlmon/Makefile.in | 2 +- dlls/winmm/winearts/Makefile.in | 2 +- dlls/winmm/winenas/Makefile.in | 2 +- dlls/winmm/wineoss/Makefile.in | 2 +- programs/msiexec/Makefile.in | 1 + programs/rundll32/Makefile.in | 1 + programs/winemenubuilder/Makefile.in | 2 +- 22 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 793b925..fab7b8a 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = avifil32.dll IMPORTLIB = libavifil32.$(IMPLIBEXT) IMPORTS = msacm32 msvfw32 winmm ole32 user32 advapi32 kernel32 ntdll -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ acmstream.c \ diff --git a/dlls/comdlg32/Makefile.in b/dlls/comdlg32/Makefile.in index ee86f05..968a24f 100644 --- a/dlls/comdlg32/Makefile.in +++ b/dlls/comdlg32/Makefile.in @@ -6,7 +6,7 @@ MODULE = comdlg32.dll IMPORTLIB = libcomdlg32.$(IMPLIBEXT) IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 advapi32 kernel32 ntdll DELAYIMPORTS = ole32 -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ cdlg32.c \ diff --git a/dlls/dmloader/Makefile.in b/dlls/dmloader/Makefile.in index 2bb731e..c2b7329 100644 --- a/dlls/dmloader/Makefile.in +++ b/dlls/dmloader/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmloader.dll IMPORTS = ole32 user32 advapi32 kernel32 -EXTRALIBS = -ldxguid -luuid +EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid C_SRCS = \ classfactory.c \ diff --git a/dlls/dmusic/Makefile.in b/dlls/dmusic/Makefile.in index eded608..cd91aa9 100644 --- a/dlls/dmusic/Makefile.in +++ b/dlls/dmusic/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = dmusic.dll IMPORTS = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll -EXTRALIBS = -ldxguid -luuid +EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid C_SRCS = \ buffer.c \ diff --git a/dlls/dplayx/Makefile.in b/dlls/dplayx/Makefile.in index ce6cd4d..ad348c6 100644 --- a/dlls/dplayx/Makefile.in +++ b/dlls/dplayx/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = dplayx.dll IMPORTLIB = libdplayx.$(IMPLIBEXT) IMPORTS = winmm ole32 user32 advapi32 kernel32 -EXTRALIBS = -ldxguid -luuid +EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid C_SRCS = \ dpclassfactory.c \ diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index bc17b2f..02fc3a1 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = hhctrl.ocx IMPORTS = advapi32 comctl32 shell32 ole32 oleaut32 user32 gdi32 kernel32 -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ chm.c \ diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index 2a95aa6..0863165 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ info.c \ diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in index deca206..b7938b5 100644 --- a/dlls/mciseq/Makefile.in +++ b/dlls/mciseq/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciseq.dll IMPORTS = winmm user32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ mcimidi.c diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in index 924e715..a6f92df 100644 --- a/dlls/mciwave/Makefile.in +++ b/dlls/mciwave/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciwave.dll IMPORTS = winmm user32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ mciwave.c diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in index 6d56be3..347dd96 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = midimap.dll IMPORTS = winmm user32 advapi32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ midimap.c diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in index dbadc6a..67f2598 100644 --- a/dlls/msacm32.drv/Makefile.in +++ b/dlls/msacm32.drv/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msacm32.drv IMPORTS = msacm32 winmm user32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ wavemap.c diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index cdc3745..4e98357 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = msdmo.dll IMPORTLIB = libmsdmo.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ dmoreg.c \ diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 6790289..f247b22 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = odbc32.dll IMPORTLIB = libodbc32.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ proxyodbc.c diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 2b57ccc..fc36609 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -7,7 +7,7 @@ MODULE = rpcrt4.dll IMPORTLIB = librpcrt4.$(IMPLIBEXT) IMPORTS = iphlpapi advapi32 kernel32 ntdll DELAYIMPORTS = secur32 -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ cproxy.c \ diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 137775d..a5bf9ff 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -7,7 +7,7 @@ MODULE = shdocvw.dll IMPORTLIB = libshdocvw.$(IMPLIBEXT) IMPORTS = shell32 shlwapi user32 advapi32 kernel32 DELAYIMPORTS = urlmon ole32 oleaut32 -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ classinfo.c \ diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index b54592d..7898aa5 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = urlmon.dll IMPORTLIB = liburlmon.$(IMPLIBEXT) IMPORTS = cabinet ole32 shlwapi wininet user32 advapi32 kernel32 ntdll -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ binding.c \ diff --git a/dlls/winmm/winearts/Makefile.in b/dlls/winmm/winearts/Makefile.in index f277c83..04b7f28 100644 --- a/dlls/winmm/winearts/Makefile.in +++ b/dlls/winmm/winearts/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = winearts.drv IMPORTS = winmm user32 kernel32 ntdll EXTRAINCL = @ARTSINCL@ -EXTRALIBS = @ARTSLIBS@ -ldxguid -luuid +EXTRALIBS = @ARTSLIBS@ $(LIBUNICODE) -ldxguid -luuid C_SRCS = \ arts.c \ diff --git a/dlls/winmm/winenas/Makefile.in b/dlls/winmm/winenas/Makefile.in index 340681f..d992cf9 100644 --- a/dlls/winmm/winenas/Makefile.in +++ b/dlls/winmm/winenas/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = winenas.drv IMPORTS = winmm user32 kernel32 EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = -ldxguid -luuid @NASLIBS@ +EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid @NASLIBS@ C_SRCS = \ audio.c \ diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in index c365526..ce7db3b 100644 --- a/dlls/winmm/wineoss/Makefile.in +++ b/dlls/winmm/wineoss/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineoss.drv IMPORTS = winmm user32 kernel32 -EXTRALIBS = -ldxguid -luuid +EXTRALIBS = $(LIBUNICODE) -ldxguid -luuid C_SRCS = \ audio.c \ diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 6949d20..22815a0 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = msiexec.exe APPMODE = -mconsole IMPORTS = msi ole32 advapi32 user32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ msiexec.c diff --git a/programs/rundll32/Makefile.in b/programs/rundll32/Makefile.in index 11332b3..2e5f16e 100644 --- a/programs/rundll32/Makefile.in +++ b/programs/rundll32/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = rundll32.exe APPMODE = -mconsole IMPORTS = user32 kernel32 +EXTRALIBS = $(LIBUNICODE) C_SRCS = \ rundll32.c diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index ea8fb2f..e70490b 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = winemenubuilder.exe APPMODE = -mwindows IMPORTS = shell32 ole32 user32 advapi32 kernel32 -EXTRALIBS = -luuid +EXTRALIBS = $(LIBUNICODE) -luuid C_SRCS = \ winemenubuilder.c

1 0

Alexandre Julliard : Tests should not use wine/unicode.h.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: 23f9e358adaf9129d8ce52a4caac42faf7b07011 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=23f9e358adaf9129d8ce52a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 18:05:09 2006 +0200 Tests should not use wine/unicode.h. --- dlls/ntdll/tests/atom.c | 23 +++++++++++------------ dlls/ntdll/tests/env.c | 11 +++++------ dlls/ntdll/tests/port.c | 1 - dlls/oleaut32/tests/vartype.c | 5 ++--- dlls/rpcrt4/tests/ndr_marshall.c | 1 - dlls/rpcrt4/tests/rpc.c | 1 - dlls/shdocvw/tests/shortcut.c | 1 - dlls/shell32/tests/shlfolder.c | 8 +++----- dlls/shlwapi/tests/path.c | 21 ++++++++++----------- 9 files changed, 31 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=23f9e358adaf9129d8c…

1 0

Alexandre Julliard : libwine: Don't use libwine_unicode functions.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: dbb455e7ab23d61a74c9c6bc5b39a607388eba2d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbb455e7ab23d61a74c9c6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 17:16:42 2006 +0200 libwine: Don't use libwine_unicode functions. --- libs/wine/debug.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/wine/debug.c b/libs/wine/debug.c index 03003b9..6f4167f 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -29,7 +29,6 @@ #include <ctype.h> #include "wine/debug.h" #include "wine/library.h" -#include "wine/unicode.h" static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; @@ -324,7 +323,12 @@ static const char *default_dbgstr_wn( co sprintf( res, "#%04x", LOWORD(str) ); return res; } - if (n == -1) n = strlenW(str); + if (n == -1) + { + const WCHAR *end = str; + while (*end) end++; + n = end - str; + } if (n < 0) n = 0; size = 12 + min( 300, n * 5 ); dst = res = funcs.get_temp_buffer( n * 5 + 7 );

1 0

Alexandre Julliard : widl: Get rid of unnecessary inclusion of unicode.h.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: 59493b6c3314678c3fbaed3597dd8f39f0497f2d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59493b6c3314678c3fbaed3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 17:41:47 2006 +0200 widl: Get rid of unnecessary inclusion of unicode.h. --- tools/widl/typelib.c | 2 -- tools/widl/write_msft.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index bb2f715..be0d010 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -38,8 +38,6 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" -#include "wine/unicode.h" - #include "widl.h" #include "utils.h" #include "parser.h" diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 38d054a..212d12d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -45,8 +45,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "wine/unicode.h" - #include "widltypes.h" #include "typelib.h" #include "typelib_struct.h"

1 0

Mike McCormack : Fixed more boolean comparisons against TRUE.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: d20c6cf8ca814b92ab3edc5fc291071561551194 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d20c6cf8ca814b92ab3edc5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 24 19:29:06 2006 +0900 Fixed more boolean comparisons against TRUE. --- dlls/gdi/font.c | 2 +- dlls/msi/classes.c | 2 +- dlls/quartz/filtergraph.c | 2 +- programs/winefile/winefile.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index c8cbfab..40e308e 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2883,7 +2883,7 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC if (!abc) return FALSE; ret = GetCharABCWidthsW( hdc, first, last, abc ); - if (ret == TRUE) + if (ret) { for (i = first; i <= last; i++, abc++, abcf++) { diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 13a4df2..7476f7f 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -716,7 +716,7 @@ static void mark_progid_for_install( MSI if (!progid) return; - if (progid->InstallMe == TRUE) + if (progid->InstallMe) return; progid->InstallMe = TRUE; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 29a4f42..dbb4048 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1379,7 +1379,7 @@ static HRESULT SendFilterMessage(IMediaC break; } } - if (source == TRUE) + if (source) { TRACE("Found a source filter %p\n", pfilter); IEnumPins_Reset(pEnum); diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index e4fc4ec..8b03f1e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2235,7 +2235,7 @@ static LRESULT CALLBACK FrameWndProc(HWN switch(nmsg) { case WM_CLOSE: - if (Globals.saveSettings == TRUE) + if (Globals.saveSettings) save_registry_settings(); DestroyWindow(hwnd); @@ -2396,7 +2396,7 @@ static LRESULT CALLBACK FrameWndProc(HWN case ID_VIEW_SAVESETTINGS: Globals.saveSettings = !Globals.saveSettings; CheckMenuItem(Globals.hMenuOptions, ID_VIEW_SAVESETTINGS, - Globals.saveSettings == TRUE ? MF_CHECKED : MF_UNCHECKED ); + Globals.saveSettings ? MF_CHECKED : MF_UNCHECKED ); break; case ID_EXECUTE: {

1 0

Mike McCormack : rpcrt4: Add stub implementations for NDRCContext(Un) Marshall.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: 4def9cc022aca5d5498af33c18b2f8458836b507 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4def9cc022aca5d5498af33… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 24 19:28:46 2006 +0900 rpcrt4: Add stub implementations for NDRCContext(Un)Marshall. --- dlls/rpcrt4/ndr_marshall.c | 13 +++++++++++++ dlls/rpcrt4/rpcrt4.spec | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 113f0bf..f6888c8 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4344,3 +4344,16 @@ RPC_BINDING_HANDLE WINAPI NDRCContextBin FIXME("(%p): stub\n", CContext); return NULL; } + +void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff) +{ + FIXME("(%p %p): stub\n", CContext, pBuff); +} + +void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *CContext, + RPC_BINDING_HANDLE hBinding, + void *pBuff, + unsigned long DataRepresentation) +{ + FIXME("(%p %p %p %08lx): stub\n", CContext, hBinding, pBuff, DataRepresentation); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5d35096..5099c9e 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -138,8 +138,8 @@ # 9x version of I_RpcBindingSetAsync has @ stub MqGetContext # win9x @ stub MqRegisterQueue # win9x @ stdcall NDRCContextBinding(ptr) -@ stub NDRCContextMarshall -@ stub NDRCContextUnmarshall +@ stdcall NDRCContextMarshall(ptr ptr) +@ stdcall NDRCContextUnmarshall(ptr ptr ptr long) @ stub NDRSContextMarshall2 @ stub NDRSContextMarshall @ stub NDRSContextMarshallEx

1 0

Mike McCormack : wininet: Fix a possible NULL pointer deference.
by Alexandre Julliard May 24, 2006

May 24, 2006

Module: wine Branch: refs/heads/master Commit: e480b6d07dc79451aeb9c1410a667269727eb5c4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e480b6d07dc79451aeb9c14… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed May 24 19:28:26 2006 +0900 wininet: Fix a possible NULL pointer deference. --- dlls/wininet/dialogs.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index d6f14e3..1b160e6 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -108,19 +108,22 @@ static BOOL WININET_GetAuthRealm( HINTER * dealing with 'Basic' Authentication */ p = strchrW( szBuf, ' ' ); - if( p && !strncmpW( p+1, szRealm, strlenW(szRealm) ) ) + if( !p || strncmpW( p+1, szRealm, strlenW(szRealm) ) ) { - /* remove quotes */ - p += 7; - if( *p == '"' ) - { - p++; - q = strrchrW( p, '"' ); - if( q ) - *q = 0; - } + ERR("proxy response wrong? (%s)\n", debugstr_w(szBuf)); + return FALSE; } + + /* remove quotes */ + p += 7; + if( *p == '"' ) + { + p++; + q = strrchrW( p, '"' ); + if( q ) + *q = 0; + } strcpyW( szBuf, p ); return TRUE;

1 0