October 2013 - Wine-Commits

Piotr Caban : msvcrt: Add support for vcall thunks demangling.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 501d60b020ee626f145dad601cd3fe8fa1f68eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=501d60b020ee626f145dad601… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 13:01:10 2013 +0200 msvcrt: Add support for vcall thunks demangling. --- dlls/msvcrt/tests/cpp.c | 3 ++ dlls/msvcrt/undname.c | 93 ++++++++++++++++++++++++++--------------------- 2 files changed, 54 insertions(+), 42 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 92301ff..f36641e 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1312,6 +1312,9 @@ static void test_demangle(void) /* 123 */ {"?vtordisp_thunk(a)std@@$4PPPPPPPM(a)3EAA_NXZ", "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{4294967292,4}' (void) __ptr64", "[thunk]:public: virtual bool __cdecl std::vtordisp_thunk`vtordisp{-4,4}' (void) __ptr64"}, +/* 124 */ {"??_9CView@@$BBII(a)AE", + "[thunk]: __thiscall CView::`vcall'{392,{flat}}' }'", + "[thunk]: __thiscall CView::`vcall'{392,{flat}}' "}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index dfcf2ab..bc2a6fb 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1067,6 +1067,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) { char accmem; const char* access = NULL; + int access_id = -1; const char* member_type = NULL; struct datatype_t ct_ret; const char* call_conv; @@ -1074,7 +1075,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) const char* exported; const char* args_str = NULL; const char* name = NULL; - BOOL ret = FALSE; + BOOL ret = FALSE, has_args = TRUE, has_ret = TRUE; unsigned mark; struct array array_pmt; @@ -1111,48 +1112,58 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * "$3" protected: thunk vtordisp * "$4" public: thunk vtordisp * "$5" public: thunk vtordisp + * "$B" vcall thunk */ accmem = *sym->current++; if (accmem == '$') { - accmem = *sym->current++; - if (accmem < '0' || accmem > '5') goto done; + if (*sym->current >= '0' && *sym->current <= '5') + access_id = (*sym->current - '0') / 2; + else if (*sym->current != 'B') + goto done; } - else if (accmem < 'A' || accmem > 'Z') goto done; + else if (accmem >= 'A' && accmem <= 'Z') + access_id = (accmem - 'A') / 8; + else + goto done; - if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) + switch (access_id) { - switch (accmem >= '0' && accmem <= '5' ? (accmem - '0') / 2 : (accmem - 'A') / 8) - { - case 0: access = "private: "; break; - case 1: access = "protected: "; break; - case 2: access = "public: "; break; - } + case 0: access = "private: "; break; + case 1: access = "protected: "; break; + case 2: access = "public: "; break; } - if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) + if (accmem == '$' || (accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) + access = str_printf(sym, "[thunk]:%s", access ? access : " "); + + if (accmem == '$' && *sym->current >= '0' && *sym->current <= '5') + member_type = "virtual "; + else if (accmem <= 'X') { - if (accmem >= '0' && accmem <= '5') + switch ((accmem - 'A') % 8) { - access = str_printf(sym, "[thunk]:%s", access); - member_type = "virtual "; - } - else if (accmem <= 'X') - { - switch ((accmem - 'A') % 8) - { - case 2: case 3: member_type = "static "; break; - case 4: case 5: member_type = "virtual "; break; - case 6: case 7: - access = str_printf(sym, "[thunk]:%s", access); - member_type = "virtual "; - break; - } + case 2: case 3: member_type = "static "; break; + case 4: case 5: case 6: case 7: member_type = "virtual "; break; } } + if (sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS) + access = NULL; + if (sym->flags & UNDNAME_NO_MEMBER_TYPE) + member_type = NULL; + name = get_class_string(sym, 0); - if (accmem >= '0' && accmem <='5') /* vtordisp thunk */ + if (accmem == '$' && *sym->current++ == 'B') /* vcall thunk */ + { + const char *n = get_number(sym); + + if(!n || *sym->current++ != 'A') goto done; + name = str_printf(sym, "%s{%s,{flat}}' }'", name, n); + has_args = FALSE; + has_ret = FALSE; + } + else if (accmem == '$') /* vtordisp thunk */ { const char *n1 = get_number(sym); const char *n2 = get_number(sym); @@ -1163,16 +1174,14 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) else if ((accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) /* a thunk */ name = str_printf(sym, "%s`adjustor{%s}' ", name, get_number(sym)); - if (accmem <= 'X') + if (has_args && (accmem == '$' || + (accmem <= 'X' && (accmem - 'A') % 8 != 2 && (accmem - 'A') % 8 != 3))) { - if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) - { - const char *ptr_modif; - /* Implicit 'this' pointer */ - /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; - if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); - } + const char *ptr_modif; + /* Implicit 'this' pointer */ + /* If there is an implicit this pointer, const modifier follows */ + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); } if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -1182,18 +1191,18 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) str_array_init(&array_pmt); /* Return type, or @ if 'void' */ - if (*sym->current == '@') + if (has_ret && *sym->current == '@') { ct_ret.left = "void"; ct_ret.right = NULL; sym->current++; } - else + else if (has_ret) { if (!demangle_datatype(sym, &ct_ret, &array_pmt, FALSE)) goto done; } - if (sym->flags & UNDNAME_NO_FUNCTION_RETURNS) + if (!has_ret || sym->flags & UNDNAME_NO_FUNCTION_RETURNS) ct_ret.left = ct_ret.right = NULL; if (cast_op) { @@ -1202,7 +1211,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) } mark = sym->stack.num; - if (!(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; + if (has_args && !(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; if (sym->flags & UNDNAME_NAME_ONLY) args_str = modifier = NULL; sym->stack.num = mark; @@ -1210,7 +1219,7 @@ static BOOL handle_method(struct parsed_symbol* sym, BOOL cast_op) * Yet!!! FIXME */ sym->result = str_printf(sym, "%s%s%s%s%s%s%s%s%s%s%s", - access, member_type, ct_ret.left, + access, member_type, ct_ret.left, (ct_ret.left && !ct_ret.right) ? " " : NULL, call_conv, call_conv ? " " : NULL, exported, name, args_str, modifier, ct_ret.right);

1 0

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 14869bf4ee7f7a3fd2cb5651f158421cd35c723c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14869bf4ee7f7a3fd2cb5651f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 5 16:57:25 2013 +0200 po: Update Polish translation. --- po/pl.po | 64 +++++++++++++++++-------------------------------------------- 1 files changed, 18 insertions(+), 46 deletions(-) diff --git a/po/pl.po b/po/pl.po index 97cad31..032dc5e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-03-31 08:50+0200\n" +"PO-Revision-Date: 2013-10-05 16:55+0200\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: Polish\n" @@ -8555,16 +8555,12 @@ msgstr "" "spróbuj ponownie." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Bieżące ustawienia mapowania MIDI odwołują się do urządzenia MIDI, które nie " -"jest zainstalowane w systemie. Użyj Mapowania MIDI do edycji ustawień." +"jest zainstalowane w systemie." #: winmm.rc:53 msgid "" @@ -9398,22 +9394,16 @@ msgstr "" "wywołaną procedurę są dziedziczone przez skrypt wywołujący CALL.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <katalog> jest krótką wersją CHDIR. Zmienia aktualny\n" +"CD <katalog> jest krótką wersją CHDIR. Zmienia bieżący\n" "domyślny katalog.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <katalog> zmienia aktualny domyślny katalog.\n" +msgstr "CHDIR <katalog> zmienia bieżący domyślny katalog.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9464,11 +9454,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <nazwapliku> usuwa plik lub zestaw plików.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9476,9 +9461,10 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"Komenda FOR służy do uruchomienia komendy dla każdego z plików ze zbioru.\n" +"Polecenie FOR służy do uruchomienia polecenia dla każdego ze zbioru plików.\n" "\n" -"Składnia: FOR %zmienna IN (zbiór) DO polecenie\n" +"Użycie: FOR %zmienna IN (zbiór) DO polecenie\n" +"Należy podwoić znak % jeśli FOR jest używane w pliku wsadowym.\n" #: cmd.rc:80 msgid "" @@ -9673,16 +9659,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <nazwapliku> zmienia nazwę pliku.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <katalog> jest krótką wersją RMDIR. usuwa podkatalog.\n" +msgstr "RD <katalog> jest krótką wersją RMDIR. Usuwa katalog.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <katalog> usuwa podkatalog.\n" +msgstr "RMDIR <katalog> usuwa katalog.\n" #: cmd.rc:203 msgid "" @@ -9856,15 +9838,11 @@ msgstr "" "ustawienia środowiska.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <nazwakatalogu> zapamiętuje aktualny katalog na stosie, a\n" +"PUSHD <nazwakatalogu> zapamiętuje bieżący katalog na stosie, a\n" "następnie przechodzi do katalogu podanego jako parametr.\n" #: cmd.rc:247 @@ -12327,7 +12305,7 @@ msgstr "Aktualizuje okno co cztery sekundy" #: taskmgr.rc:203 msgid "Does not automatically update" -msgstr "Okno nie jest automatycznie aktualizowane" +msgstr "Okno nie uaktualnia się samoczynnie" #: taskmgr.rc:205 msgid "Tiles the windows horizontally on the desktop" @@ -12822,7 +12800,7 @@ msgstr "&Dodaj..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Automatyczne wykrywanie" +msgstr "Wykryj &samoczynnie" #: winecfg.rc:232 msgid "&Path:" @@ -13034,7 +13012,7 @@ msgstr "Wybierz plik wykonywalny" #: winecfg.rc:66 msgid "Autodetect" -msgstr "Wykryj automatycznie" +msgstr "Wykryj samoczynnie" #: winecfg.rc:67 msgid "Local hard disk" @@ -13697,22 +13675,16 @@ msgid "Not yet implemented" msgstr "Jeszcze nie zaimplementowane" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "Utworzenie zakończone niepowodzeniem.\n" +msgstr "Data utworzenia" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Dostęp zastrzeżony.\n" +msgstr "Data dostępu" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Ścieżka certyfikacji" +msgstr "Data modyfikacji" #: winefile.rc:109 msgid "Index/Inode" @@ -13767,7 +13739,7 @@ msgstr "Plansza &użytkownika..." #: winemine.rc:44 msgid "&Fastest Times" -msgstr "Najszybsze czasy" +msgstr "&Najlepsze Wyniki" #: winemine.rc:49 msgid "&About WineMine" @@ -14037,7 +14009,7 @@ msgstr "Wine Wordpad - &informacje" #: wordpad.rc:130 msgid "Automatic" -msgstr "Automatycznie" +msgstr "Samoczynnie" #: wordpad.rc:199 msgid "Date and time"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 2dde7d0e0acb0d1a5633edce65622e251c9a6f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dde7d0e0acb0d1a5633edce6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 6 21:45:21 2013 +0400 po: Update Russian translation. --- po/ru.po | 40 +++++++++------------------------------- 1 files changed, 9 insertions(+), 31 deletions(-) diff --git a/po/ru.po b/po/ru.po index 4195680..7b02b04 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-18 00:48+0400\n" +"PO-Revision-Date: 2013-10-06 21:40+0400\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: none\n" "Language: Russian\n" @@ -8531,16 +8531,12 @@ msgstr "" "передана и попробуйте заново." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Текущие установки MIDI Mapper ссылаются на устройство MIDI, которое не " -"установлено в системе. Используйте MIDI Mapper для редактирования установок." +"установлено в системе." #: winmm.rc:53 msgid "" @@ -9361,10 +9357,6 @@ msgstr "" "вызванной процедурой, наследуются вызвавшему.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -9373,8 +9365,6 @@ msgstr "" "директорию.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <директория> изменяет текущую директорию.\n" @@ -9426,11 +9416,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <файл> удаляет файл или несколько файлов.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9439,9 +9424,11 @@ msgid "" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" "FOR используется для применения заданной <команды> для\n" -"одного файла или набора файлов.\n" +"каждого файла из набора файлов.\n" "\n" -"Синтаксис: FOR %переменная IN (набор) DO команда\n" +"Использование: FOR %переменная IN (набор) DO команда\n" +"\n" +"Знак % должен быть удвоен при использовании FOR в bat-файлах.\n" #: cmd.rc:80 msgid "" @@ -9632,17 +9619,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <файла> переименовывает файл.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "" -"RD <директория> это краткий вариант RMDIR. Она удаляет поддиректорию.\n" +msgstr "RD <директория> это краткий вариант RMDIR. Она удаляет директорию.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <директория> удаляет поддиректорию.\n" +msgstr "RMDIR <директория> удаляет директорию.\n" #: cmd.rc:203 msgid "" @@ -9815,15 +9797,11 @@ msgstr "" "окружения восстанавливаются.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <directoryname> сохраняет текущий каталог в стек,\n" +"PUSHD <директория> сохраняет текущий каталог в стек,\n" "а затем переходит в указанный каталог.\n" #: cmd.rc:247

1 0

Dmitry Timoshkov : ntdll: Add support for FILE_APPEND_DATA to NtWriteFile.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: aa8546ecc25764a10123e452ca8f48e641b222b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa8546ecc25764a10123e452c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 14:40:10 2013 +0900 ntdll: Add support for FILE_APPEND_DATA to NtWriteFile. --- dlls/kernel32/tests/file.c | 11 ----------- dlls/ntdll/file.c | 15 ++++++++++++++- dlls/ntdll/tests/file.c | 12 ------------ 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index dc69193..866a29a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3986,17 +3986,6 @@ todo_wine } else { - /* FIXME: remove once Wine is fixed */ - if (!ret && (td[i].access & FILE_APPEND_DATA)) - { -todo_wine - ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); -todo_wine - ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); - CloseHandle(hfile); - continue; - } - ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 62ae135..a8c25d6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -952,7 +952,8 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE, async_write; + BOOL send_completion = FALSE, async_write, append_write = FALSE; + LARGE_INTEGER offset_eof; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -961,6 +962,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, status = server_get_unix_fd( hFile, FILE_WRITE_DATA, &unix_handle, &needs_close, &type, &options ); + if (status == STATUS_ACCESS_DENIED) + { + status = server_get_unix_fd( hFile, FILE_APPEND_DATA, &unix_handle, + &needs_close, &type, &options ); + append_write = TRUE; + } if (status) return status; if (!virtual_check_buffer_for_read( buffer, length )) @@ -979,6 +986,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } + if (append_write) + { + offset_eof.QuadPart = (LONGLONG)-1; /* FILE_WRITE_TO_END_OF_FILE */ + offset = &offset_eof; + } + if (offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */) { off_t off = offset->QuadPart; diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4740d42..1c2a918 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -883,30 +883,22 @@ static void append_file_test(void) iosb.Information = -1; offset.QuadPart = 1; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 2, 2, &offset, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); -todo_wine ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); -todo_wine ok(ret == 4, "expected 4, got %u\n", ret); U(iosb).Status = -1; iosb.Information = -1; offset.QuadPart = 3; status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 4, 2, &offset, NULL); -todo_wine ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); -todo_wine ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 2, "expected 2, got %lu\n", iosb.Information); ret = SetFilePointer(handle, 0, NULL, FILE_CURRENT); -todo_wine ok(ret == 6, "expected 6, got %u\n", ret); CloseHandle(handle); @@ -921,10 +913,8 @@ todo_wine status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); buf[6] = 0; -todo_wine ok(memcmp(buf, text, 6) == 0, "wrong file contents: %s\n", buf); U(iosb).Status = -1; @@ -942,10 +932,8 @@ todo_wine status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); -todo_wine ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); buf[6] = 0; -todo_wine ok(memcmp(buf, "barbar", 6) == 0, "wrong file contents: %s\n", buf); CloseHandle(handle);

1 0

Piotr Caban : riched20: Set control content in WM_CREATE message.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: e660bf676c111ce20d9e868280094f1c5bb81c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e660bf676c111ce20d9e86828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 7 15:28:00 2013 +0200 riched20: Set control content in WM_CREATE message. --- dlls/riched20/editor.c | 24 ++++++++++++++++++++++++ dlls/riched20/tests/editor.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 42f5770..6e7ffae 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3999,6 +3999,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CREATE: { + void *text = NULL; INT max; ME_SetDefaultFormatRect(editor); @@ -4024,6 +4025,29 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } + if (lParam) + { + text = (unicode ? (void*)((CREATESTRUCTW*)lParam)->lpszName + : (void*)((CREATESTRUCTA*)lParam)->lpszName); + } + if (text) + { + WCHAR *textW; + int len; + + textW = ME_ToUnicode(unicode, text, &len); + if (!(editor->styleFlags & ES_MULTILINE)) + { + len = 0; + while(textW[len] != '0' && textW[len] != '\r' && textW[len] != '\n') + len++; + } + ME_InsertTextFromCursor(editor, 0, textW, len, editor->pBuffer->pDefaultStyle); + ME_EndToUnicode(unicode, textW); + ME_SetCursorToStart(editor, &editor->pCursors[0]); + ME_SetCursorToStart(editor, &editor->pCursors[1]); + } + ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_MoveCaret(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 35684e6..4d9fde6 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7410,6 +7410,43 @@ static void test_enter(void) DestroyWindow(hwndRichEdit); } +static void test_WM_CREATE(void) +{ + static const WCHAR titleW[] = {'l','i','n','e','1','\n','l','i','n','e','2',0}; + static const char title[] = "line1\nline2"; + + HWND rich_edit; + LRESULT res; + char buf[64]; + int len; + + rich_edit = CreateWindowA(RICHEDIT_CLASS20A, title, WS_POPUP|WS_VISIBLE, + 0, 0, 200, 80, NULL, NULL, NULL, NULL); + ok(rich_edit != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS20A, (int) GetLastError()); + + len = GetWindowText(rich_edit, buf, sizeof(buf)); + ok(len == 5, "GetWindowText returned %d\n", len); + ok(!strcmp(buf, "line1"), "buf = %s\n", buf); + + res = SendMessage(rich_edit, EM_GETSEL, 0, 0); + ok(res == 0, "SendMessage(EM_GETSEL) returned %lx\n", res); + + DestroyWindow(rich_edit); + + rich_edit = CreateWindowW(RICHEDIT_CLASS20W, titleW, WS_POPUP|WS_VISIBLE|ES_MULTILINE, + 0, 0, 200, 80, NULL, NULL, NULL, NULL); + ok(rich_edit != NULL, "class: %s, error: %d\n", wine_dbgstr_w(RICHEDIT_CLASS20W), (int) GetLastError()); + + len = GetWindowText(rich_edit, buf, sizeof(buf)); + ok(len == 12, "GetWindowText returned %d\n", len); + ok(!strcmp(buf, "line1\r\nline2"), "buf = %s\n", buf); + + res = SendMessage(rich_edit, EM_GETSEL, 0, 0); + ok(res == 0, "SendMessage(EM_GETSEL) returned %lx\n", res); + + DestroyWindow(rich_edit); +} + START_TEST( editor ) { BOOL ret; @@ -7470,6 +7507,7 @@ START_TEST( editor ) test_EM_FINDWORDBREAK_W(); test_EM_FINDWORDBREAK_A(); test_enter(); + test_WM_CREATE(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Henri Verbeet : wined3d: Move lowest_disabled_stage to the context.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 8644b6272677e06865b3875d5194d5efe1c2f5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8644b6272677e06865b3875d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:06 2013 +0200 wined3d: Move lowest_disabled_stage to the context. --- dlls/wined3d/arb_program_shader.c | 8 ++--- dlls/wined3d/context.c | 21 +++++++++++++- dlls/wined3d/device.c | 50 ---------------------------------- dlls/wined3d/nvidia_texture_shader.c | 8 +++--- dlls/wined3d/state.c | 6 ++-- dlls/wined3d/stateblock.c | 2 - dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +- 8 files changed, 32 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8644b6272677e06865b38…

1 0

Henri Verbeet : wined3d: Send render state updates through the command stream.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 3f6d45bf14f46002061d20722a53b6f49e1b1076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6d45bf14f46002061d20722… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 6 17:33:04 2013 +0200 wined3d: Send render state updates through the command stream. --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7f54ac9..f295aa7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -41,6 +41,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_VERTEX_SHADER, WINED3D_CS_OP_SET_GEOMETRY_SHADER, WINED3D_CS_OP_SET_PIXEL_SHADER, + WINED3D_CS_OP_SET_RENDER_STATE, }; struct wined3d_cs_present @@ -143,6 +144,13 @@ struct wined3d_cs_set_shader struct wined3d_shader *shader; }; +struct wined3d_cs_set_render_state +{ + enum wined3d_cs_op opcode; + enum wined3d_render_state state; + DWORD value; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -571,6 +579,26 @@ void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shad cs->ops->submit(cs); } +static void wined3d_cs_exec_set_render_state(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_render_state *op = data; + + cs->state.render_states[op->state] = op->value; + device_invalidate_state(cs->device, STATE_RENDER(op->state)); +} + +void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) +{ + struct wined3d_cs_set_render_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_RENDER_STATE; + op->state = state; + op->value = value; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -588,6 +616,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_VERTEX_SHADER */ wined3d_cs_exec_set_vertex_shader, /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_shader, /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, + /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 49f39d7..705ffb3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1940,7 +1940,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (value == old_value) TRACE("Application is setting the old value over, nothing to do.\n"); else - device_invalidate_state(device, STATE_RENDER(state)); + wined3d_cs_emit_set_render_state(device->cs, state, value); if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1112ef..328d864 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,6 +2491,8 @@ void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_s void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, + enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN;

1 0

Francois Gouget : mshtml/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 89ee4dc6e6a69ddd3a032b9b091b00ccdf1d171c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ee4dc6e6a69ddd3a032b9b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 6 00:22:39 2013 +0200 mshtml/tests: Fix compilation on systems that don't support nameless unions. --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f19f04d..70da9ae 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -616,7 +616,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(bindinfo.dwBindVerb == BINDVERB_POST, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb); ok(bindinfo.cbstgmedData == 8, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData); ok(bindinfo.stgmedData.tymed == TYMED_HGLOBAL, "bindinfo.stgmedData.tymed=%d\n", bindinfo.stgmedData.tymed); - ok(!memcmp(bindinfo.stgmedData.hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); + ok(!memcmp(U(bindinfo.stgmedData).hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); } ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); ok(bindinfo.dwOptions == 0x80000 ||

1 0

Francois Gouget : user32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 39f8c2201ca64ca7756c2d55e14bd220e640451f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f8c2201ca64ca7756c2d55e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 6 00:22:29 2013 +0200 user32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/user32/tests/winstation.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7155b33..1804345 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -483,9 +483,9 @@ static void test_inputdesktop(void) INPUT inputs[1]; inputs[0].type = INPUT_KEYBOARD; - inputs[0].ki.wVk = 0; - inputs[0].ki.wScan = 0x3c0; - inputs[0].ki.dwFlags = KEYEVENTF_UNICODE; + U(inputs[0]).ki.wVk = 0; + U(inputs[0]).ki.wScan = 0x3c0; + U(inputs[0]).ki.dwFlags = KEYEVENTF_UNICODE; /* OpenInputDesktop creates new handles for each calls */ old_input_desk = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS);

1 0

Frédéric Delanoy : windowscodecs/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 7, 2013

Oct. 7, 2013

Module: wine Branch: master Commit: 919e8236ee0fd7ff04c6d98bb39554f8b4681d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919e8236ee0fd7ff04c6d98bb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 5 08:53:54 2013 +0200 windowscodecs/tests: Use BOOL type where appropriate. --- dlls/windowscodecs/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index d9159b1..da8d6b8 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -63,7 +63,7 @@ static HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result) return hr; } -static int is_pixelformat(GUID *format) +static BOOL is_pixelformat(GUID *format) { IWICComponentInfo *info; HRESULT hr;

1 0