June 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : ws2_32: Use socklen_t where appropriate.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 92b2172038ed23830a399d18b7523dc37fda1e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b2172038ed23830a399d18b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 13:52:38 2017 +0200 ws2_32: Use socklen_t where appropriate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a768ac..f212ec2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3053,7 +3053,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD DWORD flags ) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = sizeof(uaddr); + socklen_t uaddrlen = sizeof(uaddr); struct ws2_transmitfile_async *wsa; NTSTATUS status; int fd; @@ -7720,8 +7720,8 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { /* It's invalid to receive OOB data from an OOBINLINED socket * as OOB data is turned into normal data. */ - i = sizeof(n); - if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &i) && n) + socklen_t len = sizeof(n); + if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &len) && n) { err = WSAEINVAL; goto error;

1 0

Paul Gofman : d3dx9: Avoid casting each value separately in set_constants( ).
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: f48d38e5ac72ff0d5cb5951a40072e92a77b4b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48d38e5ac72ff0d5cb5951a4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 15 01:00:36 2017 +0300 d3dx9: Avoid casting each value separately in set_constants(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 101 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e9c8387..f10a3c6 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -22,6 +22,7 @@ #include "d3dx9_private.h" #include <float.h> +#include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -1037,6 +1038,73 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->count = info->major_count * info->minor; } +static void pres_int_from_float(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_float = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = in_float[i]; +} + +static void pres_bool_from_value(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const DWORD *in_dword = in; + BOOL *out_bool = out; + + for (i = 0; i < count; ++i) + out_bool[i] = !!in_dword[i]; +} + +static void pres_float_from_int(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const int *in_int = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = in_int[i]; +} + +static void pres_float_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const BOOL *in_bool = in; + float *out_float = out; + + for (i = 0; i < count; ++i) + out_float[i] = !!in_bool[i]; +} + +static void pres_int_from_bool(void *out, const void *in, unsigned int count) +{ + unsigned int i; + const float *in_bool = in; + int *out_int = out; + + for (i = 0; i < count; ++i) + out_int[i] = !!in_bool[i]; +} + +static void regstore_set_data(struct d3dx_regstore *rs, unsigned int table, + unsigned int offset, const unsigned int *in, unsigned int count, enum pres_value_type param_type) +{ + typedef void (*conv_func)(void *out, const void *in, unsigned int count); + static const conv_func set_const_funcs[PRES_VT_COUNT][PRES_VT_COUNT] = + { + {NULL, NULL, pres_int_from_float, pres_bool_from_value}, + {NULL, NULL, NULL, NULL}, + {pres_float_from_int, NULL, NULL, pres_bool_from_value}, + {pres_float_from_bool, NULL, pres_int_from_bool, NULL} + }; + enum pres_value_type table_type = table_info[table].type; + + set_const_funcs[param_type][table_type]((unsigned int *)rs->tables[table] + offset, in, count); + regstore_set_modified(rs, table, offset, count); +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -1047,11 +1115,11 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const struct d3dx_const_param_eval_output *const_set = &const_tab->const_set[const_idx]; unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; - enum pres_value_type table_type = table_info[table].type; unsigned int element, i, j, start_offset; unsigned int param_offset; struct const_upload_info info; unsigned int *data = param->data; + enum pres_value_type param_type; if (!is_param_dirty(param, const_tab->update_version)) continue; @@ -1063,22 +1131,23 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const get_offset_reg(table, const_set->register_count)); continue; } + param_type = table_type_from_param_type(param->type); get_const_upload_info(const_set, &info); - for (element = 0; element < const_set->element_count; ++element) { + unsigned int *out = (unsigned int *)rs->tables[table] + start_offset; + + /* Store reshaped but (possibly) not converted yet data temporarily in the same constants buffer. + * All the supported types of parameters and table values have the same size. */ for (i = 0; i < info.major_count; ++i) { for (j = 0; j < info.minor; ++j) { - unsigned int out; - unsigned int *in; unsigned int offset; offset = i * info.major_stride + j; if (get_reg_offset(table, offset) >= const_set->register_count) break; - offset += start_offset; if (info.transpose) param_offset = i + j * info.major; else @@ -1088,23 +1157,19 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i); break; } - - in = (unsigned int *)data + param_offset; - switch (table_type) - { - case PRES_VT_FLOAT: set_number(&out, D3DXPT_FLOAT, in, param->type); break; - case PRES_VT_INT: set_number(&out, D3DXPT_INT, in, param->type); break; - case PRES_VT_BOOL: set_number(&out, D3DXPT_BOOL, in, param->type); break; - default: - FIXME("Unexpected type %#x.\n", table_info[table].type); - break; - } - regstore_set_values(rs, table, &out, offset, 1); + out[offset] = data[param_offset]; } } start_offset += get_offset_reg(table, const_set->register_count); data += param->rows * param->columns; } + start_offset = get_offset_reg(table, const_set->register_index); + if (table_info[table].type == param_type) + regstore_set_modified(rs, table, start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count); + else + regstore_set_data(rs, table, start_offset, (unsigned int *)rs->tables[table] + start_offset, + get_offset_reg(table, const_set->register_count) * const_set->element_count, param_type); } const_tab->update_version = new_update_version; } @@ -1310,6 +1375,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC ERR("Unexpected register set %u.\n", desc.RegisterSet); return D3DERR_INVALIDCALL; } + assert(table_info[const_set.table].component_size == sizeof(unsigned int)); + assert(param->bytes / (param->rows * param->columns) == sizeof(unsigned int)); const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info);

1 0

Jacek Caban : widl: Try to find imported typelib using .tlb extension if it wasn't specified.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: fbdf119e2c8ac4233c4323835ff82fe3ad3de3d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf119e2c8ac4233c4323835… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 16 15:25:48 2017 +0200 widl: Try to find imported typelib using .tlb extension if it wasn't specified. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typelib.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 6ac748f..e8dfcb1 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -326,22 +326,42 @@ static void read_msft_importlib(importlib_t *importlib, int fd) free(typeinfo_offs); } +static int open_typelib(const char *name) +{ + char *file_name; + int fd; + + file_name = wpp_find_include(name, NULL); + if(!file_name) + return open(name, O_RDONLY | O_BINARY ); + + fd = open(file_name, O_RDONLY | O_BINARY ); + free(file_name); + return fd; +} + static void read_importlib(importlib_t *importlib) { int fd; INT magic; - char *file_name; - file_name = wpp_find_include(importlib->name, NULL); - if(file_name) { - fd = open(file_name, O_RDONLY | O_BINARY ); - free(file_name); - }else { - fd = open(importlib->name, O_RDONLY | O_BINARY ); + fd = open_typelib(importlib->name); + + /* widl extension: if importlib name has no .tlb extension, try using .tlb */ + if(fd < 0) { + const char *p = strrchr(importlib->name, '.'); + size_t len = p ? p - importlib->name : strlen(importlib->name); + if(strcmp(importlib->name + len, ".tlb")) { + char *tlb_name = xmalloc(len + 5); + memcpy(tlb_name, importlib->name, len); + strcpy(tlb_name + len, ".tlb"); + fd = open_typelib(tlb_name); + free(tlb_name); + } } if(fd < 0) - error("Could not open importlib %s.\n", importlib->name); + error("Could not find importlib %s.\n", importlib->name); tlb_read(fd, &magic, sizeof(magic));

1 0

Hugh McMaster : regedit: Re-insert the default value item after deleting its data.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: cb563dbac61c320032ee14bdb2b6def1960393ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb563dbac61c320032ee14bdb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:59 2017 +0000 regedit: Re-insert the default value item after deleting its data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 3 ++- programs/regedit/framewnd.c | 15 ++++++++++++++- programs/regedit/listview.c | 8 ++++---- programs/regedit/main.h | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index d88061c..403def4 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -483,7 +483,8 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW } /* Add the new item to the listview */ - index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, (BYTE *)&valueDword, sizeof(DWORD)); + index = AddEntryToList(g_pChildWnd->hListWnd, valueName, valueType, + (BYTE *)&valueDword, sizeof(DWORD), -1); item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, index, (LPARAM)&item); diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 539be96..361da7e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -806,7 +806,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, keyPath); } else if (hWndDelete == g_pChildWnd->hListWnd) { - unsigned int num_selected, index; + unsigned int num_selected, index, focus_idx; WCHAR *keyPath; if (!(num_selected = SendMessageW(g_pChildWnd->hListWnd, LVM_GETSELECTEDCOUNT, 0, 0L))) @@ -821,7 +821,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + focus_idx = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_FOCUSED, 0)); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); + while (index != -1) { WCHAR *valueName = GetItemText(g_pChildWnd->hListWnd, index); @@ -832,6 +834,17 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } HeapFree(GetProcessHeap(), 0, valueName); SendMessageW(g_pChildWnd->hListWnd, LVM_DELETEITEM, index, 0L); + /* the default value item is always visible, so add it back in */ + if (!index) + { + AddEntryToList(g_pChildWnd->hListWnd, NULL, REG_SZ, NULL, 0, 0); + if (!focus_idx) + { + LVITEMW item; + item.state = item.stateMask = LVIS_FOCUSED; + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + } + } index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0)); } HeapFree(GetProcessHeap(), 0, keyPath); diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index caa9a23..1365259 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -157,7 +157,7 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz } } -int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount) +int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos) { LINE_INFO* linfo; LVITEMW item; @@ -178,7 +178,7 @@ int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWOR } item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - item.iItem = SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0); + item.iItem = (pos == -1) ? SendMessageW(hwndLV, LVM_GETITEMCOUNT, 0, 0) : pos; item.iSubItem = 0; item.state = 0; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; @@ -557,7 +557,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { - AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0); + AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, -1); } for(index = 0; index < val_count; index++) { valNameLen = max_val_name_len; @@ -566,7 +566,7 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize); + AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, -1); } memset(&item, 0, sizeof(item)); diff --git a/programs/regedit/main.h b/programs/regedit/main.h index f09de34..5331189 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -118,7 +118,7 @@ extern void UpdateStatusBar(void); /* listview.c */ extern void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD size); -extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount); +extern int AddEntryToList(HWND hwndLV, WCHAR *Name, DWORD dwValType, void *ValBuf, DWORD dwCount, int pos); extern HWND CreateListView(HWND hwndParent, UINT id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highlightValue); extern HWND StartValueRename(HWND hwndLV);

1 0

Hugh McMaster : regedit: Use the correct mask flags with LVM_GETNEXTITEM.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 7f76cf6c26012bc6ad9488e96b08133f86f148c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f76cf6c26012bc6ad9488e96… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:50 2017 +0000 regedit: Use the correct mask flags with LVM_GETNEXTITEM. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0503dc8..539be96 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -187,7 +187,7 @@ static void UpdateMenuItems(HMENU hMenu) { selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); + MAKELPARAM(LVNI_FOCUSED | LVNI_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); update_modify_items(hMenu, index);

1 0

Hugh McMaster : regedit: Allow the deletion of registry keys beginning with a lowercase 'H'.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 1f08ee245366958147789ec2ae0c7d80d03ac9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f08ee245366958147789ec2a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:41 2017 +0000 regedit: Allow the deletion of registry keys beginning with a lowercase 'H'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2ce77c4..e08ffa6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -624,7 +624,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) { WCHAR *p = pos; - if (*p == 'H') + if (*p == 'H' || *p == 'h') delete_registry_key(p); set_state(parser, LINE_START); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 49e2396..ec488bf 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1238,13 +1238,13 @@ static void test_key_creation_and_deletion(void) "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n"); verify_key_nonexist(hkey, "Subkey3a"); - todo_wine verify_key_nonexist(hkey, "Subkey3b"); + verify_key_nonexist(hkey, "Subkey3b"); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } static void test_value_deletion(void) @@ -1296,7 +1296,7 @@ static void test_value_deletion(void) ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } START_TEST(regedit)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 2159e65d7038d7dc87a55570f72515dc7b89d986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2159e65d7038d7dc87a55570f… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 16 13:50:38 2017 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 59 +++++++++++++++-------------------------------------------- 1 file changed, 15 insertions(+), 44 deletions(-) diff --git a/po/de.po b/po/de.po index f9dc0dc..ef36881 100644 --- a/po/de.po +++ b/po/de.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: 2017-03-06 16:05+0100\n" +"PO-Revision-Date: 2017-06-16 13:49+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -3708,7 +3708,7 @@ msgstr "Array-Objekt erwartet" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine-Kernel-DLL" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -11839,17 +11839,12 @@ msgid "&About Registry Editor" msgstr "&Über den Registrierungs-Editor" #: regedit.rc:89 regedit.rc:96 regedit.rc:230 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "ausgeklappt" +msgstr "Erweitern" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Binäre Daten ändern..." +msgstr "&Binäre Daten ändern..." #: regedit.rc:267 msgid "Export registry" @@ -11948,14 +11943,11 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Befehle zum Zugriff auf häufig benutzte Schlüssel" #: regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Befehle zum Anzeigen der Hilfe oder von Informationen über das Programm" +"Befehle zum Anzeigen der Hilfe oder von Informationen über den " +"Registrierungs-Editor" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -12153,10 +12145,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: Unbekannte Escape-Sequenz [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [%1]\n" +msgstr "regedit: Nicht unterstützter Registrierungsdatentyp [0x%1!x!]\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12200,14 +12190,10 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Die Registrierungsklasse '%1' konnte nicht gelöscht werden.\n" #: regedit.rc:431 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Zeile '%1' wurde nicht erkannt.\n" +msgstr "regedit: Die Zeile enthält ungültige Syntax.\n" #: regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Beendet den Registrierungs-Editor" @@ -12224,10 +12210,8 @@ msgid "Shows or hides the status bar" msgstr "Blendet die Statusleiste ein oder aus" #: regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Ändert die Position das Fensterteilers" +msgstr "Ändert die Position des Fensterteilers" #: regedit.rc:192 msgid "Refreshes the window" @@ -12270,10 +12254,8 @@ msgid "Adds a new binary value" msgstr "Fügt einen neuen Binärwert hinzu" #: regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Fügt einen neuen Binärwert hinzu" +msgstr "Fügt einen neuen 32-Bit-Wert hinzu" #: regedit.rc:177 msgid "Imports a text file into the registry" @@ -12288,10 +12270,8 @@ msgid "Prints all or part of the registry" msgstr "Druckt Teile oder die gesamte Registry aus" #: regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registrierungs-Editor" +msgstr "Hilfe zum Registrierungs-Editor öffnen" #: regedit.rc:182 msgid "Displays program information, version number and copyright" @@ -12334,26 +12314,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Der Schlüssel '%1' konnte nicht abgefragt werden." #: regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Ändert die Daten eines Wertes" +msgstr "Ändert die Daten eines Wertes in Binärform" #: regedit.rc:175 msgid "Adds a new multi-string value" msgstr "Fügt eine neue mehrteilige Zeichenfolge hinzu" #: regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Exportiert den ausgewählten Zweig der Registrierung in eine Textdatei" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Fügt eine neue Zeichenfolge hinzu" +msgstr "Fügt eine neue erweiterbare Zeichenfolge hinzu" #: regedit.rc:212 msgid "Confirm Key Delete" @@ -12368,14 +12342,11 @@ msgstr "" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Erweitert oder reduziert den ausgewählten Knoten" #: regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "eingeklappt" +msgstr "Reduzieren" #: regsvr32.rc:32 msgid ""

1 0

Alexandre Julliard : include: Make socklen_t a define to avoid conflicting typedefs.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: dfcf4910e53503196a771946e332196d3c3eb1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfcf4910e53503196a771946e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 16 13:46:22 2017 +0200 include: Make socklen_t a define to avoid conflicting typedefs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2tcpip.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 934c727..337383b 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -54,7 +54,11 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; -typedef int WS(socklen_t); +#ifdef USE_WS_PREFIX +typedef int WS_socklen_t; +#else +#define socklen_t int /* avoid conflicts with the system's socklen_t typedef */ +#endif typedef ADDRINFOA ADDRINFO, *LPADDRINFO;

1 0

Hugh McMaster : regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 8504a1563de17f7c93023cf317a7bccde7718d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8504a1563de17f7c93023cf31… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 16 13:06:23 2017 +0000 regedit: Free the memory used by the REG_DWORD and hex data types after saving the registry value. We use a BOOL to handle all hex types, including those that are undefined (e.g.0x100). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f7e8d2a..416938d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -163,6 +163,7 @@ struct parser DWORD data_type; /* data type */ void *data; /* value data */ DWORD data_size; /* size of the data (in bytes) */ + BOOL hex_type; /* parsing a hex data type */ enum parser_state state; /* current parser state */ }; @@ -322,6 +323,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) return FALSE; parser->data_type = val; + parser->hex_type = TRUE; *line = end + 2; } return TRUE; @@ -826,6 +828,13 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) RegSetValueExW(parser->hkey, parser->value_name, 0, parser->data_type, parser->data, parser->data_size); + if (parser->data_type == REG_DWORD || parser->hex_type) + { + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->hex_type = FALSE; + } + if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE); else @@ -1463,6 +1472,7 @@ BOOL import_registry_file(FILE *reg_file) parser.data_type = 0; parser.data = NULL; parser.data_size = 0; + parser.hex_type = FALSE; parser.state = HEADER; pos = parser.two_wchars;

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard June 16, 2017

June 16, 2017

Module: wine Branch: master Commit: 1e643a5203081e9f7387f598f6bad5eadabaea60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e643a5203081e9f7387f598f… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Thu Jun 15 22:42:21 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/po/pl.po b/po/pl.po index 7a71c24..6ca4cba 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,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: 2017-06-03 20:40+0200\n" +"PO-Revision-Date: 2017-06-15 22:41+0200\n" "Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -6821,7 +6821,7 @@ msgstr "ścieżka %s nie została odnaleziona" #: msi.rc:32 msgid "insert disk %s" -msgstr "włóż dysk '%s'" +msgstr "włóż dysk %s" #: msi.rc:33 msgid "" @@ -6887,7 +6887,7 @@ msgstr "" #: msi.rc:60 msgid "enter which folder contains %s" -msgstr "podaj, który katalog zawiera '%s'" +msgstr "wprowadź folder zawierający %s" #: msi.rc:61 msgid "install source for feature missing" @@ -6903,7 +6903,7 @@ msgstr "funkcja z:" #: msi.rc:64 msgid "choose which folder contains %s" -msgstr "wybierz, który katalog zawiera '%s'" +msgstr "wybierz folder zawierający '%s'" #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8624,7 +8624,7 @@ msgstr "Pokaż wszystko" #: winemac.rc:37 msgid "Quit %@" -msgstr " Zakończ %@" +msgstr "Zakończ %@" #: winemac.rc:38 msgid "Quit" @@ -11720,11 +11720,11 @@ msgstr "Wyszukiwanie zakończone. Liczba pasujących wyrażeń: %1!d!\n" #: reg.rc:61 msgid "reg: Invalid syntax. " -msgstr "reg: Nieprawidłowa składnia." +msgstr "reg: Nieprawidłowa składnia. " #: reg.rc:62 msgid "reg: Invalid option [%1]. " -msgstr "reg: Nieprawidłowa opcja [%1]." +msgstr "reg: Nieprawidłowa opcja [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" @@ -11811,10 +11811,8 @@ msgid "Expand" msgstr "Rozwiń" #: regedit.rc:134 regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "Zmień dane binarne..." +msgstr "Zmień dane &binarne..." #: regedit.rc:267 msgid "Export registry" @@ -12311,7 +12309,7 @@ msgstr "" #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Rozwija lub zwija zaznaczony węzeł" #: regedit.rc:231 msgid "Collapse" @@ -13535,7 +13533,7 @@ msgstr "" #: winecfg.rc:236 msgid "A&dd..." -msgstr "&Dodaj" +msgstr "&Dodaj…" #: winecfg.rc:238 msgid "Aut&odetect"

1 0