October 2013 - Wine-commits

Henri Verbeet : d3drm: Get rid of the IDirect3DRMLightArrayImpl typedef.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: e9f2fce16b96cb469173363902da7e5145a0a66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f2fce16b96cb46917336390… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 7 22:15:51 2013 +0200 d3drm: Get rid of the IDirect3DRMLightArrayImpl typedef. --- dlls/d3drm/frame.c | 163 +++++++++++++++++++++++---------------------------- 1 files changed, 74 insertions(+), 89 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6cd6c0e..fb0c22d 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -72,12 +72,13 @@ typedef struct { IDirect3DRMVisual **visuals; } IDirect3DRMVisualArrayImpl; -typedef struct { +struct d3drm_light_array +{ IDirect3DRMLightArray IDirect3DRMLightArray_iface; LONG ref; ULONG size; IDirect3DRMLight **lights; -} IDirect3DRMLightArrayImpl; +}; static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame2(IDirect3DRMFrame2 *iface) { @@ -91,9 +92,9 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); -static inline IDirect3DRMLightArrayImpl *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) +static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3DRMLightArray *iface) { - return CONTAINING_RECORD(iface, IDirect3DRMLightArrayImpl, IDirect3DRMLightArray_iface); + return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface); } /*** IUnknown methods ***/ @@ -328,122 +329,106 @@ static HRESULT Direct3DRMVisualArray_create(IDirect3DRMVisualArray** ret_iface) return S_OK; } -/*** IUnknown methods ***/ -static HRESULT WINAPI IDirect3DRMLightArrayImpl_QueryInterface(IDirect3DRMLightArray* iface, - REFIID riid, void** object) +static HRESULT WINAPI d3drm_light_array_QueryInterface(IDirect3DRMLightArray *iface, REFIID riid, void **out) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - - TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_guid(riid), object); - - *object = NULL; + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IDirect3DRMLightArray)) - { - *object = &This->IDirect3DRMLightArray_iface; - } - else + if (IsEqualGUID(riid, &IID_IDirect3DRMLightArray) + || IsEqualGUID(riid, &IID_IUnknown)) { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IDirect3DRMLightArray_AddRef(iface); + *out = iface; + return S_OK; } - IDirect3DRMLightArray_AddRef(iface); - return S_OK; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; + return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DRMLightArrayImpl_AddRef(IDirect3DRMLightArray* iface) +static ULONG WINAPI d3drm_light_array_AddRef(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); + ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DRMLightArrayImpl_Release(IDirect3DRMLightArray* iface) +static ULONG WINAPI d3drm_light_array_Release(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); + ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) + if (!refcount) { - for (i = 0; i < This->size; i++) - IDirect3DRMLight_Release(This->lights[i]); - HeapFree(GetProcessHeap(), 0, This->lights); - HeapFree(GetProcessHeap(), 0, This); + for (i = 0; i < array->size; ++i) + { + IDirect3DRMLight_Release(array->lights[i]); + } + HeapFree(GetProcessHeap(), 0, array->lights); + HeapFree(GetProcessHeap(), 0, array); } - return ref; + return refcount; } -/*** IDirect3DRMArray methods ***/ -static DWORD WINAPI IDirect3DRMLightArrayImpl_GetSize(IDirect3DRMLightArray* iface) +static DWORD WINAPI d3drm_light_array_GetSize(IDirect3DRMLightArray *iface) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); - TRACE("(%p)->() = %d\n", This, This->size); + TRACE("iface %p.\n", iface); - return This->size; + return array->size; } -/*** IDirect3DRMLightArray methods ***/ -static HRESULT WINAPI IDirect3DRMLightArrayImpl_GetElement(IDirect3DRMLightArray *iface, +static HRESULT WINAPI d3drm_light_array_GetElement(IDirect3DRMLightArray *iface, DWORD index, IDirect3DRMLight **light) { - IDirect3DRMLightArrayImpl *This = impl_from_IDirect3DRMLightArray(iface); + struct d3drm_light_array *array = impl_from_IDirect3DRMLightArray(iface); - TRACE("(%p)->(%u, %p)\n", This, index, light); + TRACE("iface %p, index %u, light %p.\n", iface, index, light); if (!light) return D3DRMERR_BADVALUE; - *light = NULL; - - if (index >= This->size) + if (index >= array->size) + { + *light = NULL; return D3DRMERR_BADVALUE; + } - IDirect3DRMLight_AddRef(This->lights[index]); - *light = This->lights[index]; + IDirect3DRMLight_AddRef(array->lights[index]); + *light = array->lights[index]; return D3DRM_OK; } -static const struct IDirect3DRMLightArrayVtbl Direct3DRMLightArray_Vtbl = +static const struct IDirect3DRMLightArrayVtbl d3drm_light_array_vtbl = { - /*** IUnknown methods ***/ - IDirect3DRMLightArrayImpl_QueryInterface, - IDirect3DRMLightArrayImpl_AddRef, - IDirect3DRMLightArrayImpl_Release, - /*** IDirect3DRMArray methods ***/ - IDirect3DRMLightArrayImpl_GetSize, - /*** IDirect3DRMLightArray methods ***/ - IDirect3DRMLightArrayImpl_GetElement + d3drm_light_array_QueryInterface, + d3drm_light_array_AddRef, + d3drm_light_array_Release, + d3drm_light_array_GetSize, + d3drm_light_array_GetElement, }; -static HRESULT Direct3DRMLightArray_create(IDirect3DRMLightArray** obj) +static struct d3drm_light_array *d3drm_light_array_create(void) { - IDirect3DRMLightArrayImpl* object; - - TRACE("(%p)\n", obj); - - *obj = NULL; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMLightArrayImpl)); - if (!object) - return E_OUTOFMEMORY; + struct d3drm_light_array *array; - object->IDirect3DRMLightArray_iface.lpVtbl = &Direct3DRMLightArray_Vtbl; - object->ref = 1; + if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + return NULL; - *obj = &object->IDirect3DRMLightArray_iface; + array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl; + array->ref = 1; - return S_OK; + return array; } /*** IUnknown methods ***/ @@ -1678,32 +1663,32 @@ static D3DCOLOR WINAPI IDirect3DRMFrame3Impl_GetColor(IDirect3DRMFrame3* iface) static HRESULT WINAPI IDirect3DRMFrame3Impl_GetLights(IDirect3DRMFrame3 *iface, IDirect3DRMLightArray **lights) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - IDirect3DRMLightArrayImpl* obj; - HRESULT hr; + IDirect3DRMFrameImpl *frame = impl_from_IDirect3DRMFrame3(iface); + struct d3drm_light_array *array; - TRACE("(%p/%p)->(%p)\n", iface, This, lights); + TRACE("iface %p, lights %p.\n", iface, lights); if (!lights) return D3DRMERR_BADVALUE; - hr = Direct3DRMLightArray_create(lights); - - if (hr != D3DRM_OK) - return hr; - - obj = (IDirect3DRMLightArrayImpl*)*lights; + if (!(array = d3drm_light_array_create())) + return E_OUTOFMEMORY; - obj->size = This->nb_lights; - if (This->nb_lights) + array->size = frame->nb_lights; + if (frame->nb_lights) { ULONG i; - if (!(obj->lights = HeapAlloc(GetProcessHeap(), 0, This->nb_lights * sizeof(*obj->lights)))) + + if (!(array->lights = HeapAlloc(GetProcessHeap(), 0, frame->nb_lights * sizeof(*array->lights)))) return E_OUTOFMEMORY; - for (i = 0; i < This->nb_lights; i++) - IDirect3DRMLight_QueryInterface(This->lights[i], &IID_IDirect3DRMLight, (void**)&obj->lights[i]); + for (i = 0; i < frame->nb_lights; ++i) + { + IDirect3DRMLight_QueryInterface(frame->lights[i], &IID_IDirect3DRMLight, (void **)&array->lights[i]); + } } + *lights = &array->IDirect3DRMLightArray_iface; + return D3DRM_OK; }

1 0

Frédéric Delanoy : dinput: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: b95272e2d5f761e0994286f9996882fbf6c1c318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95272e2d5f761e0994286f99… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:35 2013 +0200 dinput: Use BOOL type where appropriate. --- dlls/dinput/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index fc5ad5d..08ebfd7 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -575,7 +575,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) DWORD type = (0x0000ff00 & dwSemantic) >> 8; DWORD offset = 0x000000ff & dwSemantic; DWORD obj_instance = 0; - DWORD found = 0; + BOOL found = FALSE; int i; for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++) @@ -585,7 +585,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic) if (odf->dwOfs == offset) { obj_instance = DIDFT_GETINSTANCE(odf->dwType); - found = 1; + found = TRUE; break; } }

1 0

Frédéric Delanoy : msi/tests: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: e21abfe07a7be233993cc52612b29597f419379c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21abfe07a7be233993cc5261… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:36 2013 +0200 msi/tests: Use BOOL type where appropriate. --- dlls/msi/tests/msi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 5df72e9..066b1d4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -12766,7 +12766,7 @@ static void test_MsiGetPatchInfo(void) static void test_MsiEnumProducts(void) { UINT r; - int found1, found2, found3; + BOOL found1, found2, found3; DWORD index; char product1[39], product2[39], product3[39], guid[39]; char product_squashed1[33], product_squashed2[33], product_squashed3[33]; @@ -12824,12 +12824,12 @@ static void test_MsiEnumProducts(void) r = MsiEnumProductsA(index, guid); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - found1 = found2 = found3 = 0; + found1 = found2 = found3 = FALSE; while ((r = MsiEnumProductsA(index, guid)) == ERROR_SUCCESS) { - if (!strcmp(product1, guid)) found1 = 1; - if (!strcmp(product2, guid)) found2 = 1; - if (!strcmp(product3, guid)) found3 = 1; + if (!strcmp(product1, guid)) found1 = TRUE; + if (!strcmp(product2, guid)) found2 = TRUE; + if (!strcmp(product3, guid)) found3 = TRUE; index++; } ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %u\n", r);

1 0

Frédéric Delanoy : riched20: Use BOOL type where appropriate.
by Alexandre Julliard 08 Oct '13

08 Oct '13

Module: wine Branch: master Commit: f03d251ef2b19813729a1d3313268f4db599f37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03d251ef2b19813729a1d331… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 7 22:49:37 2013 +0200 riched20: Use BOOL type where appropriate. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6e7ffae..4e3d978 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -253,7 +253,7 @@ HANDLE me_heap = NULL; static BOOL ME_ListBoxRegistered = FALSE; static BOOL ME_ComboBoxRegistered = FALSE; -static inline int is_version_nt(void) +static inline BOOL is_version_nt(void) { return !(GetVersion() & 0x80000000); }

1 0

Dmitry Timoshkov : ntdll: Add support for FILE_APPEND_DATA to NtWriteFile.
by Alexandre Julliard 07 Oct '13

07 Oct '13

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

Dmitry Timoshkov : ntdll/tests: Accept previously declared behaviour of overlapped IO as broken.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: 1670c7f9a61306b4103105467b2f8b913a01dc04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1670c7f9a61306b4103105467… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 7 16:36:31 2013 +0900 ntdll/tests: Accept previously declared behaviour of overlapped IO as broken. It highly depends on Windows version and updates/SP installed. --- dlls/ntdll/tests/file.c | 123 +++++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1670c7f9a61306b410310…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 07 Oct '13

07 Oct '13

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

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard 07 Oct '13

07 Oct '13

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

Rico Schüller : d3dx9: Don' t allocate the state parameter.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: bc1d6e5098c08e59f43fafe8e5e2b649f2006ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1d6e5098c08e59f43fafe8e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Oct 6 21:25:41 2013 +0200 d3dx9: Don't allocate the state parameter. --- dlls/d3dx9_36/effect.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0c4fecc..547e810 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -127,7 +127,7 @@ struct d3dx_state UINT operation; UINT index; enum STATE_TYPE type; - struct d3dx_parameter *parameter; + struct d3dx_parameter parameter; }; struct d3dx_sampler @@ -558,8 +558,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base static void free_state(struct d3dx_state *state) { - free_parameter(state->parameter, FALSE, FALSE); - HeapFree(GetProcessHeap(), 0, state->parameter); + free_parameter(&state->parameter, FALSE, FALSE); } static void free_object(struct d3dx_object *object) @@ -4618,11 +4617,6 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con DWORD offset; const char *ptr2; HRESULT hr; - struct d3dx_parameter *parameter; - - parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); - if (!parameter) - return E_OUTOFMEMORY; state->type = ST_CONSTANT; @@ -4635,7 +4629,7 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx9_parse_effect_typedef(parameter, data, &ptr2, NULL, 0); + hr = d3dx9_parse_effect_typedef(&state->parameter, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -4644,20 +4638,18 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(parameter, data, data + offset, objects); + hr = d3dx9_parse_init_value(&state->parameter, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); goto err_out; } - state->parameter = parameter; - return D3D_OK; err_out: - free_parameter(parameter, FALSE, FALSE); + free_parameter(&state->parameter, FALSE, FALSE); return hr; } @@ -5007,7 +4999,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state = &pass->states[state_index]; } - param = state->parameter; + param = &state->parameter; /* * TODO: Do we need to create the shader/string here or later when we access them?

1 0

Francois Gouget : mscoree/tests: Make test_createinstance() static.
by Alexandre Julliard 07 Oct '13

07 Oct '13

Module: wine Branch: master Commit: cd35ac901f2b2906813ee08b65c851bf7f0ffede URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd35ac901f2b2906813ee08b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 7 09:29:46 2013 +0200 mscoree/tests: Make test_createinstance() static. --- dlls/mscoree/tests/mscoree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 41844ef..19e8fdd 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -390,7 +390,7 @@ static void test_createconfigstream(void) DeleteFileW(file); } -void test_createinstance(void) +static void test_createinstance(void) { HRESULT hr; ICLRMetaHost *host;

1 0