wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Zebediah Figura : qcap: Get rid of an unnecessary allocation and copy.
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: 2011518d30b7af6ff715d59cc1edcf5aa5ead45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2011518d30b7af6ff715d59c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:02 2019 -0500 qcap: Get rid of an unnecessary allocation and copy. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index fb10cce..7444329 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -367,7 +367,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget, *pOutput; + unsigned char *pTarget; capBox->image_size = capBox->height * capBox->width * 3; if (!(capBox->image_data = heap_alloc(capBox->image_size))) @@ -378,8 +378,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) return 0; } - pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8); - while (1) { EnterCriticalSection(&capBox->CritSect); @@ -410,8 +408,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - memcpy(pOutput, capBox->image_data, len); - Resize(capBox, pTarget, pOutput); + Resize(capBox, pTarget, capBox->image_data); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); @@ -428,7 +425,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } LeaveCriticalSection(&capBox->CritSect); - CoTaskMemFree(pOutput); return 0; }

1 0

Zebediah Figura : qcap: Get rid of V4l_GetFrame().
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: e32dead36300cb79510a86c6417dd17995939370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32dead36300cb79510a86c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:01 2019 -0500 qcap: Get rid of V4l_GetFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ab39b71..fb10cce 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -361,27 +361,13 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) } } -static void V4l_GetFrame(Capture *device, unsigned char **buffer) -{ - while (video_read(device->fd, device->image_data, device->image_size) == -1) - { - if (errno != EAGAIN) - { - ERR("Failed to read frame: %s\n", strerror(errno)); - break; - } - } - TRACE("Successfully read a frame.\n"); - *buffer = device->image_data; -} - static DWORD WINAPI ReadThread(LPVOID lParam) { Capture * capBox = lParam; HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget, *pInput, *pOutput; + unsigned char *pTarget, *pOutput; capBox->image_size = capBox->height * capBox->width * 3; if (!(capBox->image_data = heap_alloc(capBox->image_size))) @@ -414,9 +400,17 @@ static DWORD WINAPI ReadThread(LPVOID lParam) TRACE("Data length: %d KB\n", len / 1024); IMediaSample_GetPointer(pSample, &pTarget); - /* FIXME: Check return values.. */ - V4l_GetFrame(capBox, &pInput); - memcpy(pOutput, pInput, len); + + while (video_read(capBox->fd, capBox->image_data, capBox->image_size) == -1) + { + if (errno != EAGAIN) + { + ERR("Failed to read frame: %s\n", strerror(errno)); + break; + } + } + + memcpy(pOutput, capBox->image_data, len); Resize(capBox, pTarget, pOutput); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr);

1 0

Zebediah Figura : qcap: Get rid of V4l_Prepare().
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: bc42cc42795ef04624cb7b3ec98b24a8db44554d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc42cc42795ef04624cb7b3e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:00 2019 -0500 qcap: Get rid of V4l_Prepare(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 752751a..ab39b71 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -122,15 +122,6 @@ static int xioctl(int fd, int request, void * arg) return r; } -/* Prepare the capture buffers */ -static HRESULT V4l_Prepare(Capture *device) -{ - device->image_size = device->height * device->width * 3; - if (!(device->image_data = heap_alloc(device->image_size))) - return E_OUTOFMEMORY; - return S_OK; -} - HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); @@ -392,10 +383,10 @@ static DWORD WINAPI ReadThread(LPVOID lParam) ULONG framecount = 0; unsigned char *pTarget, *pInput, *pOutput; - hr = V4l_Prepare(capBox); - if (FAILED(hr)) + capBox->image_size = capBox->height * capBox->width * 3; + if (!(capBox->image_data = heap_alloc(capBox->image_size))) { - ERR("Stop IFilterGraph: %x\n", hr); + ERR("Failed to allocate memory.\n"); capBox->thread = 0; capBox->stopped = TRUE; return 0;

1 0

Zebediah Figura : qcap: Get rid of V4l_Unprepare().
by Alexandre Julliard 11 Apr '19

11 Apr '19

Module: wine Branch: master Commit: b42f79129d416db4c791ac732c5ec37b043bbf6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b42f79129d416db4c791ac73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:31:59 2019 -0500 qcap: Get rid of V4l_Unprepare(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 809ce7a..752751a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -131,11 +131,6 @@ static HRESULT V4l_Prepare(Capture *device) return S_OK; } -static void V4l_Unprepare(Capture *device) -{ - heap_free(device->image_data); -} - HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); @@ -439,7 +434,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { TRACE("Return %x, stop IFilterGraph\n", hr); - V4l_Unprepare(capBox); + heap_free(capBox->image_data); capBox->thread = 0; capBox->stopped = TRUE; break; @@ -559,7 +554,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr); } - V4l_Unprepare(capBox); + heap_free(capBox->image_data); } *state = State_Stopped;

1 0

Alistair Leslie-Hughes : winex11: Implement PK_CHANGE for wintab.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: 0652a2ccc967c6d1ca04c67f58112ff491ab9a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0652a2ccc967c6d1ca04c67f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 10 03:42:53 2019 +0000 winex11: Implement PK_CHANGE for wintab. Based on a patch by Eriks Dobelis. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wintab32/context.c | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 48fcb22..486c356 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -267,6 +267,7 @@ static int proximity_out_type; static HWND hwndTabletDefault; static WTPACKET gMsgPacket; static DWORD gSerial; +static WTPACKET last_packet; /* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html * @@ -839,6 +840,40 @@ static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) return -1; } +static DWORD get_changed_state( WTPACKET *pkt) +{ + DWORD change = 0; + + if (pkt->pkX != last_packet.pkX) + change |= PK_X; + if (pkt->pkY != last_packet.pkY) + change |= PK_Y; + if (pkt->pkZ != last_packet.pkZ) + change |= PK_Z; + if (pkt->pkSerialNumber != last_packet.pkSerialNumber) + change |= PK_SERIAL_NUMBER; + if (pkt->pkTime != last_packet.pkTime) + change |= PK_TIME; + if (pkt->pkNormalPressure != last_packet.pkNormalPressure) + change |= PK_NORMAL_PRESSURE; + if (pkt->pkTangentPressure != last_packet.pkTangentPressure) + change |= PK_TANGENT_PRESSURE; + if (pkt->pkCursor != last_packet.pkCursor) + change |= PK_CURSOR; + if (pkt->pkButtons != last_packet.pkButtons) + change |= PK_BUTTONS; + if (pkt->pkOrientation.orAzimuth != last_packet.pkOrientation.orAzimuth || + pkt->pkOrientation.orAltitude != last_packet.pkOrientation.orAltitude || + pkt->pkOrientation.orTwist != last_packet.pkOrientation.orTwist) + change |= PK_ORIENTATION; + if (pkt->pkRotation.roPitch != last_packet.pkRotation.roPitch || + pkt->pkRotation.roRoll != last_packet.pkRotation.roRoll || + pkt->pkRotation.roYaw != last_packet.pkRotation.roYaw) + change |= PK_ROTATION; + + return change; +} + static BOOL motion_event( HWND hwnd, XEvent *event ) { XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; @@ -865,7 +900,9 @@ static BOOL motion_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = motion->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + last_packet = gMsgPacket; return TRUE; } @@ -895,7 +932,9 @@ static BOOL button_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = button->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + last_packet = gMsgPacket; return TRUE; } diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2993c47..095e258 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -215,6 +215,7 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) packet->pkContext = ptr->handle; /* translate packet data to the context */ + packet->pkChanged = packet->pkChanged & ptr->context.lcPktData; /* Scale as per documentation */ packet->pkY = ScaleForContext(packet->pkY, ptr->context.lcInOrgY,

1 0

Fabian Maurer : sxs: Implement SxsLookupClrGuid and add tests.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: 4c7ffaecaf50cee91e74d509f64f4aecca6e237c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c7ffaecaf50cee91e74d509… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 9 19:27:44 2019 +0200 sxs: Implement SxsLookupClrGuid and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 150 ++++++++++++++++++++++++ dlls/sxs/sxs.spec | 1 + dlls/sxs/tests/Makefile.in | 8 +- dlls/sxs/tests/comtest_dll.manifest | 16 +++ dlls/sxs/tests/comtest_exe.manifest | 11 ++ dlls/sxs/tests/interfaces.idl | 35 ++++++ dlls/sxs/tests/resource.rc | 27 +++++ dlls/sxs/tests/sxs.c | 224 ++++++++++++++++++++++++++++++++++++ 8 files changed, 470 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c7ffaecaf50cee91e74…

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: 368f35edd773647fe75073127f46d46d8ba8d896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368f35edd773647fe7507312… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Apr 9 05:02:10 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 99 +++++++++++++++++++++++++--------------------------------------- 1 file changed, 39 insertions(+), 60 deletions(-) diff --git a/po/si.po b/po/si.po index 5bf28e5..d4bb595 100644 --- a/po/si.po +++ b/po/si.po @@ -3803,7 +3803,7 @@ msgstr "අවලංගු ධාවකය.\n" #: winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "" +msgstr "වත්මන් ඩිරෙක්ටරිය මකන්න බැහැ.\n" #: winerror.mc:113 msgid "Not same device.\n" @@ -3903,7 +3903,7 @@ msgstr "" #: winerror.mc:233 msgid "Bad network path.\n" -msgstr "" +msgstr "හොඳ නැති ජාලය පෙත.\n" #: winerror.mc:238 msgid "Network busy.\n" @@ -4080,9 +4080,8 @@ msgid "Invalid IOCTL.\n" msgstr "අවලංගු IOCTL.\n" #: winerror.mc:458 -#, fuzzy msgid "Invalid verify switch.\n" -msgstr "අවලංගු" +msgstr "අවලංගු verify ස්විචය.\n" #: winerror.mc:463 msgid "Bad driver level.\n" @@ -4553,7 +4552,7 @@ msgstr "අවලංගු සලකුණු.\n" #: winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "" +msgstr "හඳුනගත්තු නැති පංගුවක්.\n" #: winerror.mc:1048 msgid "File invalid.\n" @@ -4711,9 +4710,8 @@ msgid "Invalid service lock.\n" msgstr "අවලංගු සේවාව අගුල.\n" #: winerror.mc:1238 -#, fuzzy msgid "Service marked for delete.\n" -msgstr "සේවාව" +msgstr "සේවාව සලකුණු කරලා මැකීමට.\n" #: winerror.mc:1243 msgid "Service exists.\n" @@ -6151,11 +6149,11 @@ msgstr "" #: winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "" +msgstr "RPC සේවාදායකය ලද නොහැකි.\n" #: winerror.mc:3048 msgid "RPC server too busy.\n" -msgstr "" +msgstr "RPC සේවාදායකය කාර්යබහුල වැඩි.\n" #: winerror.mc:3053 msgid "Invalid network options.\n" @@ -6211,7 +6209,7 @@ msgstr "" #: winerror.mc:3123 msgid "Unknown authentication type.\n" -msgstr "" +msgstr "දන්නේ නැති සත්‍යාපනය වර්ගයක්.\n" #: winerror.mc:3128 msgid "Maximum calls too low.\n" @@ -6247,7 +6245,7 @@ msgstr "අවලංගු සත්‍යාපන අනන්‍යතාව #: winerror.mc:3168 msgid "Unknown authorization service.\n" -msgstr "" +msgstr "දන්නේ නැති අනුමැතිය සේවාවක්.\n" #: winerror.mc:3173 msgid "Invalid entry.\n" @@ -6799,10 +6797,8 @@ msgid "Object is not initialized.\n" msgstr "වස්තුව ආරම්භනය කරල නැහැ.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Error: Process self-termination is not permitted.\n" msgid "Representation is not supported.\n" -msgstr "දෝෂය: ක්රියාවලියක් තමංම නතර කරන්න බැහැ.\n" +msgstr "ඉදිරිපත්කිරීම සහාය නොදක්වයි.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" @@ -6865,10 +6861,8 @@ msgid "Unsupported thinning.\n" msgstr "Thinning සහාය නොදක්වයි.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Reversing is not supported.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ප්‍රතිවර්තනය කිරීම සහාය නොදක්වයි.\n" #: mferror.mc:214 msgid "Unsupported rate transition.\n" @@ -6941,10 +6935,8 @@ msgid "Attribute is not found.\n" msgstr "උපලක්ෂණය හම්බු උනේ නැහැ.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Property type is not allowed.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ගුණාංග වර්ගය අවසර නැහැ.\n" #: mferror.mc:354 msgid "Property type is not supported.\n" @@ -7000,10 +6992,8 @@ msgid "No events available.\n" msgstr "සිද්ධීන් ලද හැකි නැහැ.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Invalid media source state transition\n" msgid "Invalid media source state transition.\n" -msgstr "අවලංගු මාධ්‍ය මූලයේ තත්වය සංක්‍රාන්තිය\n" +msgstr "අවලංගු මාධ්‍ය මූලයේ තත්වය සංක්‍රාන්තිය.\n" #: mferror.mc:452 msgid "End of media stream has been reached.\n" @@ -7020,28 +7010,20 @@ msgid "Media stream has no duration set.\n" msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" #: mferror.mc:473 -#, fuzzy -#| msgid "Media format was recognized but is invalid\n" msgid "Media format was recognized but is invalid.\n" -msgstr "මාධ්‍ය ආකෘතිය හදුනාගන්නවා හැබැයි වලංගු නැහැ\n" +msgstr "මාධ්‍ය ආකෘතිය හදුනාගන්නවා හැබැයි වලංගු නැහැ.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property wasn't found\n" msgid "Property wasn't found.\n" -msgstr "ගුණාංගය හම්බු උනේ නැහැ\n" +msgstr "ගුණාංගය හම්බු උනේ නැහැ.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is read-only\n" msgid "Property is read-only.\n" -msgstr "ගුණාංගය කියවීම් පමණි\n" +msgstr "ගුණාංගය කියවීම් පමණි.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Property is not allowed.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ගුණාංගය අවසර නැහැ.\n" #: mferror.mc:501 #, fuzzy @@ -7050,26 +7032,20 @@ msgid "Media source is not started.\n" msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported media format\n" msgid "Unsupported media format.\n" -msgstr "මාධ්‍ය ආකෘතිය සහාය නොදක්වයි\n" +msgstr "මාධ්‍ය ආකෘතිය සහාය නොදක්වයි.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Media source is in wrong state\n" msgid "Media source is in wrong state.\n" -msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" +msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ.\n" #: mferror.mc:522 msgid "No media streams were selected.\n" msgstr "" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported media source characteristics\n" msgid "Unsupported media source characteristics.\n" -msgstr "මාධ්‍ය මූලයේ ගුණාංග සහාය නොදක්වයි\n" +msgstr "මාධ්‍ය මූලයේ ගුණාංග සහාය නොදක්වයි.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n" @@ -7763,7 +7739,7 @@ msgstr "" #: msvfw32.rc:53 msgid "&Data Rate" -msgstr "" +msgstr "දත්ත අනුපාතය (&D)" #: msvfw32.rc:55 msgid "kB/s" @@ -8917,7 +8893,7 @@ msgstr "හංගලා (&I)" #: shell32.rc:372 shell32.rc:409 winefile.rc:175 msgid "&Archive" -msgstr "" +msgstr "සංරක්ෂිතය (&A)" #: shell32.rc:386 msgid "Open with:" @@ -11872,7 +11848,7 @@ msgstr "අපේක්ෂා කරේ මෙහෙයුම්කාරකය #: cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "වරහන් ගැලපෙන්නේ නැහැ.\n" #: cmd.rc:409 msgid "" @@ -12142,7 +12118,7 @@ msgstr "තත්වය" #: netstat.rc:35 msgid "Interface Statistics" -msgstr "" +msgstr "අතුරුමුහුණත සංඛ්‍යාලේඛන" #: netstat.rc:36 msgid "Sent" @@ -12573,11 +12549,11 @@ msgstr "පද්ධති සිටුවම්" #: oleview.rc:171 msgid "&Enable Distributed COM" -msgstr "" +msgstr "DCOM සබල කරන්න (&E)" #: oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "" +msgstr "දුරස්ථ සබැඳුම් සබල කරන්න (Win95 විතරක්)" #: oleview.rc:173 msgid "" @@ -12860,7 +12836,7 @@ msgstr "ක්‍රමලේඛ කළමනාකාරකය ගැන (&A)" #: progman.rc:103 msgid "Program &group" -msgstr "" +msgstr "ක්‍රමලේඛ සමූහය (&G)" #: progman.rc:105 msgid "&Program" @@ -12896,7 +12872,7 @@ msgstr "" #: progman.rc:156 msgid "&Group file:" -msgstr "" +msgstr "සමූහය ගොනුව (&G):" #: progman.rc:168 msgid "Program Attributes" @@ -13156,7 +13132,7 @@ msgstr "reg: රෙජිස්තරයේ යතුර '%1' අරින්න #: reg.rc:69 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: හඳුනගත්තු නැති escape sequence එකක් [\\%1!c!]\n" #: reg.rc:70 msgid "REG EXPORT key_name file.reg [/y]\n" @@ -13168,7 +13144,7 @@ msgstr "reg: අවලංගු පද්ධතිය යතුර [%1]\n" #: reg.rc:72 msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "" +msgstr "'%1' ගොනුව දැනටමත් තියෙනවා. ඔබට ඒක උඩින් ලියන්න ඕනෙද?" #: regedit.rc:34 msgid "&Registry" @@ -13488,7 +13464,7 @@ msgstr "" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: අවලංගු හෝ දන්නෙ නැති ස්විචයක් [%1]\n" +msgstr "regedit: අවලංගු හෝ හඳුනගත්තු නැති ස්විචයක් [%1]\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -13530,7 +13506,7 @@ msgstr "" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: හඳුනගත්තු නැති escape sequence එකක් [\\%1!c!]\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" @@ -13772,7 +13748,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: අවලංගු හෝ දන්නේ නැති ස්විචය [%1]\n" +"regsvr32: අවලංගු හෝ හඳුනගත්තු නැති ස්විචය [%1]\n" "\n" #: regsvr32.rc:42 @@ -15518,7 +15494,7 @@ msgstr "wineconsole: අවලංගු බැකන්ඩ් එකක්\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: දන්නෙ නැති විධාන රේඛා විකල්පය\n" +msgstr "wineconsole: හඳුනගත්තු නැති විධාන රේඛා විකල්පය\n" #: wineconsole.rc:47 msgid "Starts a program in a Wine console\n" @@ -16062,7 +16038,7 @@ msgstr "අනුලකුණ ආකෘතිය (&F)" #: wordpad.rc:64 msgid "&Def. char format" -msgstr "" +msgstr "පෙරනිමි අනුලකුණ ආකෘතිය (&D)" #: wordpad.rc:65 msgid "Paragrap&h format" @@ -16186,7 +16162,7 @@ msgstr "පෙළ ගැසුම" #: wordpad.rc:250 msgid "Tabs" -msgstr "" +msgstr "ටැබ" #: wordpad.rc:253 msgid "Tab stops" @@ -16434,6 +16410,9 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" +"'%1' කියන්නේ ගොනුවක නමක් හෝ ඩිරෙක්ටරියක් ද\n" +"ඉලක්කය උඩ?\n" +"(F - ගොනුවක්, D - ඩිරෙක්ටරියක්)\n" #: xcopy.rc:38 msgid "%1? (Yes|No)\n"

1 0

Alexandre Julliard : msvcrt/tests: Add some function pointers to bypass gcc builtin functions.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: 9a4b596ed9fa5ab545e3105cf15a04e24aa9ead3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4b596ed9fa5ab545e3105c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:11:18 2019 +0200 msvcrt/tests: Add some function pointers to bypass gcc builtin functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/heap.c | 12 ++++-- dlls/msvcrt/tests/scanf.c | 100 ++++++++++++++++++++++++--------------------- dlls/msvcrt/tests/string.c | 12 ++++-- 3 files changed, 69 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a4b596ed9fa5ab545e3…

1 0

Alexandre Julliard : msvcrt/tests: Use existing function pointers to call functions.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: 2e01a48440d9a0a08ec40f02e148a10838cf7d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e01a48440d9a0a08ec40f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:11:08 2019 +0200 msvcrt/tests: Use existing function pointers to call functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a5a2df1..e9edb57 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -609,47 +609,47 @@ static void test_strftime(void) ok(gmt_tm != NULL, "gmtime failed\n"); errno = 0xdeadbeef; - retA = strftime(NULL, 0, "copy", gmt_tm); + retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - retA = strftime(bufA, 256, "copy", NULL); + retA = p_strftime(bufA, 256, "copy", NULL); ok(retA == 4, "expected 4, got %ld\n", retA); ok(!strcmp(bufA, "copy"), "got %s\n", bufA); - retA = strftime(bufA, 256, "copy it", gmt_tm); + retA = p_strftime(bufA, 256, "copy it", gmt_tm); ok(retA == 7, "expected 7, got %ld\n", retA); ok(!strcmp(bufA, "copy it"), "got %s\n", bufA); errno = 0xdeadbeef; - retA = strftime(bufA, 2, "copy", gmt_tm); + retA = p_strftime(bufA, 2, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "copy it")), "got %s\n", bufA); ok(errno==ERANGE || errno==0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; - retA = strftime(bufA, 256, "a%e", gmt_tm); + retA = p_strftime(bufA, 256, "a%e", gmt_tm); ok(retA==0 || broken(retA==1), "expected 0, got %ld\n", retA); ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "a")), "got %s\n", bufA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); if(0) { /* crashes on Win2k */ errno = 0xdeadbeef; - retA = strftime(bufA, 256, "%c", NULL); + retA = p_strftime(bufA, 256, "%c", NULL); ok(retA == 0, "expected 0, got %ld\n", retA); ok(!strcmp(bufA, ""), "got %s\n", bufA); ok(errno == EINVAL, "errno = %d\n", errno); } - retA = strftime(bufA, 256, "e%#%e", gmt_tm); + retA = p_strftime(bufA, 256, "e%#%e", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "e%e"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%c", gmt_tm); + retA = p_strftime(bufA, 256, "%c", gmt_tm); ok(retA == 17, "expected 17, got %ld\n", retA); ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); - retW = wcsftime(bufW, 256, cW, gmt_tm); + retW = p_wcsftime(bufW, 256, cW, gmt_tm); ok(retW == 17, "expected 17, got %ld\n", retW); ok(retA == retW, "expected %ld, got %ld\n", retA, retW); buf[0] = 0; @@ -657,91 +657,91 @@ static void test_strftime(void) buf[retA] = 0; ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); - retA = strftime(bufA, 256, "%x", gmt_tm); + retA = p_strftime(bufA, 256, "%x", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%X", gmt_tm); + retA = p_strftime(bufA, 256, "%X", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%a", gmt_tm); + retA = p_strftime(bufA, 256, "%a", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "Thu"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%A", gmt_tm); + retA = p_strftime(bufA, 256, "%A", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%b", gmt_tm); + retA = p_strftime(bufA, 256, "%b", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%B", gmt_tm); + retA = p_strftime(bufA, 256, "%B", gmt_tm); ok(retA == 7, "expected 7, got %ld\n", retA); ok(!strcmp(bufA, "January"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%d", gmt_tm); + retA = p_strftime(bufA, 256, "%d", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%#d", gmt_tm); + retA = p_strftime(bufA, 256, "%#d", gmt_tm); ok(retA == 1, "expected 1, got %ld\n", retA); ok(!strcmp(bufA, "1"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%H", gmt_tm); + retA = p_strftime(bufA, 256, "%H", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%I", gmt_tm); + retA = p_strftime(bufA, 256, "%I", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "12"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%j", gmt_tm); + retA = p_strftime(bufA, 256, "%j", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "001"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%m", gmt_tm); + retA = p_strftime(bufA, 256, "%m", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%#M", gmt_tm); + retA = p_strftime(bufA, 256, "%#M", gmt_tm); ok(retA == 1, "expected 1, got %ld\n", retA); ok(!strcmp(bufA, "0"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%p", gmt_tm); + retA = p_strftime(bufA, 256, "%p", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "AM"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); gmt_tm->tm_wday = 0; - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); gmt_tm->tm_yday = 365; - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "53"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "52"), "got %s\n", bufA); gmt_tm->tm_mon = 1; gmt_tm->tm_mday = 30; - retA = strftime(bufA, 256, "%c", gmt_tm); + retA = p_strftime(bufA, 256, "%c", gmt_tm); todo_wine { ok(retA == 17, "expected 17, got %ld\n", retA); ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); @@ -753,7 +753,7 @@ static void test_strftime(void) } /* test with multibyte character */ - retA = strftime(bufA, 256, "\x82%c", gmt_tm); + retA = p_strftime(bufA, 256, "\x82%c", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "\x82%c"), "got %s\n", bufA); }

1 0

Alexandre Julliard : msvcp: Remove some redundant clearing of buffers.
by Alexandre Julliard 10 Apr '19

10 Apr '19

Module: wine Branch: master Commit: 612fce30140b315eeb37f80bc60a931cce81df92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612fce30140b315eeb37f80b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:09:04 2019 +0200 msvcp: Remove some redundant clearing of buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 31 ++++++++----------------------- dlls/msvcp140/tests/msvcp140.c | 35 ++++++++++------------------------- 2 files changed, 18 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=612fce30140b315eeb37…

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019