~ubuntu-wine/ubuntu/lucid/wine1.2/wine1.2+winepulse

Viewing changes to dlls/shell32/shlmenu.c

Committer: Bazaar Package Importer
Author(s): Scott Ritchie
Date: 2010-02-02 11:15:03 UTC
mfrom: (1.1.9 upstream)
Revision ID: james.westby@ubuntu.com-20100202111503-w4ayji21ei1ginjr

Tags: 1.1.37-0ubuntu1

* New upstream release
  - A number of fixes in AVI file support.
  - Several MSXML improvements.
  - A few MSI fixes.
  - Various bug fixes.

files added:
config.guess

config.sub

dlls/avifil32/tests

dlls/avifil32/tests/Makefile.in

dlls/avifil32/tests/api.c

dlls/kernel32/tests/fiber.c

dlls/msdaps/main.c

dlls/msdaps/regsvr.c

dlls/msdaps/row_server.c

dlls/msdaps/row_server.idl

dlls/mshtml/htmlframe.c

dlls/msvcrt/tests/misc.c

dlls/xmllite/reader.c

dlls/xmllite/tests

dlls/xmllite/tests/Makefile.in

dlls/xmllite/tests/reader.c

include/xmllite.idl

files removed:
dlls/wined3d/baseshader.c

files modified:
.gitignore

ANNOUNCE

VERSION

configure

configure.ac

debian/changelog

dlls/advapi32/security.c

dlls/advapi32/tests/crypt.c

dlls/amstream/amstream.c

dlls/amstream/mediastream.c

dlls/amstream/mediastreamfilter.c

dlls/avifil32/api.c

dlls/avifil32/avifile.c

dlls/comctl32/listview.c

dlls/comctl32/rebar.c

dlls/comctl32/status.c

dlls/comctl32/tests/listview.c

dlls/comctl32/tests/status.c

dlls/commdlg.dll16/printdlg.c

dlls/crypt32/tests/msg.c

dlls/d3d10/d3d10_private.h

dlls/d3d10/effect.c

dlls/d3d8/d3d8_private.h

dlls/d3d9/d3d9_private.h

dlls/d3d9/device.c

dlls/d3d9/query.c

dlls/d3d9/stateblock.c

dlls/d3d9/tests/vertexdeclaration.c

dlls/d3drm/d3drm.c

dlls/d3drm/math.c

dlls/d3drm/tests/vector.c

dlls/d3dxof/d3dxof.c

dlls/d3dxof/d3dxof_private.h

dlls/ddraw/main.c

dlls/devenum/createdevenum.c

dlls/devenum/devenum_main.c

dlls/devenum/factory.c

dlls/devenum/mediacatenum.c

dlls/devenum/parsedisplayname.c

dlls/dinput/joystick_osx.c

dlls/dmband/dmband_main.c

dlls/dmcompos/dmcompos_main.c

dlls/dmime/dmime_main.c

dlls/dmscript/dmscript_main.c

dlls/dmstyle/dmstyle_main.c

dlls/dmsynth/dmsynth_main.c

dlls/dmusic/dmusic_main.c

dlls/dplayx/name_server.c

dlls/dsound/capture.c

dlls/dxdiagn/tests/provider.c

dlls/gdi32/freetype.c

dlls/gdi32/tests/font.c

dlls/inetmib1/tests/main.c

dlls/jscript/array.c

dlls/jscript/tests/activex.c

dlls/jscript/tests/api.js

dlls/kernel32/console.c

dlls/kernel32/except.c

dlls/kernel32/module.c

dlls/kernel32/sync.c

dlls/kernel32/tests/Makefile.in

dlls/kernel32/tests/atom.c

dlls/kernel32/tests/debugger.c

dlls/kernel32/tests/heap.c

dlls/kernel32/tests/module.c

dlls/kernel32/tests/virtual.c

dlls/krnl386.exe16/Makefile.in

dlls/krnl386.exe16/dosvm.c

dlls/krnl386.exe16/kernel16_private.h

dlls/krnl386.exe16/task.c

dlls/mapi32/tests/imalloc.c

dlls/mapi32/tests/prop.c

dlls/mapi32/tests/util.c

dlls/mmdevapi/devenum.c

dlls/mmdevapi/tests/mmdevenum.c

dlls/msdaps/Makefile.in

dlls/msgsm32.acm/msgsm32.c

dlls/mshtml/Makefile.in

dlls/mshtml/dispex.c

dlls/mshtml/htmlframebase.c

dlls/mshtml/htmliframe.c

dlls/mshtml/mshtml_private.h

dlls/mshtml/nsio.c

dlls/mshtml/tests/dom.c

dlls/mshtml/tests/htmldoc.c

dlls/msi/action.c

dlls/msi/events.c

dlls/msi/join.c

dlls/msi/tests/db.c

dlls/msi/tests/install.c

dlls/msvcr71/msvcr71.spec

dlls/msvcrt/Makefile.in

dlls/msvcrt/file.c

dlls/msvcrt/locale.c

dlls/msvcrt/misc.c

dlls/msvcrt/msvcrt.spec

dlls/msvcrt/tests/Makefile.in

dlls/msvcrt/tests/cpp.c

dlls/msvcrt/tests/file.c

dlls/msvcrt/wcs.c

dlls/msvcrtd/tests/debug.c

dlls/msvidc32/msvideo1.c

dlls/msxml3/comment.c

dlls/msxml3/domdoc.c

dlls/msxml3/element.c

dlls/msxml3/msxml_private.h

dlls/msxml3/saxreader.c

dlls/msxml3/tests/domdoc.c

dlls/msxml3/tests/saxreader.c

dlls/msxml3/tests/xmldoc.c

dlls/msxml3/tests/xmlelem.c

dlls/msxml3/xmldoc.c

dlls/msxml3/xmlelem.c

dlls/netapi32/netapi32.c

dlls/ntdll/Makefile.in

dlls/ntdll/heap.c

dlls/ntdll/loader.c

dlls/ntdll/nt.c

dlls/ntdll/ntdll.spec

dlls/ntdll/ntdll_misc.h

dlls/ntdll/process.c

dlls/ntdll/reg.c

dlls/ntdll/serial.c

dlls/ntdll/signal_i386.c

dlls/ntdll/sync.c

dlls/ntdll/tests/error.c

dlls/ntdll/tests/info.c

dlls/ntdll/tests/om.c

dlls/ntdll/tests/rtl.c

dlls/ntdll/tests/string.c

dlls/ntdll/tests/time.c

dlls/ntdll/thread.c

dlls/ntdll/threadpool.c

dlls/ntoskrnl.exe/ntoskrnl.exe.spec

dlls/objsel/factory.c

dlls/objsel/objsel.c

dlls/ole32/itemmoniker.c

dlls/oleaut32/tmarshal.c

dlls/rasapi32/tests/rasapi.c

dlls/riched20/editor.c

dlls/rpcrt4/rpc_defs.h

dlls/rpcrt4/rpc_message.c

dlls/rpcrt4/tests/rpc.c

dlls/rsaenh/tests/rsaenh.c

dlls/secur32/schannel.c

dlls/shell32/shlexec.c

dlls/shell32/shlmenu.c

dlls/shell32/tests/progman_dde.c

dlls/shell32/tests/shelllink.c

dlls/shell32/tests/shlfileop.c

dlls/shlwapi/tests/url.c

dlls/shlwapi/url.c

dlls/sti/sti.c

dlls/sti/tests/sti.c

dlls/user.exe16/Makefile.in

dlls/user.exe16/network.c

dlls/user.exe16/user.exe16.spec

dlls/user32/defwnd.c

dlls/user32/input.c

dlls/user32/menu.c

dlls/user32/misc.c

dlls/user32/scroll.c

dlls/user32/tests/menu.c

dlls/user32/tests/msg.c

dlls/user32/tests/win.c

dlls/winealsa.drv/waveout.c

dlls/winecoreaudio.drv/audio.c

dlls/wined3d/Makefile.in

dlls/wined3d/device.c

dlls/wined3d/directx.c

dlls/wined3d/query.c

dlls/wined3d/shader.c

dlls/wined3d/swapchain.c

dlls/wined3d/wined3d_gl.h

dlls/wined3d/wined3d_private.h

dlls/winex11.drv/keyboard.c

dlls/winex11.drv/systray.c

dlls/wininet/internet.c

dlls/wininet/tests/internet.c

dlls/winmm/tests/mmio.c

dlls/xmllite/Makefile.in

dlls/xmllite/xmllite.spec

include/Makefile.in

include/d3drm.h

include/d3drmdef.h

include/d3drmobj.h

include/dbs.idl

include/mshtmdid.h

include/mshtml.idl

include/raserror.h

include/wine/wined3d.idl

include/wine/winnet16.h

include/winternl.h

include/winuser.h

libs/wpp/ppl.l

programs/oleview/typelib.c

programs/wineconsole/wineconsole_Ru.rc

server/change.c

server/main.c

server/queue.c

server/sock.c

tools/widl/expr.c

tools/widl/parser.h

tools/widl/parser.l

tools/widl/parser.y

tools/widl/proxy.c

tools/widl/typegen.c

tools/widl/widl.c

tools/widl/widltypes.h

tools/wine.inf.in

tools/winebuild/build.h

tools/winebuild/import.c

tools/winebuild/main.c

tools/winebuild/relay.c

tools/winebuild/spec16.c

tools/winebuild/spec32.c

tools/winebuild/winebuild.man.in

tools/winedump/pe.c

tools/winedump/winedump.h

tools/wmc/wmc.c

tools/wmc/wmc.h

tools/wrc/translation.c

tools/wrc/utils.c

tools/wrc/wrc.c

Show diffs side-by-side

added added

removed removed

dlls/shell32/shlmenu.c

869

hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);

870

871

if (!hmDst || !hmSrc)

872

{ return uIDMax;

873

}

872

return uIDMax;

874

873

875

874

nItem = GetMenuItemCount(hmDst);

875

if (nItem == -1)

876

return uIDMax;

876

877

878

if (uInsert >= (UINT)nItem) /* insert position inside menu? */

878

879

{

Older »