wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Eryk Wieliczko : msvcrt: Implement _fseeki64.
by Alexandre Julliard 02 Nov '10

02 Nov '10

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: Add stub functions _lock_file and _unlock_file.
by Alexandre Julliard 02 Nov '10

02 Nov '10

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 02 Nov '10

02 Nov '10

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 02 Nov '10

02 Nov '10

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 : setupapi: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 45e6101c0c0bb2f0969b8bc891eb917bbc4e1165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e6101c0c0bb2f0969b8bc89… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 1 21:31:03 2010 +0100 setupapi: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/setupapi/Makefile.in | 1 + dlls/setupapi/Sr.rc | 99 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 7454e11..6d74cb5 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -43,6 +43,7 @@ RC_SRCS = \ Ru.rc \ Si.rc \ Sk.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/dlls/setupapi/Sr.rc b/dlls/setupapi/Sr.rc new file mode 100644 index 0000000..7c157c3 --- /dev/null +++ b/dlls/setupapi/Sr.rc @@ -0,0 +1,99 @@ +/* + * Serbian resources for SETUPAPI + * + * Copyright 2001 Andreas Mohr + * Copyright 2009 Ricardo Filipe + * 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 "setupapi_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_PROMPTDISK "„%s“ датотека на %s је неопходна" + IDS_UNKNOWN "Непознато" + IDS_COPYFROM "Умножи датотеке из:" + IDS_INFO "Унесите путању где су датотеке смештене, па кликните на дугме „У реду“." +} + +COPYFILEDLGORD DIALOG 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Умножавање датотека..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Откажи", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Извор:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Одредиште:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDPROMPTFORDISK DIALOG 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Потребне датотеке" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Убаците инсталациони диск произвођача и проверите\nда ли је испод изабрана исправна јединица", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Умножи датотеке произвођача из:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "У реду", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Откажи", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Потражи...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_PROMPTDISK "„%s“ datoteka na %s je neophodna" + IDS_UNKNOWN "Nepoznato" + IDS_COPYFROM "Umnoži datoteke iz:" + IDS_INFO "Unesite putanju gde su datoteke smeštene, pa kliknite na dugme „U redu“." +} + +COPYFILEDLGORD DIALOG 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Umnožavanje datoteka..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Otkaži", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Izvor:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Odredište:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDPROMPTFORDISK DIALOG 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Potrebne datoteke" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ubacite instalacioni disk proizvođača i proverite\nda li je ispod izabrana ispravna jedinica", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Umnoži datoteke proizvođača iz:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "U redu", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Otkaži", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Potraži...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

Paul Vriens : localui: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 02 Nov '10

02 Nov '10

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

Paul Vriens : iccvid: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 249c6a22e9a0514cc9212c127c14eca83f9bda96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=249c6a22e9a0514cc9212c127… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 1 21:11:47 2010 +0100 iccvid: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/iccvid/Makefile.in | 1 + dlls/iccvid/iccvid_Sr.rc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 02ed092..403f5a3 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ iccvid_Ro.rc \ iccvid_Ru.rc \ iccvid_Si.rc \ + iccvid_Sr.rc \ iccvid_Sv.rc \ iccvid_Tr.rc \ iccvid_Uk.rc diff --git a/dlls/iccvid/iccvid_Sr.rc b/dlls/iccvid/iccvid_Sr.rc new file mode 100644 index 0000000..577af59 --- /dev/null +++ b/dlls/iccvid/iccvid_Sr.rc @@ -0,0 +1,38 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * 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 "iccvid_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_NAME "Cinepak видео кодек" + IDS_DESCRIPTION "Cinepak видео кодек" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_NAME "Cinepak video kodek" + IDS_DESCRIPTION "Cinepak video kodek" +}

1 0

Paul Vriens : xcopy: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 046f96e05649319d10c3c40e307abb6e6ada49ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=046f96e05649319d10c3c40e3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 1 20:53:39 2010 +0100 xcopy: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/xcopy/Makefile.in | 1 + programs/xcopy/Sr.rc | 141 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Makefile.in b/programs/xcopy/Makefile.in index 764ded5..4183824 100644 --- a/programs/xcopy/Makefile.in +++ b/programs/xcopy/Makefile.in @@ -24,6 +24,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc diff --git a/programs/xcopy/Sr.rc b/programs/xcopy/Sr.rc new file mode 100644 index 0000000..92f7ef3 --- /dev/null +++ b/programs/xcopy/Sr.rc @@ -0,0 +1,141 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Serbian language support + * + * Copyright (C) 2007 J. Edmeades + * 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 "xcopy.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + STRING_INVPARMS, "Неисправан број параметара. Користите xcopy /? за помоћ\n" + STRING_INVPARM, "Неисправан параметар „%s“. Користите xcopy /? за помоћ\n" + STRING_PAUSE, "Притисните <enter> да започнете умножавање\n" + STRING_SIMCOPY, "%d датотека/е ће бити уможено\n" + STRING_COPY, "%d датотека/е је умножено\n" + STRING_QISDIR, "Да ли је „%s“ назив датотеке или фасцикла\n\ + на одредишту?\n\ + (Д - датотека, Ф - фасцикла)\n" + STRING_SRCPROMPT,"%s? (Да|Не)\n" + STRING_OVERWRITE,"Заменити %s? (Да|Не|Све)\n" + STRING_COPYFAIL, "Умножавање „%s“ у „%s“ није успело са r/c %d\n" + STRING_OPENFAIL, "Отварање „%s“ датотеке није успело\n" + STRING_READFAIL, "Читање „%s“ датотеке није успело\n" + STRING_YES_CHAR, "Д" + STRING_NO_CHAR, "Н" + STRING_ALL_CHAR, "С" + STRING_FILE_CHAR,"Д" + STRING_DIR_CHAR, "Ф" + + STRING_HELP, +"XCOPY — умножава изворне датотеке или гране фасцикли у одредиште\n\ +\n\ +Синтакса:\n\ +XCOPY извор [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Где:\n\ +\n\ +[/I] Претпостави фасциклу када одредиште не постоји и када се умножавају две или\n\ +\tвише датотека\n\ +[/S] Умножи фасцикле и потфасцикле\n\ +[/E] Умножи фасцикле и потфасцикле заједно с празним\n\ +[/Q] Не приказуј називе током умножавања.\n\ +[/F] Прикажи цео извор и одредиште током умножавања\n\ +[/L] Опонашај радњу приказујући називе који ће бити умножени\n\ +[/W] Питај пре почињања умножавања\n\ +[/T] Прави празну структуру фасцикле, али не умножава датотеке\n\ +[/Y] Потисни упит при замењивању датотека\n\ +[/-Y] Омогући упит при замењивању датотека\n\ +[/P] Питај за сваку изворну датотеку пре умножавања\n\ +[/N] Умножи користећи кратке називе\n\ +[/U] Умножи само оне датотеке које постоје у одредишту\n\ +[/R] Замени све датотеке које се само читају\n\ +[/H] Укључи сакривене и системске датотеке у умножавање\n\ +[/C] Настави иако дође до грешке у умножавању\n\ +[/A] Умножи само архивиране датотеке\n\ +[/M] Умножи само архивиране датотеке и уклони\n\ +\tособине архиве\n\ +[/D | /D:m-d-y] Умножи нове или измењене датотеке након одређеног датума.\n\ +\t\tАко датум није унесен, умножи само ако је одредиште старије\n\ +\t\tод извора\n\n" + +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + STRING_INVPARMS, "Neispravan broj parametara. Koristite xcopy /? za pomoć\n" + STRING_INVPARM, "Neispravan parametar „%s“. Koristite xcopy /? za pomoć\n" + STRING_PAUSE, "Pritisnite <enter> da započnete umnožavanje\n" + STRING_SIMCOPY, "%d datoteka/e će biti umoženo\n" + STRING_COPY, "%d datoteka/e je umnoženo\n" + STRING_QISDIR, "Da li je „%s“ naziv datoteke ili fascikla\n\ + na odredištu?\n\ + (D - datoteka, F - fascikla)\n" + STRING_SRCPROMPT,"%s? (Da|Ne)\n" + STRING_OVERWRITE,"Zameniti %s? (Da|Ne|Sve)\n" + STRING_COPYFAIL, "Umnožavanje „%s“ u „%s“ nije uspelo sa r/c %d\n" + STRING_OPENFAIL, "Otvaranje „%s“ datoteke nije uspelo\n" + STRING_READFAIL, "Čitanje „%s“ datoteke nije uspelo\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "S" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "F" + + STRING_HELP, +"XCOPY — umnožava izvorne datoteke ili grane fascikli u odredište\n\ +\n\ +Sintaksa:\n\ +XCOPY izvor [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Gde:\n\ +\n\ +[/I] Pretpostavi fasciklu kada odredište ne postoji i kada se umnožavaju dve ili\n\ +\tviše datoteka\n\ +[/S] Umnoži fascikle i potfascikle\n\ +[/E] Umnoži fascikle i potfascikle zajedno s praznim\n\ +[/Q] Ne prikazuj nazive tokom umnožavanja.\n\ +[/F] Prikaži ceo izvor i odredište tokom umnožavanja\n\ +[/L] Oponašaj radnju prikazujući nazive koji će biti umnoženi\n\ +[/W] Pitaj pre počinjanja umnožavanja\n\ +[/T] Pravi praznu strukturu fascikle, ali ne umnožava datoteke\n\ +[/Y] Potisni upit pri zamenjivanju datoteka\n\ +[/-Y] Omogući upit pri zamenjivanju datoteka\n\ +[/P] Pitaj za svaku izvornu datoteku pre umnožavanja\n\ +[/N] Umnoži koristeći kratke nazive\n\ +[/U] Umnoži samo one datoteke koje postoje u odredištu\n\ +[/R] Zameni sve datoteke koje se samo čitaju\n\ +[/H] Uključi sakrivene i sistemske datoteke u umnožavanje\n\ +[/C] Nastavi iako dođe do greške u umnožavanju\n\ +[/A] Umnoži samo arhivirane datoteke\n\ +[/M] Umnoži samo arhivirane datoteke i ukloni\n\ +\tosobine arhive\n\ +[/D | /D:m-d-y] Umnoži nove ili izmenjene datoteke nakon određenog datuma.\n\ +\t\tAko datum nije unesen, umnoži samo ako je odredište starije\n\ +\t\tod izvora\n\n" + +}

1 0

Andrew Eikum : hlink: Site data should only be set if the hlink has an HlinkSite.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: a8e39c66f798e9c056b5ff26e3bdcc9eba2b9230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e39c66f798e9c056b5ff26e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 1 12:06:08 2010 -0500 hlink: Site data should only be set if the hlink has an HlinkSite. --- dlls/hlink/link.c | 5 +++-- dlls/hlink/tests/hlink.c | 2 +- dlls/mshtml/tests/htmldoc.c | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 3e22c47..b0d99aa 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -211,10 +211,11 @@ static HRESULT WINAPI IHlink_fnGetHlinkSite( IHlink* iface, TRACE("(%p)->(%p %p)\n", This, ppihlSite, pdwSiteData); *ppihlSite = This->Site; - *pdwSiteData = This->SiteData; - if (This->Site) + if (This->Site) { IHlinkSite_AddRef(This->Site); + *pdwSiteData = This->SiteData; + } return S_OK; } diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 21422bc..3cb6db4 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1788,7 +1788,7 @@ static void test_HlinkClone(void) 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); + ok(fnd_data == 4, "Expected site data to be 4, was: %d\n", fnd_data); IHlink_Release(cloned); IHlink_Release(hl); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 641153b..80f137b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -708,7 +708,6 @@ static HRESULT WINAPI HlinkFrame_Navigate(IHlinkFrame *iface, DWORD grfHLNF, LPB hres = IHlink_GetHlinkSite(pihlNavigate, &site, &site_data); ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); ok(site == NULL, "site = %p\n, expected NULL\n", site); - todo_wine ok(site_data == 0xdeadbeef, "site_data = %x\n", site_data); }

1 0

Andrew Eikum : hlink: Implement HlinkClone.
by Alexandre Julliard 02 Nov '10

02 Nov '10

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

← Newer
1
...
76
77
78
79
80
81
82
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010