December 2010 - Wine-Commits

Hwang YunSong : comdlg32: Update Korean resource.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: caf742bdcf0422e03498a06c6dc9403447e66bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf742bdcf0422e03498a06c6… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Dec 18 17:51:53 2010 +0900 comdlg32: Update Korean resource. --- dlls/comdlg32/cdlg_Ko.rc | 546 +++++++++++++++++++++++----------------------- 1 files changed, 274 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=caf742bdcf0422e03498a…

1 0

Hwang YunSong : comctl32: Update Korean resource.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: a5661427dd937e992452950e3834f4805024ceac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5661427dd937e992452950e3… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Dec 18 17:50:14 2010 +0900 comctl32: Update Korean resource. --- dlls/comctl32/comctl_Ko.rc | 58 ++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/comctl_Ko.rc b/dlls/comctl32/comctl_Ko.rc index 31c6252..7f1f89f 100644 --- a/dlls/comctl32/comctl_Ko.rc +++ b/dlls/comctl32/comctl_Ko.rc @@ -19,72 +19,74 @@ #include "comctl32.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "%s �Ӽ�" +CAPTION "%s 속성" FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Ȯ��", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "��", IDCANCEL,58,122,50,14 - PUSHBUTTON "��(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED - PUSHBUTTON "��", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP - CONTROL "��", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 + DEFPUSHBUTTON "확인", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "취소", IDCANCEL,58,122,50,14 + PUSHBUTTON "적용(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "도움말", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "탭", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 END IDD_WIZARD DIALOG 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "��" +CAPTION "마법사" FONT 9, "MS Shell Dlg" BEGIN - PUSHBUTTON "< ��(&B)", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "��(&N) >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "��", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "��", IDCANCEL,178,138,50,14 - PUSHBUTTON "��", IDHELP,235,138,50,14,WS_GROUP + PUSHBUTTON "< 이전(&B)", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "다음(&N) >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "종료", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "취소", IDCANCEL,178,138,50,14 + PUSHBUTTON "도움말", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN - CONTROL "��", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + CONTROL "탭", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE END IDD_TBCUSTOMIZE DIALOG 10, 20, 357, 125 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "도구바 사용자 정의" FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "�ݱ�(&C)", IDCANCEL,308,6,44,14 - PUSHBUTTON "�缳��(&E)", IDC_RESET_BTN,308,23,44,14 - PUSHBUTTON "��(&H)", IDC_HELP_BTN,308,40,44,14 - PUSHBUTTON "�� ̵�(&U)", IDC_MOVEUP_BTN,308,74,44,14 - PUSHBUTTON "�Ʒ�� ̵�(&D)", IDC_MOVEDN_BTN,308,91,49,14 - LTEXT "�� ư(&V)", -1,4,5,84,10 + DEFPUSHBUTTON "닫기(&C)", IDCANCEL,308,6,44,14 + PUSHBUTTON "재설정(&E)", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "도움말(&H)", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "위로 이동(&U)", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "아래로 이동(&D)", IDC_MOVEDN_BTN,308,91,49,14 + LTEXT "가능한 버튼(&V)", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - PUSHBUTTON "��ϱ�(&A) ->", IDOK, 131, 42, 44, 14 - PUSHBUTTON "<-��(&R)", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "�� ư(&T):", -1,182,5,78,10 + PUSHBUTTON "더하기(&A) ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<-지우기(&R)", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "도구바 버튼(&T):", -1,182,5,78,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END STRINGTABLE { - IDS_CLOSE "�ݱ�" + IDS_CLOSE "닫기" } STRINGTABLE { - IDM_TODAY "��:" - IDM_GOTODAY "��÷� ��" + IDM_TODAY "오늘:" + IDM_GOTODAY "오늘로 가기" } STRINGTABLE { - IDS_SEPARATOR "�и��" + IDS_SEPARATOR "분리자" } STRINGTABLE { - HKY_NONE "��" + HKY_NONE "없음" }

1 0

Alexandre Julliard : wiaservc: Convert coclasses registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: c09f188c98935df8f33cbf1d1242a7489cc84124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09f188c98935df8f33cbf1d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 18 14:43:33 2010 +0100 wiaservc: Convert coclasses registration to the IRegistrar mechanism. --- dlls/wiaservc/Makefile.in | 2 ++ dlls/wiaservc/wiaservc.idl | 27 +++++++++++++++++++++++++++ dlls/wiaservc/wiaservc.inf | 11 ----------- dlls/wiaservc/wiaservc_main.c | 5 +++++ 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index b7867f3..9205070 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -7,6 +7,8 @@ C_SRCS = \ wiadevmgr.c \ wiaservc_main.c +IDL_R_SRCS = wiaservc.idl + RC_SRCS = rsrc.rc @MAKE_DLL_RULES@ diff --git a/dlls/wiaservc/wiaservc.idl b/dlls/wiaservc/wiaservc.idl new file mode 100644 index 0000000..e75c674 --- /dev/null +++ b/dlls/wiaservc/wiaservc.idl @@ -0,0 +1,27 @@ +/* + * COM Classes for wiaservc + * + * Copyright 2010 Alexandre Julliard + * + * 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 + */ + +[ + helpstring("WIA Device Manager"), + progid("WiaDevMgr.1"), + vi_progid("WiaDevMgr"), + uuid(a1f4e726-8cf1-11d1-bf92-0060081ed811) +] +coclass WiaDevMgr { interface IWiaDevMgr; } diff --git a/dlls/wiaservc/wiaservc.inf b/dlls/wiaservc/wiaservc.inf index c181a60..7adc6da 100644 --- a/dlls/wiaservc/wiaservc.inf +++ b/dlls/wiaservc/wiaservc.inf @@ -10,18 +10,7 @@ DelReg = WiaServc.Reg [WiaServc.Reg] HKCR,"AppID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" HKCR,"AppID\%CLSID_WiaDevMgr%","LocalService",,"stisvc" - -HKCR,"CLSID\%CLSID_WiaDevMgr%",,,"WIA Device Manager" HKCR,"CLSID\%CLSID_WiaDevMgr%","AppID",,"%CLSID_WiaDevMgr%" -HKCR,"CLSID\%CLSID_WiaDevMgr%\ProgID",,,"WiaDevMgr.1" -HKCR,"CLSID\%CLSID_WiaDevMgr%\VersionIndependentProgID",,,"WiaDevMgr" - -HKCR,"WiaDevMgr.1",,,"WIA Device Manager" -HKCR,"WiaDevMgr.1\CLSID",,,"%CLSID_WiaDevMgr%" - -HKCR,"WiaDevMgr",,,"WIA Device Manager" -HKCR,"WiaDevMgr\CLSID",,,"%CLSID_WiaDevMgr%" -HKCR,"WiaDevMgr\CurVer",,,"WiaDevMgr.1" HKLM,"Software\Microsoft\Windows NT\CurrentVersion\SvcHost","imgsvc",0x00010000,"StiSvc" diff --git a/dlls/wiaservc/wiaservc_main.c b/dlls/wiaservc/wiaservc_main.c index ce979a2..0302a48 100644 --- a/dlls/wiaservc/wiaservc_main.c +++ b/dlls/wiaservc/wiaservc_main.c @@ -25,6 +25,7 @@ #include "winreg.h" #include "advpub.h" #include "olectl.h" +#include "rpcproxy.h" #include "winsvc.h" #include "wia_lh.h" @@ -164,10 +165,14 @@ static HRESULT register_server(BOOL do_register) HRESULT WINAPI DllRegisterServer(void) { + HRESULT hr = __wine_register_resources( hInst, NULL ); + if (FAILED(hr)) return hr; return register_server(TRUE); } HRESULT WINAPI DllUnregisterServer(void) { + HRESULT hr = __wine_unregister_resources( hInst, NULL ); + if (FAILED(hr)) return hr; return register_server(FALSE); }

1 0

Marcus Meissner : configure.ac: Add -Wlogical-op, if it's not noisy.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: f825f0d04a507734ed054fae38975c57043fa97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f825f0d04a507734ed054fae3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 17 21:29:20 2010 +0100 configure.ac: Add -Wlogical-op, if it's not noisy. --- configure | 37 +++++++++++++++++++++++++++++++++++-- configure.ac | 13 ++++++++++++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/configure b/configure index d44e6a6..a83e6b7 100755 --- a/configure +++ b/configure @@ -12229,8 +12229,8 @@ fi saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings" >&5 -$as_echo_n "checking for broken string.h that generates warnings... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wpointer-arith" >&5 +$as_echo_n "checking for broken string.h that generates warnings with -Wpointer-arith... " >&6; } if test "${ac_cv_c_string_h_warnings+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -12260,6 +12260,39 @@ $as_echo "$ac_cv_c_string_h_warnings" >&6; } EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wlogical-op -Werror" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wlogical-op" >&5 +$as_echo_n "checking for broken string.h that generates warnings with -Wlogical-op... " >&6; } +if test "${ac_cv_c_logicalop_noisy+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <string.h> +int +main () +{ +char*f(const char *h,char n) {return strchr(h,n);} + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_logicalop_noisy=no +else + ac_cv_c_logicalop_noisy=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_logicalop_noisy" >&5 +$as_echo "$ac_cv_c_logicalop_noisy" >&6; } + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_c_logicalop_noisy" = "no" + then + EXTRACFLAGS="$EXTRACFLAGS -Wlogical-op" + fi + if test "x$enable_maintainer_mode" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 diff --git a/configure.ac b/configure.ac index 43769e7..0706192 100644 --- a/configure.ac +++ b/configure.ac @@ -1673,7 +1673,7 @@ then dnl Check for noisy string.h saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" - AC_CACHE_CHECK([for broken string.h that generates warnings], ac_cv_c_string_h_warnings, + AC_CACHE_CHECK([for broken string.h that generates warnings with -Wpointer-arith], ac_cv_c_string_h_warnings, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[]])],[ac_cv_c_string_h_warnings=no],[ac_cv_c_string_h_warnings=yes])) CFLAGS="$saved_CFLAGS" if test "$ac_cv_c_string_h_warnings" = "no" @@ -1681,6 +1681,17 @@ then EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi + dnl Check for noisy string.h on logical ops + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wlogical-op -Werror" + AC_CACHE_CHECK([for broken string.h that generates warnings with -Wlogical-op], ac_cv_c_logicalop_noisy, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=no],[ac_cv_c_logicalop_noisy=yes])) + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_c_logicalop_noisy" = "no" + then + EXTRACFLAGS="$EXTRACFLAGS -Wlogical-op" + fi + dnl Enable -Werror for maintainer mode if test "x$enable_maintainer_mode" = "xyes" then

1 0

Jacek Caban : appwiz.cpl: Correctly handle NULL params in CPL_STARTWPARAMSW handler.
by Alexandre Julliard Dec. 20, 2010

Dec. 20, 2010

Module: wine Branch: master Commit: 50c99addb0229df00a7d397ec72ddbb4b34bbe3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c99addb0229df00a7d397ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 18 15:07:13 2010 +0100 appwiz.cpl: Correctly handle NULL params in CPL_STARTWPARAMSW handler. --- dlls/appwiz.cpl/appwiz.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index d336ac8..cd42032 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -958,6 +958,9 @@ static LONG start_params(const WCHAR *params) { static const WCHAR install_geckoW[] = {'i','n','s','t','a','l','l','_','g','e','c','k','o',0}; + if(!params) + return FALSE; + if(!strcmpW(params, install_geckoW)) { install_wine_gecko(); return TRUE;

1 0

Piotr Caban : server: Handle more inotify mask values.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: f4e64a442f4f0b875db3791611bb57eee04a3b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e64a442f4f0b875db379161… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 16 12:23:04 2010 +0100 server: Handle more inotify mask values. --- server/change.c | 43 ++++++++++++++++++------------------------- 1 files changed, 18 insertions(+), 25 deletions(-) diff --git a/server/change.c b/server/change.c index 0dd7d29..2bdc444 100644 --- a/server/change.c +++ b/server/change.c @@ -94,6 +94,8 @@ struct inotify_event { #define IN_DELETE 0x00000200 #define IN_DELETE_SELF 0x00000400 +#define IN_ISDIR 0x40000000 + static inline int inotify_init( void ) { int ret; @@ -664,6 +666,11 @@ static unsigned int filter_from_event( struct inotify_event *ie ) if (ie->mask & IN_CREATE) filter |= FILE_NOTIFY_CHANGE_CREATION; + if (ie->mask & IN_ISDIR) + filter &= ~FILE_NOTIFY_CHANGE_FILE_NAME; + else + filter &= ~FILE_NOTIFY_CHANGE_DIR_NAME; + return filter; } @@ -719,30 +726,22 @@ static char *inode_get_path( struct inode *inode, int sz ) return path; } -static int inode_check_dir( struct inode *parent, const char *name ) +static void inode_check_dir( struct inode *parent, const char *name ) { char *path; unsigned int filter; struct inode *inode; struct stat st; - int wd = -1, r = -1; + int wd = -1; path = inode_get_path( parent, strlen(name) ); if (!path) - return r; + return; strcat( path, name ); - r = stat( path, &st ); - if (r < 0) goto end; - - if (!S_ISDIR(st.st_mode)) - { - r = 0; + if (stat( path, &st ) < 0) goto end; - } - - r = 1; filter = filter_from_inode( parent, 1 ); if (!filter) @@ -760,7 +759,6 @@ static int inode_check_dir( struct inode *parent, const char *name ) end: free( path ); - return r; } static int prepend( char **path, const char *segment ) @@ -808,22 +806,17 @@ static void inotify_notify_all( struct inotify_event *ie ) if (ie->mask & IN_CREATE) { - switch (inode_check_dir( inode, ie->name )) - { - case 1: - filter &= ~FILE_NOTIFY_CHANGE_FILE_NAME; - break; - case 0: - filter &= ~FILE_NOTIFY_CHANGE_DIR_NAME; - break; - default: - break; - /* Maybe the file disappeared before we could check it? */ - } + if (ie->mask & IN_ISDIR) + inode_check_dir( inode, ie->name ); + action = FILE_ACTION_ADDED; } else if (ie->mask & IN_DELETE) action = FILE_ACTION_REMOVED; + else if (ie->mask & IN_MOVED_FROM) + action = FILE_ACTION_RENAMED_OLD_NAME; + else if (ie->mask & IN_MOVED_TO) + action = FILE_ACTION_RENAMED_NEW_NAME; else action = FILE_ACTION_MODIFIED;

1 0

Piotr Caban : kernel32: Added more ReadDirectoryChangesW tests.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 52e5087aece2505caf311f6e0af89ffef89e95bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e5087aece2505caf311f6e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 16 01:02:41 2010 +0100 kernel32: Added more ReadDirectoryChangesW tests. --- dlls/kernel32/tests/change.c | 174 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 49dbb88..0e8804f 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -784,6 +784,179 @@ static void test_readdirectorychanges_filedir(void) ok( r == TRUE, "failed to remove directory\n"); } +static void CALLBACK readdirectorychanges_cr(DWORD error, DWORD len, LPOVERLAPPED ov) +{ + ok(error == 0, "ReadDirectoryChangesW error %d\n", error); + ok(ov->hEvent == (void*)0xdeadbeef, "hEvent should not have changed\n"); +} + +static void test_readdirectorychanges_cr(void) +{ + static const WCHAR szBoo[] = { '\\','b','o','o','\\',0 }; + static const WCHAR szDir[] = { 'd','i','r',0 }; + static const WCHAR szFile[] = { 'f','i','l','e',0 }; + + WCHAR path[MAX_PATH], file[MAX_PATH], dir[MAX_PATH]; + FILE_NOTIFY_INFORMATION fni[1024], *fni_next; + OVERLAPPED ov; + HANDLE hdir, hfile; + NTSTATUS r; + + if (!pReadDirectoryChangesW) + { + win_skip("ReadDirectoryChangesW is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + r = GetTempPathW(MAX_PATH, path); + if (!r && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + win_skip("GetTempPathW is not implemented\n"); + return; + } + ok(r != 0, "temp path failed\n"); + if (!r) + return; + + lstrcatW(path, szBoo); + lstrcpyW(dir, path); + lstrcatW(dir, szDir); + lstrcpyW(file, path); + lstrcatW(file, szFile); + + DeleteFileW(file); + RemoveDirectoryW(dir); + RemoveDirectoryW(path); + + r = CreateDirectoryW(path, NULL); + ok(r == TRUE, "failed to create directory\n"); + + hdir = CreateFileW(path, GENERIC_READ, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); + ok(hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); + + memset(&ov, 0, sizeof(ov)); + ov.hEvent = (void*)0xdeadbeef; + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + hfile = CreateFileW(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); + CloseHandle(hfile); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive file creation event\n"); + ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); + ok(fni->Action == FILE_ACTION_ADDED, "Action = %d\n", fni->Action); + ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), + "FileNameLength = %d\n", fni->FileNameLength); + ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + /* This event will not be reported */ + r = CreateDirectoryW(dir, NULL); + ok(r == TRUE, "failed to create directory\n"); + + r = DeleteFileW(file); + ok(r == TRUE, "failed to delete file\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive file removal event\n"); + ok(fni->NextEntryOffset == 0, "there should be no more events in buffer\n"); + ok(fni->Action == FILE_ACTION_REMOVED, "Action = %d\n", fni->Action); + ok(fni->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), + "FileNameLength = %d\n", fni->FileNameLength); + ok(!memcmp(fni->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + + CloseHandle(hdir); + + hdir = CreateFileW(path, GENERIC_READ, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); + ok(hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); + + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + r = MoveFileW(dir, file); + ok(r == TRUE, "failed to move directory\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive directory move event\n"); + ok(fni->Action == FILE_ACTION_RENAMED_OLD_NAME, "Action = %d\n", fni->Action); + ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), + "FileNameLength = %d\n", fni->FileNameLength); + ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + if (fni->NextEntryOffset) + fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); + else + { + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive directory move event\n"); + fni_next = fni; + } + ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); + ok(fni_next->Action == FILE_ACTION_RENAMED_NEW_NAME, "Action = %d\n", fni_next->Action); + ok(fni_next->FileNameLength == lstrlenW(szFile)*sizeof(WCHAR), + "FileNameLength = %d\n", fni_next->FileNameLength); + ok(!memcmp(fni_next->FileName, szFile, lstrlenW(szFile)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); + + r = CreateDirectoryW(dir, NULL); + ok(r == TRUE, "failed to create directory\n"); + + r = RemoveDirectoryW(dir); + ok(r == TRUE, "failed to remove directory\n"); + + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive directory creation event\n"); + ok(fni->Action == FILE_ACTION_ADDED, "Action = %d\n", fni->Action); + ok(fni->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), + "FileNameLength = %d\n", fni->FileNameLength); + ok(!memcmp(fni->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni->FileName)); + if (fni->NextEntryOffset) + fni_next = (FILE_NOTIFY_INFORMATION*)((char*)fni+fni->NextEntryOffset); + else + { + r = pReadDirectoryChangesW(hdir, fni, sizeof(fni), FALSE, + FILE_NOTIFY_CHANGE_DIR_NAME, NULL, &ov, readdirectorychanges_cr); + ok(r == TRUE, "pReadDirectoryChangesW failed\n"); + + r = SleepEx(1000, TRUE); + ok(r != 0, "failed to receive directory removal event\n"); + fni_next = fni; + } + ok(fni_next->NextEntryOffset == 0, "there should be no more events in buffer\n"); + ok(fni_next->Action == FILE_ACTION_REMOVED, "Action = %d\n", fni_next->Action); + ok(fni_next->FileNameLength == lstrlenW(szDir)*sizeof(WCHAR), + "FileNameLength = %d\n", fni_next->FileNameLength); + ok(!memcmp(fni_next->FileName, szDir, lstrlenW(szDir)*sizeof(WCHAR)), + "FileName = %s\n", wine_dbgstr_w(fni_next->FileName)); + + CloseHandle(hdir); + RemoveDirectoryW(file); + RemoveDirectoryW(path); +} + static void test_ffcn_directory_overlap(void) { HANDLE parent_watch, child_watch, parent_thread, child_thread; @@ -884,5 +1057,6 @@ START_TEST(change) test_readdirectorychanges(); test_readdirectorychanges_null(); test_readdirectorychanges_filedir(); + test_readdirectorychanges_cr(); test_ffcn_directory_overlap(); }

1 0

Michael Stefaniuc : winapi: Remove support for wineaudioio.drv. wineaudioio .drv is no more.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: d1f907b9a89abfc40f8ff831a33a407cad1f75b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f907b9a89abfc40f8ff831a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 17 11:11:50 2010 +0100 winapi: Remove support for wineaudioio.drv. wineaudioio.drv is no more. --- tools/winapi/win32.api | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 1fd1697..172bb17 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5665,21 +5665,6 @@ WORD DWORD_PTR -%%wineaudioio.drv - -%long - -DWORD -HDRVR -LPARAM -LRESULT -UINT -WORD - -%long --pointer - -DWORD_PTR - %%winecoreaudio.drv %long

1 0

Alexandre Julliard : widl: Register the PSFactoryBuffer class as factory if it' s defined in the idl file.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: 875c1b8739982187dfa923fcd3336d47aefa80c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875c1b8739982187dfa923fcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 14:58:47 2010 +0100 widl: Register the PSFactoryBuffer class as factory if it's defined in the idl file. --- tools/widl/register.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index f709214..9913f8c 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -61,9 +61,26 @@ static const char *get_coclass_threading( const type_t *class ) return models[get_attrv( class->attrs, ATTR_THREADING )]; } -static int write_interface( const type_t *iface ) +static const type_t *find_ps_factory( const statement_list_t *stmts ) +{ + const statement_t *stmt; + + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE) + { + const type_t *type = stmt->u.type; + if (type_get_type(type) == TYPE_COCLASS && !strcmp( type->name, "PSFactoryBuffer" )) + return type; + } + } + return NULL; +} + +static int write_interface( const type_t *iface, const type_t *ps_factory ) { const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); + const UUID *ps_uuid = ps_factory ? get_attrp( ps_factory->attrs, ATTR_UUID ) : NULL; if (!uuid) return 0; if (!is_object( iface )) return 0; @@ -77,13 +94,14 @@ static int write_interface( const type_t *iface ) put_str( indent, "{\n" ); indent++; put_str( indent, "NumMethods = s %u\n", count_methods( iface )); - put_str( indent, "ProxyStubClsid32 = s '%%CLSID_PSFactoryBuffer%%'\n" ); + put_str( indent, "ProxyStubClsid32 = s '%s'\n", + ps_uuid ? format_uuid( ps_uuid ) : "%CLSID_PSFactoryBuffer%" ); indent--; put_str( indent, "}\n" ); return 1; } -static int write_interfaces( const statement_list_t *stmts ) +static int write_interfaces( const statement_list_t *stmts, const type_t *ps_factory ) { const statement_t *stmt; int count = 0; @@ -91,7 +109,7 @@ static int write_interfaces( const statement_list_t *stmts ) if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) - count += write_interface( stmt->u.type ); + count += write_interface( stmt->u.type, ps_factory ); } return count; } @@ -204,6 +222,7 @@ static inline void put_string( const char *str ) void write_regscript( const statement_list_t *stmts ) { int count; + const type_t *ps_factory; if (!do_regscript) return; if (do_everything && !need_proxy_file( stmts )) return; @@ -215,12 +234,13 @@ void write_regscript( const statement_list_t *stmts ) put_str( indent, "NoRemove Interface\n" ); put_str( indent++, "{\n" ); - count = write_interfaces( stmts ); + ps_factory = find_ps_factory( stmts ); + count = write_interfaces( stmts, ps_factory ); put_str( --indent, "}\n" ); put_str( indent, "NoRemove CLSID\n" ); put_str( indent++, "{\n" ); - if (count) + if (count && !ps_factory) { put_str( indent, "ForceRemove '%%CLSID_PSFactoryBuffer%%' = s 'PSFactoryBuffer'\n" ); put_str( indent++, "{\n" );

1 0

Alexandre Julliard : quartz: Convert coclasses registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 17, 2010

Dec. 17, 2010

Module: wine Branch: master Commit: ae2a992d703d93826de105f2484f388d0a37f49b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2a992d703d93826de105f24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 17 13:18:21 2010 +0100 quartz: Convert coclasses registration to the IRegistrar mechanism. --- dlls/quartz/Makefile.in | 3 +- dlls/quartz/quartz_strmif.idl | 128 ++++++++++++++++++++++++++++++++++++++++- dlls/quartz/regsvr.c | 111 ----------------------------------- 3 files changed, 128 insertions(+), 114 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 0798cdb..9a4e511 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,7 +1,7 @@ MODULE = quartz.dll IMPORTLIB = quartz IMPORTS = strmiids strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 -EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL +EXTRADEFS = -DENTRY_PREFIX=QUARTZ_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL C_SRCS = \ acmwrapper.c \ @@ -30,6 +30,7 @@ C_SRCS = \ RC_SRCS = version.rc IDL_P_SRCS = quartz_strmif.idl +IDL_R_SRCS = quartz_strmif.idl EXTRA_OBJS = dlldata.o diff --git a/dlls/quartz/quartz_strmif.idl b/dlls/quartz/quartz_strmif.idl index aad6232..ede51f6 100644 --- a/dlls/quartz/quartz_strmif.idl +++ b/dlls/quartz/quartz_strmif.idl @@ -16,7 +16,131 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* just a wrapper for strmif.idl */ - cpp_quote("#include <wingdi.h>") #include "strmif.idl" + +[ + helpstring("Filter Graph"), + threading(both), + uuid(e436ebb3-524f-11ce-9f53-0020af0ba770) +] +coclass FilterGraph { interface IFilterGraph2; } + +[ + helpstring("Filter Graph no thread"), + threading(both), + uuid(e436ebb8-524f-11ce-9f53-0020af0ba770) +] +coclass FilterGraphNoThread { interface IFilterGraph2; } + +[ + helpstring("Filter Mapper"), + threading(both), + uuid(e436ebb2-524f-11ce-9f53-0020af0ba770) +] +coclass FilterMapper { interface IFilterMapper; } + +[ + helpstring("Filter Mapper2"), + threading(both), + uuid(cda42200-bd88-11d0-bd4e-00a0c911ce86) +] +coclass FilterMapper2 { interface IFilterMapper3; } + +[ + helpstring("System Clock"), + threading(both), + uuid(e436ebb1-524f-11ce-9f53-0020af0ba770) +] +coclass SystemClock { interface IReferenceClock; } + +[ + helpstring("Memory Allocator"), + threading(both), + uuid(1e651cc0-b199-11d0-8212-00c04fc32c45) +] +coclass MemoryAllocator { interface IMemAllocator; } + +[ + helpstring("Seeking"), + threading(both), + uuid(060af76c-68dd-11d0-8fc1-00c04fd9189d) +] +coclass SeekingPassThru { interface ISeekingPassThru; } + +[ + helpstring("File Source Filter"), + threading(both), + uuid(e436ebb5-524f-11ce-9f53-0020af0ba770) +] +coclass AsyncReader { interface IBaseFilter; } + +[ + helpstring("AVI Splitter"), + threading(both), + uuid(1b544c20-fd0b-11ce-8c63-00aa0044b51e) +] +coclass AviSplitter { interface IBaseFilter; } + +[ + helpstring("MPEG-I Stream Splitter"), + threading(both), + uuid(336475d0-942a-11ce-a870-00aa002feab5) +] +coclass MPEG1Splitter { interface IBaseFilter; } + +[ + helpstring("AVI Decompressor"), + threading(both), + uuid(cf49d4e0-1115-11ce-b03a-0020af0ba770) +] +coclass AVIDec { interface IBaseFilter; } + +[ + helpstring("DirectSound Audio Renderer"), + threading(both), + uuid(79376820-07d0-11cf-a24d-0020afd79767) +] +coclass DSoundRender { interface IBaseFilter; } + +[ + helpstring("Wave Audio Renderer"), + threading(both), + uuid(e30629d1-27e5-11ce-875d-00608cb78066) +] +coclass AudioRender { interface IBaseFilter; } + +[ + helpstring("Null Renderer"), + threading(both), + uuid(c1f400a4-3f08-11d3-9f0b-006008039e37) +] +coclass NullRenderer { interface IBaseFilter; } + +[ + helpstring("Video Renderer"), + threading(both), + uuid(70e102b0-5556-11ce-97c0-00aa0055595a) +] +coclass VideoRenderer { interface IBaseFilter; } + +[ + helpstring("Default Video Renderer"), + threading(both), + uuid(6bc1cffa-8fc1-4261-ac22-cfb4cc38db50) +] +coclass VideoRendererDefault { interface IBaseFilter; } + +[ + helpstring("ACM wrapper"), + threading(both), + uuid(6a08cf80-0e18-11cf-a24d-0020afd79767) +] +coclass ACMWrapper { interface IBaseFilter; } + +[ + helpstring("Wave Parser"), + threading(both), + uuid(d51bd5a1-7548-11cf-a520-0080c77ef58a) +] +coclass WAVEParser { interface IBaseFilter; } diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index cdb33d1..d41e2f5 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -778,121 +778,10 @@ error_close_progid_key: return res; } -static GUID const CLSID_PSFactoryBuffer = { - 0x92a3a302, 0xda7c, 0x4a1f, {0xba,0x7e,0x18,0x02,0xbb,0x5d,0x2d,0x02} }; - /*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = { - { &CLSID_FilterGraph, - "Filter Graph", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_FilterGraphNoThread, - "Filter Graph", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_FilterMapper, - "Filter Mapper", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_FilterMapper2, - "Filter Mapper2", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_SystemClock, - "System Clock", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_MemoryAllocator, - "Memory Allocator", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_SeekingPassThru, - "Seeking", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AsyncReader, - "File Source Filter", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AviSplitter, - "AVI Splitter", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_MPEG1Splitter, - "MPEG-I Stream Splitter", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AVIDec, - "AVI Decompressor", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_DSoundRender, - "DirectSound Audio Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_AudioRender, - "Wave Audio Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_NullRenderer, - "Null Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_VideoRenderer, - "Video Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_VideoRendererDefault, - "Default Video Renderer", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_ACMWrapper, - "ACM wrapper", - NULL, - "quartz.dll", - "Both" - }, - { &CLSID_WAVEParser, - "Wave Parser", - NULL, - "quartz.dll", - "Both" - }, { NULL } /* list terminator */ };

1 0