August 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : Make.rules: Added rules for client/proxy/ server generation from IDL files.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 4e67a4558ce74f8e71da7128efa73767a8daad64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e67a4558ce74f8e71da712… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 9 12:38:15 2006 +0200 Make.rules: Added rules for client/proxy/server generation from IDL files. --- .gitignore | 1 + Make.rules.in | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cbdb7b7..2bbaa52 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.so *.tab.[ch] *.tlb +*_[cips].c *~ /Make.rules /TAGS diff --git a/Make.rules.in b/Make.rules.in index dd38cfa..18cfd5c 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -108,7 +108,7 @@ prog_manext = 1 api_manext = 3w conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.tab.c *.tab.h @LEX_OUTPUT_ROOT(a).c core + *.flc *.res *.mc.rc *.tab.[ch] @LEX_OUTPUT_ROOT(a).c core OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) @@ -117,7 +117,7 @@ LINTS = $(C_SRCS:.c=.ln) # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .ok .sfd .ttf .man.in .man +.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -140,6 +140,18 @@ # Implicit rules .idl.h: $(WIDL) $(IDLFLAGS) -h -H $@ $< +.idl_c.c: + $(WIDL) $(IDLFLAGS) -c -C $@ $< + +.idl_i.c: + $(WIDL) $(IDLFLAGS) -u -U $@ $< + +.idl_p.c: + $(WIDL) $(IDLFLAGS) -p -P $@ $< + +.idl_s.c: + $(WIDL) $(IDLFLAGS) -s -S $@ $< + .idl.tlb: $(WIDL) $(IDLFLAGS) -t -T $@ $< @@ -221,7 +233,7 @@ # Rules for cleaning testclean:: $(SUBDIRS:%=%/__testclean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(IDL_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) + $(RM) $(CLEAN_FILES) $(IDL_SRCS:.idl=.h) $(IDL_SRCS:.idl=_c.c) $(IDL_SRCS:.idl=_i.c) $(IDL_SRCS:.idl=_p.c) $(IDL_SRCS:.idl=_s.c) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) .PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__) @@ -273,6 +285,11 @@ # Misc. rules $(IDL_SRCS:.idl=.h): $(WIDL) +$(IDL_SRCS:.idl=_c.c): $(WIDL) +$(IDL_SRCS:.idl=_i.c): $(WIDL) +$(IDL_SRCS:.idl=_p.c): $(WIDL) +$(IDL_SRCS:.idl=_s.c): $(WIDL) + $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) $(SUBDIRS): dummy

1 0

Juan Lang : crypt32: Trace key type in CryptFindOIDInfo.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 5349745a9078f88adebd021f9836d3809eb65778 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5349745a9078f88adebd021… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Aug 8 23:18:56 2006 -0700 crypt32: Trace key type in CryptFindOIDInfo. --- dlls/crypt32/oid.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index bbe4225..e5e6147 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1032,6 +1032,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo { struct OIDInfo *info; + TRACE("CRYPT_OID_INFO_ALGID_KEY: %ld\n", *(DWORD *)pvKey); EnterCriticalSection(&oidInfoCS); LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry) { @@ -1049,6 +1050,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo { struct OIDInfo *info; + TRACE("CRYPT_OID_INFO_NAME_KEY: %s\n", debugstr_w((LPWSTR)pvKey)); EnterCriticalSection(&oidInfoCS); LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry) { @@ -1067,6 +1069,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo struct OIDInfo *info; LPSTR oid = (LPSTR)pvKey; + TRACE("CRYPT_OID_INFO_OID_KEY: %s\n", debugstr_a(oid)); EnterCriticalSection(&oidInfoCS); LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry) { @@ -1084,6 +1087,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo { struct OIDInfo *info; + TRACE("CRYPT_OID_INFO_SIGN_KEY: %ld\n", *(DWORD *)pvKey); EnterCriticalSection(&oidInfoCS); LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry) {

1 0

Hwang YunSong(황윤성) : user32: Updated Korean resource.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 78610e20ccc4def060814d98b3f476386a1f9ca4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78610e20ccc4def060814d9… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Aug 9 08:48:38 2006 +0900 user32: Updated Korean resource. --- dlls/user/resources/user32_Ko.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/user/resources/user32_Ko.rc b/dlls/user/resources/user32_Ko.rc index 069053b..f338c59 100644 --- a/dlls/user/resources/user32_Ko.rc +++ b/dlls/user/resources/user32_Ko.rc @@ -31,6 +31,8 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARD MENUITEM "�۾� ��ȯ(&W) ...\tCtrl-Esc", 61744 MENUITEM SEPARATOR MENUITEM "Wine�� Ͽ� ...", 61761 + MENUITEM SEPARATOR + MENUITEM "�� α׿� '�� ǥ��' �ֱ�(&P)", 61762 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE @@ -71,3 +73,9 @@ BEGIN DEFPUSHBUTTON "Ȯ��", IDOK, 75, 100, 35, 14 PUSHBUTTON "��", IDCANCEL, 120, 100, 35, 14 END + +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "��" + IDS_MDI_MOREWINDOWS "�� â��(&M)..." + }

1 0

Michael Stefaniuc : msvcrt: Remove redundant NULL checks before MSVCRT_free .
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 243a3e410719bc5f56891b52b1f0d68226f7b7f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=243a3e410719bc5f56891b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 9 01:17:41 2006 +0200 msvcrt: Remove redundant NULL checks before MSVCRT_free. --- dlls/msvcrt/console.c | 3 +-- dlls/msvcrt/cpp.c | 3 +-- dlls/msvcrt/exit.c | 3 +-- dlls/msvcrt/file.c | 7 ++----- dlls/msvcrt/process.c | 7 +++---- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 612c65d..013ed54 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -231,8 +231,7 @@ int CDECL _kbhit(void) break; } } - if (ir) - MSVCRT_free(ir); + MSVCRT_free(ir); } UNLOCK_CONSOLE; return retval; diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 461380e..5ea595d 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -544,8 +544,7 @@ DEFINE_THISCALL_WRAPPER(MSVCRT_type_info void __stdcall MSVCRT_type_info_dtor(type_info * _this) { TRACE("(%p)\n", _this); - if (_this->name) - MSVCRT_free(_this->name); + MSVCRT_free(_this->name); } /****************************************************************** diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 0c670aa..34e97e4 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -219,8 +219,7 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MS } memcpy (newtable, MSVCRT_atexit_table, MSVCRT_atexit_table_size); MSVCRT_atexit_table_size += 32; - if (MSVCRT_atexit_table) - MSVCRT_free (MSVCRT_atexit_table); + MSVCRT_free (MSVCRT_atexit_table); MSVCRT_atexit_table = newtable; } MSVCRT_atexit_table[MSVCRT_atexit_registered] = func; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3b3a6de..9fe09dd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2040,11 +2040,8 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* fil int r, flag; flag = file->_flag; - if (file->_tmpfname) - { - MSVCRT_free(file->_tmpfname); - file->_tmpfname = NULL; - } + MSVCRT_free(file->_tmpfname); + file->_tmpfname = NULL; /* flush stdio buffers */ if(file->_flag & MSVCRT__IOWRT) MSVCRT_fflush(file); diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 7aa01ff..85a1e6c 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -371,7 +371,7 @@ MSVCRT_intptr_t CDECL _spawnle(int flags ret = msvcrt_spawn(flags, name, args, envs); MSVCRT_free(args); - if (envs) MSVCRT_free(envs); + MSVCRT_free(envs); return ret; } @@ -427,7 +427,7 @@ MSVCRT_intptr_t CDECL _spawnlpe(int flag ret = msvcrt_spawn(flags, fullname[0] ? fullname : name, args, envs); MSVCRT_free(args); - if (envs) MSVCRT_free(envs); + MSVCRT_free(envs); return ret; } @@ -482,8 +482,7 @@ MSVCRT_intptr_t CDECL _spawnve(int flags ret = msvcrt_spawn(flags, fullname, args, envs); MSVCRT_free(args); } - if (envs) - MSVCRT_free(envs); + MSVCRT_free(envs); return ret; }

1 0

Matt Finnicum : wordpad: Request WS_VSCROLL now that riched20 supports it.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 43a23b00a785cbb580a8e119adfc6e09b6fea203 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43a23b00a785cbb580a8e11… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Aug 8 16:08:43 2006 -0400 wordpad: Request WS_VSCROLL now that riched20 supports it. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0abe457..7ca54e6 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -133,7 +133,7 @@ static LRESULT OnCreate( HWND hWnd, WPAR assert(hDLL); hEditorWnd = CreateWindowExW(WS_EX_CLIENTEDGE, wszRichEditClass, NULL, - WS_CHILD|WS_VISIBLE|ES_MULTILINE|ES_AUTOVSCROLL|ES_WANTRETURN, + WS_CHILD|WS_VISIBLE|ES_MULTILINE|ES_AUTOVSCROLL|ES_WANTRETURN|WS_VSCROLL, 0, 0, 1000, 100, hWnd, (HMENU)IDC_EDITOR, hInstance, NULL); if (!hEditorWnd) {

1 0

Michael Stefaniuc : comdlg32: Remove redundant NULL checks before MemFree.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 125e310ed34cb7535f5134de475bab34da962747 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=125e310ed34cb7535f5134d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 9 01:17:00 2006 +0200 comdlg32: Remove redundant NULL checks before MemFree. --- dlls/comdlg32/filedlg.c | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6a780f1..8cd9c60 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -430,19 +430,12 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILE MemFree(lpstrSavDir); } - if(title) - MemFree(title); - if(defext) - MemFree(defext); - if(filter) - MemFree(filter); - if(customfilter) - MemFree(customfilter); - if(fodInfos.initdir) - MemFree(fodInfos.initdir); - - if(fodInfos.filename) - MemFree(fodInfos.filename); + MemFree(title); + MemFree(defext); + MemFree(filter); + MemFree(customfilter); + MemFree(fodInfos.initdir); + MemFree(fodInfos.filename); TRACE("selected file: %s\n",ofn->lpstrFile); @@ -1304,8 +1297,7 @@ static LRESULT FILEDLG95_InitControls(HW result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit); if (result) { *nameBit = 0x00; - if (fodInfos->initdir) - MemFree(fodInfos->initdir); + MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((strlenW(tmpBuf2) + 1)*sizeof(WCHAR)); strcpyW(fodInfos->initdir, tmpBuf2); handledPath = TRUE; @@ -1342,8 +1334,7 @@ static LRESULT FILEDLG95_InitControls(HW *nameBit = 0x00; len = strlenW(tmpBuf); - if(fodInfos->initdir) - MemFree(fodInfos->initdir); + MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc((len+1)*sizeof(WCHAR)); strcpyW(fodInfos->initdir, tmpBuf); @@ -1384,8 +1375,7 @@ static LRESULT FILEDLG95_InitControls(HW } else { searchMore = FALSE; - if(fodInfos->initdir) - MemFree(fodInfos->initdir); + MemFree(fodInfos->initdir); fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir); @@ -2000,8 +1990,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) DWORD len; /* replace the current filter */ - if(fodInfos->ShellInfos.lpstrCurrentFilter) - MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); + MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); len = strlenW(lpszTemp)+1; fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR)); strcpyW( fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp); @@ -2472,8 +2461,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand (fodInfos->customfilter == NULL ? 1 : 0); /* Set the current filter with the current selection */ - if(fodInfos->ShellInfos.lpstrCurrentFilter) - MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); + MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, iItem); @@ -2538,8 +2526,7 @@ static void FILEDLG95_FILETYPE_Clean(HWN } } /* Current filter */ - if(fodInfos->ShellInfos.lpstrCurrentFilter) - MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); + MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); }

1 0

Andrew Talbot : user/tests: Write-strings warnings fix.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 9a67d452fa69094e95b5a90fb0497a9c45169f87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a67d452fa69094e95b5a90… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Aug 8 23:21:56 2006 +0100 user/tests: Write-strings warnings fix. --- dlls/user/tests/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c index 93f125d..4dd0ec9 100644 --- a/dlls/user/tests/sysparams.c +++ b/dlls/user/tests/sysparams.c @@ -374,7 +374,7 @@ typedef struct } LOGFONT16, *LPLOGFONT16; /* get logfont from the registry */ -static int lffromreg( char *keyname, char *valname, LOGFONTA *plf) +static int lffromreg( const char *keyname, const char *valname, LOGFONTA *plf) { HKEY hkey; LOGFONTW lfw;

1 0

James Hawkins : msi: Add tests for the RemoveFiles action.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: bf4e00fd9bb0188df43d09720cf6ca4c5efb184a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf4e00fd9bb0188df43d097… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 8 14:38:57 2006 -0700 msi: Add tests for the RemoveFiles action. --- dlls/msi/tests/package.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 07b9296..3ff7b0f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -98,6 +98,18 @@ static UINT create_file_table( MSIHANDLE "PRIMARY KEY `File`)" ); } +static UINT create_remove_file_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `RemoveFile` (" + "`FileKey` CHAR(72) NOT NULL, " + "`Component_` CHAR(72) NOT NULL, " + "`FileName` CHAR(255) LOCALIZABLE, " + "`DirProperty` CHAR(72) NOT NULL, " + "`InstallMode` SHORT NOT NULL " + "PRIMARY KEY `FileKey`)" ); +} + static UINT add_component_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Component` " @@ -251,6 +263,18 @@ MSIHANDLE package_from_db(MSIHANDLE hdb) return hPackage; } +static void create_test_file(const CHAR *name) +{ + HANDLE file; + DWORD written; + + 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); + WriteFile(file, "\n", strlen("\n"), &written, NULL); + CloseHandle(file); +} + static void test_createpackage(void) { MSIHANDLE hPackage = 0; @@ -1781,6 +1805,153 @@ static void test_getproperty(void) DeleteFile(msifile); } +static void test_removefiles(void) +{ + MSIHANDLE hpkg; + UINT r; + MSIHANDLE hdb; + char CURR_DIR[MAX_PATH]; + + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + + hdb = create_package_db(); + ok ( hdb, "failed to create package database\n" ); + + r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'"); + ok( r == ERROR_SUCCESS, "cannot add directory: %d\n", r ); + + r = create_feature_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create Feature table: %d\n", r ); + + r = create_component_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create Component table: %d\n", r ); + + r = add_feature_entry( hdb, "'one', '', '', '', 2, 1, '', 0" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + + r = add_component_entry( hdb, "'hydrogen', '', 'TARGETDIR', 0, '', 'hydrogen_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + r = add_component_entry( hdb, "'helium', '', 'TARGETDIR', 0, '', 'helium_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + r = add_component_entry( hdb, "'lithium', '', 'TARGETDIR', 0, '', 'lithium_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + r = add_component_entry( hdb, "'beryllium', '', 'TARGETDIR', 0, '', 'beryllium_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + r = add_component_entry( hdb, "'boron', '', 'TARGETDIR', 0, '', 'boron_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + r = add_component_entry( hdb, "'carbon', '', 'TARGETDIR', 0, '', 'carbon_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + r = create_feature_components_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create FeatureComponents table: %d\n", r ); + + r = add_feature_components_entry( hdb, "'one', 'hydrogen'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'one', 'helium'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'one', 'lithium'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'one', 'beryllium'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'one', 'boron'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'one', 'carbon'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = create_file_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create File table: %d\n", r ); + + r = add_file_entry( hdb, "'hydrogen_file', 'hydrogen', 'hydrogen.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = add_file_entry( hdb, "'helium_file', 'helium', 'helium.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = add_file_entry( hdb, "'lithium_file', 'lithium', 'lithium.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = add_file_entry( hdb, "'beryllium_file', 'beryllium', 'beryllium.txt', 0, '', '1033', 16384, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = add_file_entry( hdb, "'boron_file', 'boron', 'boron.txt', 0, '', '1033', 16384, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = add_file_entry( hdb, "'carbon_file', 'carbon', 'carbon.txt', 0, '', '1033', 16384, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = create_remove_file_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create Remove File table: %d\n", r); + + hpkg = package_from_db( hdb ); + ok( hpkg, "failed to create package\n"); + + create_test_file( "hydrogen.txt" ); + create_test_file( "helium.txt" ); + create_test_file( "lithium.txt" ); + create_test_file( "beryllium.txt" ); + create_test_file( "boron.txt" ); + create_test_file( "carbon.txt" ); + + r = MsiSetProperty( hpkg, "TARGETDIR", CURR_DIR ); + ok( r == ERROR_SUCCESS, "set property failed\n"); + + r = MsiDoAction( hpkg, "CostInitialize"); + ok( r == ERROR_SUCCESS, "cost init failed\n"); + + r = MsiDoAction( hpkg, "FileCost"); + ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + + r = MsiDoAction( hpkg, "CostFinalize"); + ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + + r = MsiDoAction( hpkg, "InstallValidate"); + ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + + r = MsiSetComponentState( hpkg, "hydrogen", INSTALLSTATE_ABSENT ); + ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r); + + r = MsiSetComponentState( hpkg, "helium", INSTALLSTATE_LOCAL ); + ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r); + + r = MsiSetComponentState( hpkg, "lithium", INSTALLSTATE_SOURCE ); + ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r); + + r = MsiSetComponentState( hpkg, "beryllium", INSTALLSTATE_ABSENT ); + ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r); + + r = MsiSetComponentState( hpkg, "boron", INSTALLSTATE_LOCAL ); + ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r); + + r = MsiSetComponentState( hpkg, "carbon", INSTALLSTATE_SOURCE ); + ok( r == ERROR_SUCCESS, "failed to set component state: %d\n", r); + + r = MsiDoAction( hpkg, "RemoveFiles"); + ok( r == ERROR_SUCCESS, "remove files failed\n"); + + todo_wine + { + ok(DeleteFileA("hydrogen.txt"), "Expected hydrogen.txt to exist\n"); + ok(DeleteFileA("lithium.txt"), "Expected lithium.txt to exist\n"); + ok(DeleteFileA("beryllium.txt"), "Expected beryllium.txt to exist\n"); + ok(DeleteFileA("carbon.txt"), "Expected carbon.txt to exist\n"); + } + ok(DeleteFileA("helium.txt"), "Expected helium.txt to exist\n"); + ok(DeleteFileA("boron.txt"), "Expected boron.txt to exist\n"); + + MsiCloseHandle( hpkg ); + DeleteFileA(msifile); +} + START_TEST(package) { test_createpackage(); @@ -1795,4 +1966,5 @@ START_TEST(package) test_formatrecord2(); test_states(); test_getproperty(); + test_removefiles(); }

1 0

Matt Finnicum : riched20: Implement EM_SHOWSCROLLBAR, EM_SETSCROLLPOS, ES_DISABLENOSCROLL, and WS_VSCROLL.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 658c0cdd1a5fa19300a09ae4ef6d59c06dcecd0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=658c0cdd1a5fa19300a09ae… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Aug 8 16:08:43 2006 -0400 riched20: Implement EM_SHOWSCROLLBAR, EM_SETSCROLLPOS, ES_DISABLENOSCROLL, and WS_VSCROLL. --- dlls/riched20/editor.c | 44 +++++++++++++++++++++++++++++++++++++------- dlls/riched20/paint.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7c45edb..77bb7a0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -87,7 +87,7 @@ + EM_REDO 2.0 + EM_REQUESTRESIZE + EM_REPLACESEL (proper style?) ANSI&Unicode - - EM_SCROLL + + EM_SCROLL + EM_SCROLLCARET - EM_SELECTIONTYPE - EM_SETBIDIOPTIONS 3.0 @@ -111,7 +111,7 @@ + EM_SETRECT + EM_SETRECTNP (EM_SETRECT without repainting) + EM_SETSEL - - EM_SETSCROLLPOS 3.0 + + EM_SETSCROLLPOS 3.0 - EM_SETTABSTOPS 3.0 - EM_SETTARGETDEVICE + EM_SETTEXTEX 3.0 (unicode only, no rich text insertion handling, proper style?) @@ -122,7 +122,7 @@ - EM_SETWORDBREAKPROCEX - EM_SETWORDWRAPMODE 1.0asian + EM_SETZOOM 3.0 - - EM_SHOWSCROLLBAR 2.0 + + EM_SHOWSCROLLBAR 2.0 - EM_STOPGROUPTYPING 2.0 + EM_STREAMIN + EM_STREAMOUT @@ -168,7 +168,7 @@ - ES_AUTOHSCROLL - ES_AUTOVSCROLL - ES_CENTER - - ES_DISABLENOSCROLL (scrollbar is always visible) + + ES_DISABLENOSCROLL (scrollbar is always visible) - ES_EX_NOCALLOLEINIT - ES_LEFT - ES_MULTILINE (currently single line controls aren't supported) @@ -182,7 +182,7 @@ - ES_WANTRETURN (don't know how to do WM_GETDLGCODE part) - WS_SETFONT - WS_HSCROLL - - WS_VSCROLL + + WS_VSCROLL */ /* @@ -1146,6 +1146,12 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) ed->pFontCache[i].nAge = 0; ed->pFontCache[i].hFont = NULL; } + + if (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) + FIXME("WS_HSCROLL requested, but horizontal scrolling isn't implemented yet.\n"); + ed->bScrollX = 0; + ed->bScrollY = GetWindowLongW(hWnd, GWL_STYLE) & WS_VSCROLL; + ME_CheckCharOffsets(ed); if (GetWindowLongW(hWnd, GWL_STYLE) & ES_PASSWORD) @@ -1438,12 +1444,10 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_SETFONTSIZE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) UNSUPPORTED_MSG(EM_SETPALETTE) - UNSUPPORTED_MSG(EM_SETSCROLLPOS) UNSUPPORTED_MSG(EM_SETTABSTOPS) UNSUPPORTED_MSG(EM_SETTARGETDEVICE) UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_SHOWSCROLLBAR) UNSUPPORTED_MSG(WM_STYLECHANGING) UNSUPPORTED_MSG(WM_STYLECHANGED) /* UNSUPPORTED_MSG(WM_UNICHAR) FIXME missing in Wine headers */ @@ -1574,6 +1578,14 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_SendSelChange(editor); return 0; } + case EM_SETSCROLLPOS: + { + POINT *point = (POINT *)lParam; + /* Native behavior when point->y is too large is very odd / dosn't follow MSDN. + This seems to be a pretty close approximation of what it does. */ + ME_Scroll(editor, 0, -(min(point->y, (editor->nTotalLength - 1)) - editor->nScrollPosY)); + return 0; + } case EM_AUTOURLDETECT: { if (wParam==1 || wParam ==0) @@ -1597,6 +1609,15 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_SendSelChange(editor); return 0; } + case EM_SHOWSCROLLBAR: + { + if (wParam == SB_VERT) + editor->bScrollY = lParam; + else if (wParam == SB_HORZ) + editor->bScrollX = lParam; + ME_UpdateScrollBar(editor); + return 0; + } case EM_SETTEXTEX: { LPWSTR wszText = (LPWSTR)lParam; @@ -2241,6 +2262,15 @@ LRESULT WINAPI RichEditANSIWndProc(HWND return MAKELONG( pt.x, pt.y ); } case WM_CREATE: + if (GetWindowLongW(hWnd, GWL_STYLE) & WS_HSCROLL) + { /* Squelch the default horizontal scrollbar it would make */ + si.cbSize = sizeof(SCROLLINFO); + si.fMask = SIF_POS | SIF_RANGE; + si.nMax = 0; + si.nMin = 0; + si.nPos = 0; + SetScrollInfo(hWnd, SB_HORZ, &si, FALSE); + } ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_MoveCaret(editor); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 41f2652..2384dd8 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -396,42 +396,50 @@ void ME_UpdateScrollBar(ME_TextEditor *e { HWND hWnd = editor->hWnd; SCROLLINFO si; - int nOldLen = editor->nTotalLength; - BOOL bScrollY = (editor->nTotalLength > editor->sizeWindow.cy); BOOL bUpdateScrollBars; si.cbSize = sizeof(si); - si.fMask = SIF_POS | SIF_RANGE; + si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE; GetScrollInfo(hWnd, SB_VERT, &si); - bUpdateScrollBars = (bScrollY || editor->bScrollY)&& ((si.nMax != nOldLen) || (si.nPage != editor->sizeWindow.cy)); - - if (bScrollY != editor->bScrollY) - { + bUpdateScrollBars = (editor->bScrollY)&& ((si.nMax != editor->nTotalLength) || (si.nPage != editor->sizeWindow.cy)); + + if (editor->bScrollY != (si.nMax > 0)) + { /* The scroll bar needs to be shown or hidden */ si.fMask = SIF_RANGE | SIF_PAGE; + if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL) + si.fMask |= SIF_DISABLENOSCROLL; + si.nMin = 0; si.nPage = editor->sizeWindow.cy; - if (bScrollY) { + + if (editor->bScrollY) si.nMax = editor->nTotalLength; - } else { + else si.nMax = 0; - } + SetScrollInfo(hWnd, SB_VERT, &si, FALSE); ME_MarkAllForWrapping(editor); - editor->bScrollY = bScrollY; ME_WrapMarkedParagraphs(editor); + bUpdateScrollBars = TRUE; } - if (bUpdateScrollBars) { + if (bUpdateScrollBars) + { int nScroll = 0; si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; - if (editor->nTotalLength > editor->sizeWindow.cy) { + if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL) + si.fMask |= SIF_DISABLENOSCROLL; + if (editor->bScrollY) + { si.nMax = editor->nTotalLength; si.nPage = editor->sizeWindow.cy; - if (si.nPos > si.nMax-si.nPage) { + if (si.nPos > si.nMax-si.nPage) + { nScroll = (si.nMax-si.nPage)-si.nPos; si.nPos = si.nMax-si.nPage; } } - else { + else + { si.nMax = 0; si.nPage = 0; si.nPos = 0;

1 0

Kai Blin : secur32: Move NTLM tests to ntlm.c to avoid cluttering main. c with NTLM-specific tests.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: c62193266d30dff4ae5e14fb6ad9996f615d2cba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c62193266d30dff4ae5e14f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Aug 8 16:23:19 2006 +0200 secur32: Move NTLM tests to ntlm.c to avoid cluttering main.c with NTLM-specific tests. --- dlls/secur32/tests/Makefile.in | 1 dlls/secur32/tests/main.c | 438 --------------------------- dlls/secur32/tests/ntlm.c | 659 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 660 insertions(+), 438 deletions(-) create mode 100644 dlls/secur32/tests/ntlm.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c62193266d30dff4ae5…

1 0