November 2010 - Wine-Commits

Eryk Wieliczko : msvcrt: Implement _fseeki64.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: e81a929e6be9dfa4413be81d925a60ffcf2160a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81a929e6be9dfa4413be81d9… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Mon Nov 1 21:49:22 2010 +0100 msvcrt: Implement _fseeki64. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 14 +++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6ea6f04..1e40d01 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -648,7 +648,7 @@ @ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l @ varargs _fscanf_s_l(ptr str ptr) msvcrt._fscanf_s_l @ stub _fseek_nolock -@ stub _fseeki64 +@ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen @ stub _fstat32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2c4bf9d..86235aa 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -489,7 +489,7 @@ @ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l @ varargs _fscanf_s_l(ptr str ptr) msvcrt._fscanf_s_l @ stub _fseek_nolock -@ stub _fseeki64 +@ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen @ stub _fstat32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b6e1e33..39bd039 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -481,7 +481,7 @@ @ varargs _fscanf_l(ptr str ptr) msvcrt._fscanf_l @ varargs _fscanf_s_l(ptr str ptr) msvcrt._fscanf_s_l @ stub _fseek_nolock -@ stub _fseeki64 +@ cdecl _fseeki64(ptr int64 long) msvcrt._fseeki64 @ stub _fseeki64_nolock @ cdecl _fsopen(str str long) msvcrt._fsopen @ stub _fstat32 diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c3dbafa..8902bdd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -942,9 +942,9 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) } /********************************************************************* - * fseek (MSVCRT.@) + * _fseeki64 (MSVCRT.@) */ -int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) +int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) { /* Flush output if needed */ if(file->_flag & MSVCRT__IOWRT) @@ -973,7 +973,15 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) } /* Clear end of file flag */ file->_flag &= ~MSVCRT__IOEOF; - return (MSVCRT__lseek(file->_file,offset,whence) == -1)?-1:0; + return (MSVCRT__lseeki64(file->_file,offset,whence) == -1)?-1:0; +} + +/********************************************************************* + * fseek (MSVCRT.@) + */ +int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) +{ + return MSVCRT__fseeki64( file, offset, whence ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b610c69..ffe5506 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -435,7 +435,7 @@ # stub _fscanf_l @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l -# stub _fseeki64 +@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat(long ptr) MSVCRT__fstat @ cdecl _fstat64(long ptr) MSVCRT__fstat64

1 0

Eryk Wieliczko : msvcrt: Implement _findfirst64i32 and _findnext64i32.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 566d8e5eaafbb97ad93ac1e7ddf0b369719f3c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566d8e5eaafbb97ad93ac1e7d… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Mon Nov 1 20:52:22 2010 +0100 msvcrt: Implement _findfirst64i32 and _findnext64i32. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/dir.c | 59 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 + 5 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1e40d01..2f23ff0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -620,11 +620,11 @@ @ stub _findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 -@ stub _findfirst64i32 +@ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 @ stub _findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 -@ stub _findnext64i32 +@ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 86235aa..5f0198c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -461,11 +461,11 @@ @ stub _findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 -@ stub _findfirst64i32 +@ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 @ stub _findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 -@ stub _findnext64i32 +@ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 39bd039..7a53b7b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -453,11 +453,11 @@ @ stub _findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 -@ stub _findfirst64i32 +@ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 @ stub _findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 -@ stub _findnext64i32 +@ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite( double ) msvcrt._finite @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5b5f641..b45a459 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -116,6 +116,25 @@ static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata strcpy(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAA to finddata64i32_t */ +static void msvcrt_fttofd64i32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64i32_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = fd->nFileSizeLow; + strcpy(ft->name, fd->cFileName); +} /* INTERNAL: Translate WIN32_FIND_DATAW to wfinddatai64_t */ static void msvcrt_wfttofdi64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddatai64_t* ft) @@ -330,6 +349,27 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirst64(const char * fspec, struct MSVCRT__fin } /********************************************************************* + * _findfirst64i32 (MSVCRT.@) + * + * 64-bit/32-bit version of _findfirst. + */ +MSVCRT_intptr_t CDECL MSVCRT__findfirst64i32(const char * fspec, struct MSVCRT__finddata64i32_t* ft) +{ + WIN32_FIND_DATAA find_data; + HANDLE hfind; + + hfind = FindFirstFileA(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_fttofd64i32(&find_data,ft); + TRACE(":got handle %p\n",hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _wfindfirsti64 (MSVCRT.@) * * Unicode version of _findfirsti64. @@ -438,6 +478,25 @@ int CDECL MSVCRT__findnext64(long hand, struct MSVCRT__finddata64_t * ft) } /********************************************************************* + * _findnext64i32 (MSVCRT.@) + * + * 64-bit/32-bit version of _findnext. + */ +int CDECL MSVCRT__findnext64i32(long hand, struct MSVCRT__finddata64i32_t * ft) +{ + WIN32_FIND_DATAA find_data; + + if (!FindNextFileA((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_fttofd64i32(&find_data,ft); + return 0; +} + +/********************************************************************* * _wfindnexti64 (MSVCRT.@) * * Unicode version of _findnexti64. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ffe5506..eb0d8ec 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -412,9 +412,11 @@ @ cdecl _findclose(long) MSVCRT__findclose @ cdecl _findfirst(str ptr) MSVCRT__findfirst @ cdecl _findfirst64(str ptr) MSVCRT__findfirst64 +@ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64 @ cdecl _findnext(long ptr) MSVCRT__findnext @ cdecl _findnext64(long ptr) MSVCRT__findnext64 +@ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite( double ) @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf

1 0

Eryk Wieliczko : msvcrt: Add stub functions _lock_file and _unlock_file.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 38d1ea2a5b712d39029e1057f319d96d410b9f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d1ea2a5b712d39029e1057f… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Mon Nov 1 22:19:14 2010 +0100 msvcrt: Add stub functions _lock_file and _unlock_file. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/file.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 ++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ec0a1ba..6ea6f04 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -851,7 +851,7 @@ @ cdecl _localtime64(ptr) msvcrt._localtime64 @ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock -@ stub _lock_file +@ cdecl _lock_file(ptr) msvcrt._lock_file @ cdecl _locking(long long long) msvcrt._locking @ cdecl _logb( double ) msvcrt._logb @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex @@ -1213,7 +1213,7 @@ @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _unlock(long) msvcrt._unlock -@ stub _unlock_file +@ cdecl _unlock_file(ptr) msvcrt._unlock_file @ cdecl _utime32(str ptr) msvcrt._utime32 @ cdecl _utime64(str ptr) msvcrt._utime64 @ stub _vcprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a5bb126..2c4bf9d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -697,7 +697,7 @@ @ cdecl _localtime64(ptr) msvcrt._localtime64 @ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock -@ stub _lock_file +@ cdecl _lock_file(ptr) msvcrt._lock_file @ cdecl _locking(long long long) msvcrt._locking @ cdecl _logb( double ) msvcrt._logb @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex @@ -1066,7 +1066,7 @@ @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _unlock(long) msvcrt._unlock -@ stub _unlock_file +@ cdecl _unlock_file(ptr) msvcrt._unlock_file @ cdecl _utime32(str ptr) msvcrt._utime32 @ cdecl _utime64(str ptr) msvcrt._utime64 @ stub _vcprintf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 14eec1b..b6e1e33 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -685,7 +685,7 @@ @ cdecl _localtime64(ptr) msvcrt._localtime64 @ cdecl _localtime64_s(ptr ptr) msvcrt._localtime64_s @ cdecl _lock(long) msvcrt._lock -@ stub _lock_file +@ cdecl _lock_file(ptr) msvcrt._lock_file @ cdecl _locking(long long long) msvcrt._locking @ cdecl _logb( double ) msvcrt._logb @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex @@ -1053,7 +1053,7 @@ @ cdecl _unlink(str) msvcrt._unlink @ cdecl _unloaddll(long) msvcrt._unloaddll @ cdecl _unlock(long) msvcrt._unlock -@ stub _unlock_file +@ cdecl _unlock_file(ptr) msvcrt._unlock_file @ cdecl _utime32(str ptr) msvcrt._utime32 @ cdecl _utime64(str ptr) msvcrt._utime64 @ stub _vcprintf diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3eb93ac..c3dbafa 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -872,6 +872,22 @@ LONG CDECL MSVCRT__lseek(int fd, LONG offset, int whence) } /********************************************************************* + * _lock_file (MSVCRT.@) + */ +void CDECL MSVCRT__lock_file(MSVCRT_FILE *file) +{ + FIXME("(%p) stub\n",file); +} + +/********************************************************************* + * _unlock_file (MSVCRT.@) + */ +void CDECL MSVCRT__unlock_file(MSVCRT_FILE *file) +{ + FIXME("(%p) stub\n",file); +} + +/********************************************************************* * _locking (MSVCRT.@) * * This is untested; the underlying LockFile doesn't work yet. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1e8f06d..b610c69 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -624,6 +624,7 @@ @ cdecl _localtime64(ptr) MSVCRT__localtime64 @ cdecl _localtime64_s(ptr ptr) @ cdecl _lock(long) +@ cdecl _lock_file(ptr) MSVCRT__lock_file @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb( double ) @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @@ -984,6 +985,7 @@ @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock(long) +@ cdecl _unlock_file(ptr) MSVCRT__unlock_file @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) # stub _vcprintf

1 0

André Hentschel : ntdll: Add Support for loading ARM PEs.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 186ada5472a05705fce6d81b6d9e63a593ecb376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186ada5472a05705fce6d81b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 1 21:57:57 2010 +0100 ntdll: Add Support for loading ARM PEs. --- dlls/ntdll/virtual.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a1faabf..b97bdd2 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1097,6 +1097,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz #ifdef __x86_64__ if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) +#elif defined(__ARMEL__) + if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_ARM && + nt->FileHeader.Machine != IMAGE_FILE_MACHINE_THUMB) #else if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) #endif @@ -1116,6 +1119,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz case IMAGE_FILE_MACHINE_ALPHA64: MESSAGE("Alpha-64"); break; case IMAGE_FILE_MACHINE_AMD64: MESSAGE("AMD-64"); break; case IMAGE_FILE_MACHINE_ARM: MESSAGE("ARM"); break; + case IMAGE_FILE_MACHINE_THUMB: MESSAGE("ARM Thumb"); break; case IMAGE_FILE_MACHINE_SPARC: MESSAGE("SPARC"); break; default: MESSAGE("Unknown-%04x", nt->FileHeader.Machine); break; }

1 0

André Hentschel : services: Mention the unkown type in the error message.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 7abdbe62d193cebca672dc6ad00a8ba81e933d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7abdbe62d193cebca672dc6ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 1 21:57:23 2010 +0100 services: Mention the unkown type in the error message. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1ecf30b..eab532f 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -329,7 +329,7 @@ BOOL validate_service_config(struct service_entry *entry) } break; default: - WINE_ERR("Service %s has an unknown service type\n", wine_dbgstr_w(entry->name)); + WINE_ERR("Service %s has an unknown service type (0x%x)\n", wine_dbgstr_w(entry->name), entry->config.dwServiceType); return FALSE; }

1 0

Paul Vriens : localui: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: d699d1698e1db114d7085a9927a186866535a59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d699d1698e1db114d7085a992… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 1 21:22:54 2010 +0100 localui: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/localui/Makefile.in | 1 + dlls/localui/ui_Sr.rc | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index ef7c315..5ad5fb3 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ ui_Ro.rc \ ui_Ru.rc \ ui_Si.rc \ + ui_Sr.rc \ ui_Sv.rc \ ui_Uk.rc \ ui_Zh.rc diff --git a/dlls/localui/ui_Sr.rc b/dlls/localui/ui_Sr.rc new file mode 100644 index 0000000..f806f34 --- /dev/null +++ b/dlls/localui/ui_Sr.rc @@ -0,0 +1,94 @@ +/* + * Serbian resources for localui + * + * Copyright 2007 Detlef Riekenberg + * Copyright 2010 Đorđe Vasiljević + * + * 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 + */ + +#include "localui.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +ADDPORT_DIALOG DIALOG 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Додавање локалног порта" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Унесите назив порта:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "У реду", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Откажи", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Подешавање LPT порта" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Време истека (у секундама)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Поновни покушај преноса:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "У реду", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Откажи", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE +{ + IDS_LOCALPORT "Локални порт" + IDS_INVALIDNAME "„%s“ није исправан назив порта" + IDS_PORTEXISTS "Порт %s већ постоји" + IDS_NOTHINGTOCONFIG "Овај порт нема опција за подешавање" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +ADDPORT_DIALOG DIALOG 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodavanje lokalnog porta" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Unesite naziv porta:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "U redu", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Otkaži", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Podešavanje LPT porta" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Vreme isteka (u sekundama)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponovni pokušaj prenosa:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "U redu", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Otkaži", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE +{ + IDS_LOCALPORT "Lokalni port" + IDS_INVALIDNAME "„%s“ nije ispravan naziv porta" + IDS_PORTEXISTS "Port %s već postoji" + IDS_NOTHINGTOCONFIG "Ovaj port nema opcija za podešavanje" +}

1 0

Alexandre Julliard : winex11: Manage the system tray stand-alone window in x11drv for non-desktop mode.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 757845c7c6a652a3bd3c292456831c4ddb09f1ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=757845c7c6a652a3bd3c29245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 19:19:58 2010 +0100 winex11: Manage the system tray stand-alone window in x11drv for non-desktop mode. --- dlls/winex11.drv/systray.c | 264 ++++++++++++++++++++++++++++++---------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 4 + 3 files changed, 202 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=757845c7c6a652a3bd3c2…

1 0

Andrew Eikum : hlink: Implement HlinkClone.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 5c5e53ae215abc9a2c0fd63a5ae58c8d4e41926a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5e53ae215abc9a2c0fd63a5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 1 12:06:05 2010 -0500 hlink: Implement HlinkClone. --- dlls/hlink/hlink.spec | 2 +- dlls/hlink/hlink_main.c | 65 +++++++++++++++++++++++ dlls/hlink/tests/hlink.c | 131 ++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 193 insertions(+), 5 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 0cc761f..ca8144e 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -2,7 +2,7 @@ 4 stdcall HlinkCreateFromString(wstr wstr wstr ptr long ptr ptr ptr) 5 stdcall HlinkCreateFromData(ptr ptr long ptr ptr ptr) 6 stdcall HlinkCreateBrowseContext(ptr ptr ptr) -7 stub HlinkClone +7 stdcall HlinkClone(ptr ptr ptr long ptr) 8 stdcall HlinkNavigateToStringReference(wstr wstr ptr long ptr long ptr ptr ptr) 9 stdcall HlinkOnNavigate(ptr ptr long ptr wstr wstr ptr) 10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index e96f206..cda9683 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -428,6 +428,71 @@ HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserve return IMoniker_BindToStorage(pimkReference, pibc, NULL, &IID_IUnknown, &obj); } +/*********************************************************************** + * HlinkClone (HLINK.@) + */ +HRESULT WINAPI HlinkClone(IHlink *hlink, REFIID riid, IHlinkSite *hls, + DWORD site_data, void **obj) +{ + IMoniker *mk, *clone_mk = NULL; + WCHAR *loc, *name = NULL; + HRESULT hres; + + if(!hlink || !riid || !obj) + return E_INVALIDARG; + + *obj = NULL; + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &mk, &loc); + if(FAILED(hres)) + return hres; + + if(mk) { + IStream *strm; + LARGE_INTEGER lgint; + + hres = CreateStreamOnHGlobal(NULL, TRUE, &strm); + if(FAILED(hres)) { + IMoniker_Release(mk); + goto cleanup; + } + + hres = OleSaveToStream((IPersistStream*)mk, strm); + if(FAILED(hres)) { + IStream_Release(strm); + IMoniker_Release(mk); + goto cleanup; + } + IMoniker_Release(mk); + + lgint.QuadPart = 0; + hres = IStream_Seek(strm, lgint, STREAM_SEEK_SET, NULL); + if(FAILED(hres)) { + IStream_Release(strm); + goto cleanup; + } + + hres = OleLoadFromStream(strm, &IID_IMoniker, (void**)&clone_mk); + IStream_Release(strm); + if(FAILED(hres)) + goto cleanup; + } + + hres = IHlink_GetFriendlyName(hlink, HLFNAMEF_DEFAULT, &name); + if(FAILED(hres)) + goto cleanup; + + hres = HlinkCreateFromMoniker(clone_mk, loc, name, hls, site_data, NULL, + &IID_IHlink, obj); + +cleanup: + if(clone_mk) + IMoniker_Release(clone_mk); + CoTaskMemFree(loc); + CoTaskMemFree(name); + return hres; +} + static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 61b9498..21422bc 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -62,6 +62,9 @@ DEFINE_EXPECT(OnNavigationComplete); DEFINE_EXPECT(Enum); DEFINE_EXPECT(Reduce); +DEFINE_EXPECT(GetClassID); +DEFINE_EXPECT(Save); + static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -818,8 +821,9 @@ static ULONG WINAPI Moniker_Release(IMoniker *iface) static HRESULT WINAPI Moniker_GetClassID(IMoniker *iface, CLSID *pClassID) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetClassID); + *pClassID = IID_IUnknown; /* not a valid CLSID */ + return S_OK; } static HRESULT WINAPI Moniker_IsDirty(IMoniker *iface) @@ -836,8 +840,8 @@ static HRESULT WINAPI Moniker_Load(IMoniker *iface, IStream *pStm) static HRESULT WINAPI Moniker_Save(IMoniker *iface, IStream *pStm, BOOL fClearDirty) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(Save); + return S_OK; } static HRESULT WINAPI Moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSize) @@ -1697,6 +1701,124 @@ static void test_HlinkSite(void) IHlink_Release(hl); } +static void test_HlinkClone(void) +{ + HRESULT hres; + IHlink *hl, *cloned = NULL; + IMoniker *dummy, *fnd_mk; + IHlinkSite *fnd_site; + WCHAR *fnd_name; + DWORD fnd_data; + const WCHAR one[] = {'1',0}; + const WCHAR two[] = {'2',0}; + const WCHAR name[] = {'a',0}; + + hres = HlinkClone(NULL, NULL, NULL, 0, NULL); + ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + + hres = HlinkCreateFromString(NULL, NULL, NULL, NULL, 0, NULL, + &IID_IHlink, (void**)&hl); + ok(hres == S_OK, "HlinkCreateFromString failed: %08x\n", hres); + + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, NULL); + ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + + if(0){ /* crash on Windows XP */ + hres = HlinkClone(hl, NULL, NULL, 0, NULL); + ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + + hres = HlinkClone(hl, NULL, NULL, 0, (void**)&cloned); + ok(hres == E_INVALIDARG, "Got wrong failure code: %08x\n", hres); + } + + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); + ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); + ok(cloned != NULL, "Didn't get a clone\n"); + getMonikerRef(cloned, NULL, NULL); + IHlink_Release(cloned); + + IHlink_Release(hl); + + SET_EXPECT(Reduce); + SET_EXPECT(Enum); + hres = HlinkCreateFromMoniker(&hls_ref_Moniker, two, NULL, NULL, 0, NULL, &IID_IHlink, (void**)&hl); + todo_wine CHECK_CALLED(Reduce); + todo_wine CHECK_CALLED(Enum); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + getMonikerRef(hl, &hls_ref_Moniker, two); + + SET_EXPECT(Save); + SET_EXPECT(GetClassID); + cloned = (IHlink*)0xdeadbeef; + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); + /* fails because of invalid CLSID given by Moniker_GetClassID */ + ok(hres == REGDB_E_CLASSNOTREG, "Wrong error code: %08x\n", hres); + ok(cloned == NULL, "Shouldn't have gotten a clone\n"); + CHECK_CALLED(Save); + CHECK_CALLED(GetClassID); + + IHlink_Release(hl); + + hres = CreateItemMoniker(one, one, &dummy); + ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); + + hres = HlinkCreateFromMoniker(dummy, two, name, &HlinkSite, 17, NULL, &IID_IHlink, (void**)&hl); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + getMonikerRef(hl, dummy, two); + + cloned = NULL; + hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); + ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); + ok(cloned != NULL, "Should have gotten a clone\n"); + + fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, two); + ok(fnd_mk != NULL, "Expected non-null Moniker\n"); + ok(fnd_mk != dummy, "Expected a new Moniker to be created\n"); + + fnd_name = NULL; + hres = IHlink_GetFriendlyName(cloned, HLFNAMEF_DEFAULT, &fnd_name); + ok(hres == S_OK, "GetFriendlyName failed: %08x\n", hres); + ok(fnd_name != NULL, "Expected friendly name to be non-NULL\n"); + ok(lstrcmpW(fnd_name, name) == 0, "Expected friendly name to be %s, was %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(fnd_name)); + CoTaskMemFree(fnd_name); + + fnd_site = (IHlinkSite*)0xdeadbeef; + fnd_data = 4; + hres = IHlink_GetHlinkSite(cloned, &fnd_site, &fnd_data); + ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); + ok(fnd_site == NULL, "Expected NULL site\n"); + todo_wine ok(fnd_data == 4, "Expected site data to be 4, was: %d\n", fnd_data); + + IHlink_Release(cloned); + IHlink_Release(hl); + + hres = HlinkCreateFromMoniker(dummy, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void**)&hl); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); + getMonikerRef(hl, dummy, NULL); + + cloned = NULL; + hres = HlinkClone(hl, &IID_IHlink, &HlinkSite, 17, (void**)&cloned); + ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); + ok(cloned != NULL, "Should have gotten a clone\n"); + + fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, NULL); + ok(fnd_mk != NULL, "Expected non-null Moniker\n"); + ok(fnd_mk != dummy, "Expected a new Moniker to be created\n"); + + fnd_site = (IHlinkSite*)0xdeadbeef; + fnd_data = 4; + hres = IHlink_GetHlinkSite(cloned, &fnd_site, &fnd_data); + ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); + ok(fnd_site == &HlinkSite, "Expected found site to be HlinkSite, was: %p\n", fnd_site); + ok(fnd_data == 17, "Expected site data to be 17, was: %d\n", fnd_data); + + IHlink_Release(cloned); + IHlink_Release(hl); + + IMoniker_Release(dummy); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1713,6 +1835,7 @@ START_TEST(hlink) test_HlinkMoniker(); test_HashLink(); test_HlinkSite(); + test_HlinkClone(); CoUninitialize(); }

1 0

Alexandre Julliard : winex11: Re-dock icons when the system tray owner has changed.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 5a4580730dfcb336738a2a29bf858c508a112728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4580730dfcb336738a2a29b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 19:57:12 2010 +0100 winex11: Re-dock icons when the system tray owner has changed. --- dlls/winex11.drv/event.c | 12 ++++++++++++ dlls/winex11.drv/systray.c | 15 ++++++++++++++- dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 89d3a93..662b068 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -513,6 +513,17 @@ static void set_focus( Display *display, HWND hwnd, Time time ) /********************************************************************** + * handle_manager_message + */ +static void handle_manager_message( HWND hwnd, XClientMessageEvent *event ) +{ + if (hwnd != GetDesktopWindow()) return; + if (systray_atom && event->data.l[1] == systray_atom) + change_systray_owner( event->display, event->data.l[2] ); +} + + +/********************************************************************** * handle_wm_protocols */ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) @@ -1428,6 +1439,7 @@ struct client_message_handler static const struct client_message_handler client_messages[] = { + { XATOM_MANAGER, handle_manager_message }, { XATOM_WM_PROTOCOLS, handle_wm_protocols }, { XATOM__XEMBED, handle_xembed_protocol }, { XATOM_DndProtocol, handle_dnd_protocol }, diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 9d15396..fbbe8c2 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -73,7 +73,7 @@ static BOOL delete_icon( struct tray_icon *icon ); #define SYSTEM_TRAY_BEGIN_MESSAGE 1 #define SYSTEM_TRAY_CANCEL_MESSAGE 2 -static Atom systray_atom; +Atom systray_atom = 0; #define MIN_DISPLAYED 8 #define ICON_BORDER 2 @@ -427,6 +427,19 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window wine_tsx11_unlock(); } +/* dock systray windows again with the new owner */ +void change_systray_owner( Display *display, Window systray_window ) +{ + struct tray_icon *icon; + + ERR( "new owner %lx\n", systray_window ); + LIST_FOR_EACH_ENTRY( icon, &icon_list, struct tray_icon, entry ) + { + if (icon->display == -1) continue; + hide_icon( icon ); + dock_systray_icon( display, icon, systray_window ); + } +} /* hide a tray icon */ static BOOL hide_icon( struct tray_icon *icon ) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4308823..d6fdbf0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -619,6 +619,7 @@ enum x11drv_atoms XATOM_CLIPBOARD = FIRST_XATOM, XATOM_COMPOUND_TEXT, XATOM_INCR, + XATOM_MANAGER, XATOM_MULTIPLE, XATOM_SELECTION_DATA, XATOM_TARGETS, @@ -691,6 +692,7 @@ enum x11drv_atoms }; extern Atom X11DRV_Atoms[NB_XATOMS - FIRST_XATOM]; +extern Atom systray_atom; #define x11drv_atom(name) (X11DRV_Atoms[XATOM_##name - FIRST_XATOM]) @@ -780,6 +782,7 @@ extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data * extern void update_user_time( Time time ); extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); +extern void change_systray_owner( Display *display, Window systray_window ); static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index fe4a88c..0d1a7da 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -119,6 +119,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "CLIPBOARD", "COMPOUND_TEXT", "INCR", + "MANAGER", "MULTIPLE", "SELECTION_DATA", "TARGETS",

1 0

Alexandre Julliard : explorer: Make the systray window look more like a real taskbar in desktop mode.
by Alexandre Julliard Nov. 2, 2010

Nov. 2, 2010

Module: wine Branch: master Commit: 8c963852f8dc201ca9a5cef724f5319ffe1b25c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c963852f8dc201ca9a5cef72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 1 19:38:28 2010 +0100 explorer: Make the systray window look more like a real taskbar in desktop mode. --- dlls/user32/tests/win.c | 1 - programs/explorer/desktop.c | 2 +- programs/explorer/explorer_private.h | 2 +- programs/explorer/systray.c | 112 +++++++++------------------------- 4 files changed, 32 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c963852f8dc201ca9a5c…

1 0