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

Natanael Copa : configure: Test for isinf and isnan needs link to -lm.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 3b11f79b7b74e3d5f24db33173d6c5600e2e4b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b11f79b7b74e3d5f24db3317… Author: Natanael Copa <ncopa(a)alpinelinux.org> Date: Wed Jul 6 08:58:01 2011 +0000 configure: Test for isinf and isnan needs link to -lm. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 61efbd9..2694c59 100755 --- a/configure +++ b/configure @@ -14270,6 +14270,8 @@ $as_echo "#define HAVE_DAYLIGHT 1" >>confdefs.h fi +ac_save_LIBS="$LIBS" +LIBS="$LIBS -lm" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf" >&5 $as_echo_n "checking for isinf... " >&6; } if ${ac_cv_have_isinf+:} false; then : @@ -14335,6 +14337,7 @@ then $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi +LIBS="$ac_save_LIBS" case $host_cpu in diff --git a/configure.ac b/configure.ac index 3d493cf..dccc4d3 100644 --- a/configure.ac +++ b/configure.ac @@ -2327,6 +2327,8 @@ then fi dnl Check for isinf +ac_save_LIBS="$LIBS" +LIBS="$LIBS -lm" AC_CACHE_CHECK([for isinf], ac_cv_have_isinf, AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) if test "$ac_cv_have_isinf" = "yes" @@ -2341,6 +2343,7 @@ if test "$ac_cv_have_isnan" = "yes" then AC_DEFINE(HAVE_ISNAN, 1, [Define to 1 if you have the `isnan' function.]) fi +LIBS="$ac_save_LIBS" dnl *** check for the need to define platform-specific symbols

1 0

Frédéric Delanoy : cmd/tests: Add support for todo_wine constructions.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 88ff0e816a39304e37a4fcbf5bea55f8270ce579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ff0e816a39304e37a4fcbf5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 9 23:33:59 2011 +0200 cmd/tests: Add support for todo_wine constructions. --- programs/cmd/tests/batch.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 95366da..03c2b56 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -190,6 +190,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da { const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; DWORD line = 0; + static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; + BOOL is_todo_wine; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -197,13 +199,22 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da for(exp_nl = exp_ptr; exp_nl < exp_data+exp_size && *exp_nl != '\r' && *exp_nl != '\n'; exp_nl++); for(out_nl = out_ptr; out_nl < out_data+out_size && *out_nl != '\r' && *out_nl != '\n'; out_nl++); + is_todo_wine = (exp_ptr+sizeof(todo_wine_cmd) <= exp_nl && + !memcmp(exp_ptr, todo_wine_cmd, sizeof(todo_wine_cmd))); + if (is_todo_wine) { + exp_ptr += sizeof(todo_wine_cmd); + winetest_start_todo("wine"); + } + err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); - else if(err) - ok(0, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", - *err, (int)(err-out_ptr), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else + ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + + if(is_todo_wine) winetest_end_todo("wine"); exp_ptr = exp_nl+1; out_ptr = out_nl+1;

1 0

Jay Yang : shell32: Implement a context menu for the recycle bin.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 4dd99dcc558d0ec4f38b3f523b6812555088613f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd99dcc558d0ec4f38b3f523… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Fri Jul 8 10:47:03 2011 -0400 shell32: Implement a context menu for the recycle bin. --- dlls/shell32/recyclebin.c | 152 ++++++++++++++++++++++++- dlls/shell32/shell32.rc | 15 +++ dlls/shell32/shresdef.h | 8 ++ po/ar.po | 268 ++++++++++++++++++++++++------------------- po/bg.po | 267 ++++++++++++++++++++++++------------------- po/ca.po | 260 +++++++++++++++++++++++------------------- po/cs.po | 267 ++++++++++++++++++++++++------------------- po/da.po | 277 +++++++++++++++++++++++++-------------------- po/de.po | 267 ++++++++++++++++++++++++------------------- po/el.po | 267 ++++++++++++++++++++++++------------------- po/en.po | 263 +++++++++++++++++++++++-------------------- po/en_US.po | 269 ++++++++++++++++++++++++-------------------- po/eo.po | 267 ++++++++++++++++++++++++------------------- po/es.po | 267 ++++++++++++++++++++++++------------------- po/fa.po | 268 ++++++++++++++++++++++++------------------- po/fi.po | 267 ++++++++++++++++++++++++------------------- po/fr.po | 267 ++++++++++++++++++++++++------------------- po/he.po | 267 ++++++++++++++++++++++++------------------- po/hi.po | 260 +++++++++++++++++++++++------------------- po/hu.po | 267 ++++++++++++++++++++++++------------------- po/it.po | 267 ++++++++++++++++++++++++------------------- po/ja.po | 267 ++++++++++++++++++++++++------------------- po/ko.po | 267 ++++++++++++++++++++++++------------------- po/lt.po | 267 ++++++++++++++++++++++++------------------- po/ml.po | 260 +++++++++++++++++++++++------------------- po/nb_NO.po | 267 ++++++++++++++++++++++++------------------- po/nl.po | 267 ++++++++++++++++++++++++------------------- po/or.po | 260 +++++++++++++++++++++++------------------- po/pa.po | 260 +++++++++++++++++++++++------------------- po/pl.po | 267 ++++++++++++++++++++++++------------------- po/pt_BR.po | 267 ++++++++++++++++++++++++------------------- po/pt_PT.po | 267 ++++++++++++++++++++++++------------------- po/rm.po | 260 +++++++++++++++++++++++------------------- po/ro.po | 277 +++++++++++++++++++++++++-------------------- po/ru.po | 267 ++++++++++++++++++++++++------------------- po/sk.po | 267 ++++++++++++++++++++++++------------------- po/sl.po | 267 ++++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 267 ++++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 267 ++++++++++++++++++++++++------------------- po/sv.po | 267 ++++++++++++++++++++++++------------------- po/te.po | 260 +++++++++++++++++++++++------------------- po/th.po | 267 ++++++++++++++++++++++++------------------- po/tr.po | 267 ++++++++++++++++++++++++------------------- po/uk.po | 267 ++++++++++++++++++++++++------------------- po/wa.po | 270 ++++++++++++++++++++++++------------------- po/wine.pot | 260 +++++++++++++++++++++++------------------- po/zh_CN.po | 267 ++++++++++++++++++++++++------------------- po/zh_TW.po | 277 +++++++++++++++++++++++++-------------------- 48 files changed, 6791 insertions(+), 5376 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dd99dcc558d0ec4f38b3…

1 0

Jay Yang : shell32: Implement restoring items from the recycle bin.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 80c62ca20349582e339fbc398be35b9a8cff6d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c62ca20349582e339fbc398… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Fri Jul 8 10:47:08 2011 -0400 shell32: Implement restoring items from the recycle bin. --- dlls/shell32/recyclebin.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/trash.c | 33 ++++++++++++++++++++++++++++++ dlls/shell32/xdg.h | 1 + 3 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index a98bc09..f840bf1 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -186,6 +186,52 @@ static void DoErase(RecycleBinMenu *This) ISFHelper_DeleteItems(helper,This->cidl,(LPCITEMIDLIST*)This->apidl); } +static void DoRestore(RecycleBinMenu *This) +{ + + /*TODO add prompts*/ + UINT i; + for(i=0;i<This->cidl;i++) + { + WIN32_FIND_DATAW data; + TRASH_UnpackItemID(&((This->apidl[i])->mkid),&data); + if(PathFileExistsW(data.cFileName)) + { + PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data.cFileName); + WCHAR message[100]; + WCHAR caption[50]; + if(_ILIsFolder(ILFindLastID(dest_pidl))) + LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_OVERWRITEFOLDER, + message,sizeof(message)/sizeof(WCHAR)); + else + LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_OVERWRITEFILE, + message,sizeof(message)/sizeof(WCHAR)); + LoadStringW(shell32_hInstance,IDS_RECYCLEBIN_OVERWRITE_CAPTION, + caption,sizeof(caption)/sizeof(WCHAR)); + + if(ShellMessageBoxW(shell32_hInstance,GetActiveWindow(),message, + caption,MB_YESNO|MB_ICONEXCLAMATION, + data.cFileName)!=IDYES) + continue; + } + if(SUCCEEDED(TRASH_RestoreItem(This->apidl[i]))) + { + IPersistFolder2 *persist; + LPITEMIDLIST root_pidl; + PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data.cFileName); + BOOL is_folder = _ILIsFolder(ILFindLastID(dest_pidl)); + IShellFolder2_QueryInterface(This->folder,&IID_IPersistFolder2, + (void**)&persist); + IPersistFolder2_GetCurFolder(persist,&root_pidl); + SHChangeNotify(is_folder ? SHCNE_RMDIR : SHCNE_DELETE, + SHCNF_IDLIST,ILCombine(root_pidl,This->apidl[i]),0); + SHChangeNotify(is_folder ? SHCNE_MKDIR : SHCNE_CREATE, + SHCNF_IDLIST,dest_pidl,0); + ILFree(dest_pidl); + ILFree(root_pidl); + } + } +} static HRESULT WINAPI RecycleBinMenu_InvokeCommand(IContextMenu2 *iface, LPCMINVOKECOMMANDINFO pici) @@ -199,6 +245,9 @@ static HRESULT WINAPI RecycleBinMenu_InvokeCommand(IContextMenu2 *iface, case IDM_RECYCLEBIN_ERASE: DoErase(This); break; + case IDM_RECYCLEBIN_RESTORE: + DoRestore(This); + break; default: return E_NOTIMPL; } diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index c449dce..c64e203 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -544,6 +544,39 @@ failed: return err; } +HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){ + int suffix_length = strlen(trashinfo_suffix); + LPCSHITEMID id = &(pidl->mkid); + const char *bucket_name = (const char*)(id->abID+1+sizeof(WIN32_FIND_DATAW)); + const char *filename = (const char*)(id->abID+1+sizeof(WIN32_FIND_DATAW)+strlen(bucket_name)+1); + char *restore_path; + WIN32_FIND_DATAW data; + char *file_path; + + TRACE("(%p)",pidl); + if(strcmp(filename+strlen(filename)-suffix_length,trashinfo_suffix)) + { + ERR("pidl at %p is not a valid recycle bin entry",pidl); + return E_INVALIDARG; + } + TRASH_UnpackItemID(id,&data); + restore_path = wine_get_unix_file_name(data.cFileName); + file_path = SHAlloc(max(strlen(home_trash->files_dir),strlen(home_trash->info_dir))+strlen(filename)+1); + sprintf(file_path,"%s%s",home_trash->files_dir,filename); + file_path[strlen(home_trash->files_dir)+strlen(filename)-suffix_length] = '\0'; + if(!rename(file_path,restore_path)) + { + sprintf(file_path,"%s%s",home_trash->info_dir,filename); + if(unlink(file_path)) + WARN("failed to delete the trashinfo file %s",filename); + } + else + WARN("could not erase %s from the trash (errno=%i)\n",filename,errno); + SHFree(file_path); + HeapFree(GetProcessHeap(), 0, restore_path); + return S_OK; +} + HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) { int suffix_length = strlen(trashinfo_suffix); diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index 1f403ba..6236887 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -41,6 +41,7 @@ BOOL TRASH_CanTrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; BOOL TRASH_TrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) DECLSPEC_HIDDEN; HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) DECLSPEC_HIDDEN; +HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_dirs, char *** out_ptr) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : makefiles: Allow install rules to run in parallel.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: bb86a35f09786e98df5d244111f0e197f6d2af79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb86a35f09786e98df5d24411… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 17:46:54 2011 +0200 makefiles: Allow install rules to run in parallel. --- Makefile.in | 6 +++++ aclocal.m4 | 59 ++++++++++++++++++++++++++++++++++++------------------ configure | 62 ++++++++++++++++++++++++++++++++++++--------------------- configure.ac | 4 --- 4 files changed, 84 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb86a35f09786e98df5d2…

1 0

Alexandre Julliard : makefiles: Install static libraries from the top-level makefile.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: f64a6753cb3c99cf7872dc2a6d2e5f9945ff6cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64a6753cb3c99cf7872dc2a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 17:58:47 2011 +0200 makefiles: Install static libraries from the top-level makefile. --- Makefile.in | 2 +- aclocal.m4 | 16 +++++++++++++++- configure | 16 +++++++++++++++- dlls/Makeimplib.rules.in | 9 --------- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index c06fab8..ae438b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +26,7 @@ EXTRASUBDIRS = \ programs # Destination directories for make install -INSTALLDIRS = $(DESTDIR)$(bindir) +INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) all: wine @echo "Wine build complete." diff --git a/aclocal.m4 b/aclocal.m4 index 9036f37..0fc84fe 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -249,7 +249,21 @@ wine_fn_config_lib () ac_name=$[1] ac_flags=$[2] ac_dir=dlls/$ac_name - wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules + wine_fn_config_makefile $ac_dir enable_$ac_name "$ac_flags" dlls/Makeimplib.rules + + if wine_fn_has_flag install-dev $ac_flags + then : + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ +$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a +install install-dev:: $ac_dir/__install__ +__uninstall__: $ac_dir/__uninstall__" + fi + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir" wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include" } diff --git a/configure b/configure index 7c26578..2a82bb5 100755 --- a/configure +++ b/configure @@ -14616,7 +14616,21 @@ wine_fn_config_lib () ac_name=$1 ac_flags=$2 ac_dir=dlls/$ac_name - wine_fn_config_makefile $ac_dir enable_$ac_name $ac_flags,install-dev dlls/Makeimplib.rules + wine_fn_config_makefile $ac_dir enable_$ac_name "$ac_flags" dlls/Makeimplib.rules + + if wine_fn_has_flag install-dev $ac_flags + then : + else + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +".PHONY: $ac_dir/__install__ $ac_dir/__uninstall__ +$ac_dir/__install__:: $ac_dir \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_dir/lib$ac_name.a \$(DESTDIR)\$(dlldir)/lib$ac_name.a +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_name.a +install install-dev:: $ac_dir/__install__ +__uninstall__: $ac_dir/__uninstall__" + fi + wine_fn_append_rule ALL_MAKEFILE_DEPENDS "__builddeps__: $ac_dir" wine_fn_append_rule ALL_MAKEFILE_DEPENDS "$ac_dir: tools/widl tools/winebuild tools/winegcc include" } diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index a02cb4d..fa3f984 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -8,7 +8,6 @@ DLLFLAGS = @DLLFLAGS@ DEFS = -D__WINESRC__ $(EXTRADEFS) -INSTALLDIRS = $(DESTDIR)$(dlldir) MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@ @@ -27,12 +26,4 @@ $(MODULE:%=lib%.cross.a): $(CROSSOBJS) Makefile.in $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSRANLIB) $@ -# Rules for installation - -install install-dev:: $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir) - $(INSTALL_DATA) $(MODULE:%=lib%.a) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a) - -uninstall:: - $(RM) $(DESTDIR)$(dlldir)/$(MODULE:%=lib%.a) - # End of global library rules

1 0

Alexandre Julliard : makefiles: Install import libraries from the top-level makefile.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 6cba5c48d9315ae2e7e369e3b7ee36789c8e3ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cba5c48d9315ae2e7e369e3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 18:01:42 2011 +0200 makefiles: Install import libraries from the top-level makefile. --- aclocal.m4 | 32 ++++++++++++++++++++++++-------- configure | 32 ++++++++++++++++++++++++-------- dlls/Makedll.rules.in | 18 +----------------- 3 files changed, 49 insertions(+), 33 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 0fc84fe..01bfa77 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -330,10 +330,23 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile @cd $ac_dir && \$(MAKE) lib$ac_implib.def $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT -.PHONY: $ac_dir/__install-dev__ -$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-dev -install-dev:: $ac_dir/__install-dev__" +.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__ +$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +install install-dev:: $ac_dir/__install-dev__ +__uninstall__: $ac_dir/__uninstall__" + + if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-dev__:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__ + \$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" + fi + if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -350,10 +363,13 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec $ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(srcdir)/$ac_dir/$ac_name.spec -.PHONY: $ac_dir/__install-dev__ -$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-dev -install-dev:: $ac_dir/__install-dev__" +.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__ +$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +install install-dev:: $ac_dir/__install-dev__ +__uninstall__: $ac_dir/__uninstall__" if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ diff --git a/configure b/configure index 2a82bb5..61efbd9 100755 --- a/configure +++ b/configure @@ -14698,10 +14698,23 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile @cd $ac_dir && \$(MAKE) lib$ac_implib.def $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT -.PHONY: $ac_dir/__install-dev__ -$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-dev -install-dev:: $ac_dir/__install-dev__" +.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__ +$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +install install-dev:: $ac_dir/__install-dev__ +__uninstall__: $ac_dir/__uninstall__" + + if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT" + then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/__install-dev__:: $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir) __builddeps__ + \$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" + fi + if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ @@ -14718,10 +14731,13 @@ $ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec $ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(srcdir)/$ac_dir/$ac_name.spec -.PHONY: $ac_dir/__install-dev__ -$ac_dir/__install-dev__:: $ac_dir/Makefile __builddeps__ - @cd $ac_dir && \$(MAKE) install-dev -install-dev:: $ac_dir/__install-dev__" +.PHONY: $ac_dir/__install-dev__ $ac_dir/__uninstall__ +$ac_dir/__install-dev__:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) + \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/__uninstall__:: + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +install install-dev:: $ac_dir/__install-dev__ +__uninstall__: $ac_dir/__uninstall__" if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 3a9af70..52e006e 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -65,19 +65,6 @@ xmlpages:: $(C_SRCS) dummy # Rules for installation -.PHONY: install_static_implib_def install_static_implib_a -.PHONY: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) - -$(IMPORTLIB:%=_install_/%): $(IMPORTLIBFILE) $(DESTDIR)$(dlldir) dummy - $(INSTALL_DATA) $(IMPORTLIBFILE) $(DESTDIR)$(dlldir)/$(IMPORTLIBFILE) - -install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir) dummy - $(INSTALL_DATA) $(STATICIMPLIB) $(DESTDIR)$(dlldir)/$(STATICIMPLIB) - -install_static_implib_a: - -$(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) - .PHONY: install_dll install_dll.so install_dll.fake install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy @@ -91,11 +78,8 @@ install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT) -install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy - uninstall:: - -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB) - $(RM) $(DESTDIR)$(fakedlldir)/$(MODULE) + $(RM) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE) # Misc. rules

1 0

Alexandre Julliard : makefiles: Make MODULE contain the full module name also for static libraries.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: db7f8e57499f52355c462617ee916b52a50d368e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db7f8e57499f52355c462617e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 9 21:13:28 2011 +0200 makefiles: Make MODULE contain the full module name also for static libraries. --- dlls/Makeimplib.rules.in | 6 +++--- dlls/adsiid/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index fa3f984..0a22784 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -12,16 +12,16 @@ MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@ -all: $(MODULE:%=lib%.a) @CROSSTEST_DISABLE@ $(MODULE:%=lib%.cross.a) +all: $(MODULE) @CROSSTEST_DISABLE@ $(MODULE:.a=.cross.a) # Rules for .a library -$(MODULE:%=lib%.a): $(OBJS) Makefile.in +$(MODULE): $(OBJS) Makefile.in $(RM) $@ $(AR) $(ARFLAGS) $@ $(OBJS) $(RANLIB) $@ -$(MODULE:%=lib%.cross.a): $(CROSSOBJS) Makefile.in +$(MODULE:.a=.cross.a): $(CROSSOBJS) Makefile.in $(RM) $@ $(CROSSAR) $(ARFLAGS) $@ $(CROSSOBJS) $(CROSSRANLIB) $@ diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index ea33ed8..a5b27d5 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = adsiid +MODULE = libadsiid.a C_SRCS = \ adsiid.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index 4068890..aa46a26 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -MODULE = dxerr8 +MODULE = libdxerr8.a C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index 1555071..57edb14 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -MODULE = dxerr9 +MODULE = libdxerr9.a C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index e2f61c1..a47a51f 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = dxguid +MODULE = libdxguid.a C_SRCS = \ dx10guid.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 8c19a56..5757ddd 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -MODULE = strmbase +MODULE = libstrmbase.a C_SRCS = \ dllfunc.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 362c040..744682e 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = strmiids +MODULE = libstrmiids.a C_SRCS = \ strmiids.c diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index 237bb79..bc35e69 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = uuid +MODULE = libuuid.a C_SRCS = \ uuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index d85fd3c..23dca02 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -MODULE = winecrt0 +MODULE = libwinecrt0.a C_SRCS = \ delay_load.c \

1 0

Jay Yang : shell32/tests: Add tests for SHQueryRecycleBin.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: a77d50b6f32d3f9e3e64f88dff104ac87e6325e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77d50b6f32d3f9e3e64f88df… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Fri Jul 8 10:46:40 2011 -0400 shell32/tests: Add tests for SHQueryRecycleBin. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/recyclebin.c | 102 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index 3399532..61ffc51 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ ebrowser.c \ generated.c \ progman_dde.c \ + recyclebin.c \ shelldispatch.c \ shelllink.c \ shellole.c \ diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c new file mode 100644 index 0000000..ed30464 --- /dev/null +++ b/dlls/shell32/tests/recyclebin.c @@ -0,0 +1,102 @@ +/* + * Tests for recycle bin functions + * + * Copyright 2011 Jay Yang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include "shellapi.h" + +#include <stdio.h> +#include "wine/test.h" + +static int (WINAPI *pSHQueryRecycleBinA)(LPCSTR,LPSHQUERYRBINFO); +static int (WINAPI *pSHFileOperationA)(LPSHFILEOPSTRUCTA); + +static char int64_buffer[65]; +/* Note: This function uses a single buffer for the return value.*/ +static const char* str_from_int64(__int64 ll) +{ + + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(int64_buffer,"%lx%08lx",(unsigned long)(ll >> 32),(unsigned long)ll); + else + sprintf(int64_buffer,"%lx",(unsigned long)ll); + return int64_buffer; +} + +static void setup_pointers(void) +{ + HMODULE hshell32 = GetModuleHandleA("shell32.dll"); + pSHQueryRecycleBinA = (void*)GetProcAddress(hshell32, "SHQueryRecycleBinA"); + pSHFileOperationA = (void*)GetProcAddress(hshell32, "SHFileOperationA"); +} + +static void test_query_recyclebin(void) +{ + SHQUERYRBINFO info1={sizeof(info1),0xdeadbeef,0xdeadbeef}; + SHQUERYRBINFO info2={sizeof(info2),0xdeadbeef,0xdeadbeef}; + UINT written; + HRESULT hr; + HANDLE file; + SHFILEOPSTRUCTA shfo; + const CHAR *name="test.txt"; + CHAR buf[MAX_PATH+strlen(name)+2]; + if(!pSHQueryRecycleBinA) + { + skip("SHQueryRecycleBinA does not exist"); + return; + } + if(!pSHFileOperationA) + { + skip("SHFileOperationA does not exist"); + return; + } + GetCurrentDirectoryA(MAX_PATH, buf); + strcat(buf,"\\"); + strcat(buf,name); + buf[strlen(buf) + 1] = '\0'; + hr = pSHQueryRecycleBinA(buf,&info1); + ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); + ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); + /*create and send a file to the recycle bin*/ + file = CreateFileA(name,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",name); + WriteFile(file,name,strlen(name),&written,NULL); + CloseHandle(file); + shfo.hwnd = NULL; + shfo.wFunc = FO_DELETE; + shfo.pFrom = buf; + shfo.pTo = NULL; + shfo.fFlags = FOF_FILESONLY | FOF_NOCONFIRMATION | FOF_SILENT | FOF_ALLOWUNDO; + shfo.hNameMappings = NULL; + shfo.lpszProgressTitle = NULL; + ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); + hr = pSHQueryRecycleBinA(buf,&info2); + ok(hr == S_OK, "SHQueryRecycleBinW failed with error 0x%x\n", hr); + todo_wine ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); + todo_wine ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); +} + + +START_TEST(recyclebin) +{ + setup_pointers(); + test_query_recyclebin(); +}

1 0

Jay Yang : shell32: Implement SHQueryRecycleBin.
by Alexandre Julliard 11 Jul '11

11 Jul '11

Module: wine Branch: master Commit: 52838e687adbf04b12629ed12f7a095f9133e854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52838e687adbf04b12629ed12… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Fri Jul 8 10:46:44 2011 -0400 shell32: Implement SHQueryRecycleBin. --- dlls/shell32/recyclebin.c | 31 +++++++++++++++++++++++++++++++ dlls/shell32/shellord.c | 20 -------------------- dlls/shell32/tests/recyclebin.c | 4 ++-- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 47d2775..4787ad7 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -2,6 +2,7 @@ * Trash virtual folder support. The trashing engine is implemented in trash.c * * Copyright (C) 2006 Mikolaj Zalewski + * Copyright 2011 Jay Yang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,6 +35,7 @@ #include "shlwapi.h" #include "shlobj.h" #include "shresdef.h" +#include "shellapi.h" #include "wine/debug.h" #include "shell32_main.h" @@ -524,6 +526,35 @@ static const IPersistFolder2Vtbl recycleBinPersistVtbl = RecycleBin_GetCurFolder }; +HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) +{ + WCHAR wszRootPath[MAX_PATH]; + MultiByteToWideChar(CP_ACP, 0, pszRootPath, -1, wszRootPath, MAX_PATH); + return SHQueryRecycleBinW(wszRootPath, pSHQueryRBInfo); +} + +HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) +{ + LPITEMIDLIST *apidl; + INT cidl; + INT i=0; + TRACE("(%s, %p)\n", debugstr_w(pszRootPath), pSHQueryRBInfo); + FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); + + TRASH_EnumItems(&apidl,&cidl); + pSHQueryRBInfo->i64NumItems = cidl; + pSHQueryRBInfo->i64Size = 0; + for (; i<cidl; i++) + { + WIN32_FIND_DATAW data; + TRASH_UnpackItemID(&((apidl[i])->mkid),&data); + pSHQueryRBInfo->i64Size += ((DWORDLONG)data.nFileSizeHigh << 32) + data.nFileSizeLow; + ILFree(apidl[i]); + } + SHFree(apidl); + return S_OK; +} + /************************************************************************* * SHUpdateRecycleBinIcon [SHELL32.@] * diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 051154d..8d7ce89 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2119,26 +2119,6 @@ DWORD WINAPI SHFormatDrive(HWND hwnd, UINT drive, UINT fmtID, UINT options) return SHFMT_NOFORMAT; } -HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) -{ - FIXME("%s, %p - stub\n", debugstr_a(pszRootPath), pSHQueryRBInfo); - - pSHQueryRBInfo->i64Size = 0; - pSHQueryRBInfo->i64NumItems = 0; - - return S_OK; -} - -HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo) -{ - FIXME("%s, %p - stub\n", debugstr_w(pszRootPath), pSHQueryRBInfo); - - pSHQueryRBInfo->i64Size = 0; - pSHQueryRBInfo->i64NumItems = 0; - - return S_OK; -} - /************************************************************************* * SHSetLocalizedName (SHELL32.@) */ diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index ed30464..ce101a6 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -90,8 +90,8 @@ static void test_query_recyclebin(void) ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); hr = pSHQueryRecycleBinA(buf,&info2); ok(hr == S_OK, "SHQueryRecycleBinW failed with error 0x%x\n", hr); - todo_wine ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - todo_wine ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); + ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); + ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); }

1 0