February 2016 - Wine-commits

André Hentschel : ndis.sys: Implement NdisSystemProcessorCount.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 113f43250a2de4e4ff73226cb0006a7833d2fb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=113f43250a2de4e4ff73226cb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:43:28 2016 +0100 ndis.sys: Implement NdisSystemProcessorCount. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 10 ++++++++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/ddk/ndis.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 499f167..6e1bb9b 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -48,3 +48,13 @@ void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *lock) { FIXME("(%p): stub\n", lock); } + +CCHAR WINAPI NdisSystemProcessorCount(void) +{ + SYSTEM_INFO si; + + TRACE("()\n"); + GetSystemInfo(&si); + + return si.dwNumberOfProcessors; +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 31b421a..8957d8f 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -257,7 +257,7 @@ @ stub NdisSetTimer @ stub NdisSetTimerEx @ stub NdisSetupDmaTransfer -@ stub NdisSystemProcessorCount +@ stdcall NdisSystemProcessorCount() @ stub NdisTerminateWrapper @ stub NdisTransferData @ stub NdisUnchainBufferAtBack diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index aa77d9a..ffa1396 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -33,5 +33,6 @@ typedef struct _NDIS_SPIN_LOCK NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *); +CCHAR WINAPI NdisSystemProcessorCount(void); #endif /* _NDIS_ */

1 0

André Hentschel : ndis.sys: Add NdisRegisterProtocol stub.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: f71f7db63caeffdc92ede12bf15e8f7d184addd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71f7db63caeffdc92ede12bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 19 23:43:44 2016 +0100 ndis.sys: Add NdisRegisterProtocol stub. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 8 ++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/ddk/ndis.h | 183 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 191 insertions(+), 2 deletions(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 6e1bb9b..90c8c3c 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -2,6 +2,7 @@ * ndis.sys * * Copyright 2014 Austin English + * Copyright 2016 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,6 +50,13 @@ void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *lock) FIXME("(%p): stub\n", lock); } +void WINAPI NdisRegisterProtocol(NDIS_STATUS *status, NDIS_HANDLE *handle, + NDIS_PROTOCOL_CHARACTERISTICS *prot, UINT len) +{ + FIXME("(%p, %p, %p, %u): stub\n", status, handle, prot, len); + *status = NDIS_STATUS_FAILURE; +} + CCHAR WINAPI NdisSystemProcessorCount(void) { SYSTEM_INFO si; diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 8957d8f..b478c39 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -238,7 +238,7 @@ @ stub NdisReadNetworkAddress @ stub NdisReadPciSlotInformation @ stub NdisReadPcmciaAttributeMemory -@ stub NdisRegisterProtocol +@ stdcall NdisRegisterProtocol(ptr ptr ptr long) @ stub NdisRegisterTdiCallBack @ stub NdisReleaseReadWriteLock @ stub NdisReleaseSpinLock diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index ffa1396..a4b0e54 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -2,6 +2,7 @@ * ndis.h * * Copyright 2015 Austin English + * Copyright 2016 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,8 +21,97 @@ #ifndef _NDIS_ #define _NDIS_ -typedef void *NDIS_HANDLE, *PNDIS_HANDLE; +typedef ULONG NDIS_AF, *PNDIS_AF; +typedef MDL NDIS_BUFFER, *PNDIS_BUFFER; +typedef void *NDIS_HANDLE, *PNDIS_HANDLE, *PNDIS_PACKET_POOL; +typedef ULONG NDIS_OID, *PNDIS_OID; typedef int NDIS_STATUS, *PNDIS_STATUS; +typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING; + +typedef enum _NDIS_REQUEST_TYPE +{ + NdisRequestQueryInformation, + NdisRequestSetInformation, + NdisRequestQueryStatistics, + NdisRequestOpen, + NdisRequestClose, + NdisRequestSend, + NdisRequestTransferData, + NdisRequestReset, + NdisRequestGeneric1, + NdisRequestGeneric2, + NdisRequestGeneric3, + NdisRequestGeneric4, + NdisRequestMethod, +} NDIS_REQUEST_TYPE, *PNDIS_REQUEST_TYPE; + +typedef enum _NET_PNP_EVENT_CODE +{ + NetEventSetPower, + NetEventQueryPower, + NetEventQueryRemoveDevice, + NetEventCancelRemoveDevice, + NetEventReconfigure, + NetEventBindList, + NetEventBindsComplete, + NetEventPnPCapabilities, + NetEventPause, + NetEventRestart, + NetEventPortActivation, + NetEventPortDeactivation, + NetEventIMReEnableDevice, + NetEventMaximum, +} NET_PNP_EVENT_CODE, *PNET_PNP_EVENT_CODE; + + +typedef struct _NET_PNP_EVENT +{ + NET_PNP_EVENT_CODE NetEvent; + PVOID Buffer; + ULONG BufferLength; + ULONG_PTR NdisReserved[4]; + ULONG_PTR TransportReserved[4]; + ULONG_PTR TdiReserved[4]; + ULONG_PTR TdiClientReserved[4]; +} NET_PNP_EVENT, *PNET_PNP_EVENT; + +typedef struct _NDIS_PACKET_PRIVATE +{ + UINT PhysicalCount; + UINT TotalLength; + PNDIS_BUFFER Head; + PNDIS_BUFFER Tail; + PNDIS_PACKET_POOL Pool; + UINT Count; + ULONG Flags; + BOOLEAN ValidCounts; + UCHAR NdisPacketFlags; + USHORT NdisPacketOobOffset; +} NDIS_PACKET_PRIVATE, *PNDIS_PACKET_PRIVATE; + +typedef struct _NDIS_PACKET +{ + NDIS_PACKET_PRIVATE Private; + union + { + struct + { + UCHAR MiniportReserved[2 * sizeof(void*)]; + UCHAR WrapperReserved[2 * sizeof(void*)]; + } DUMMYSTRUCTNAME; + struct + { + UCHAR MiniportReservedEx[3 * sizeof(void*)]; + UCHAR WrapperReservedEx[sizeof(void*)]; + } DUMMYSTRUCTNAME1; + struct + { + UCHAR MacReserved[4 * sizeof(void*)]; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME; + ULONG_PTR Reserved[2]; + UCHAR ProtocolReserved[1]; +} NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET; typedef struct _NDIS_SPIN_LOCK { @@ -29,10 +119,101 @@ typedef struct _NDIS_SPIN_LOCK KIRQL OldIrql; } NDIS_SPIN_LOCK, *PNDIS_SPIN_LOCK; + +typedef struct _NDIS_REQUEST +{ + UCHAR MacReserved[4 * sizeof(void*)]; + NDIS_REQUEST_TYPE RequestType; + union _DATA + { + struct QUERY_INFORMATION + { + NDIS_OID Oid; + PVOID InformationBuffer; + UINT InformationBufferLength; + UINT BytesWritten; + UINT BytesNeeded; + } QUERY_INFORMATION; + struct SET_INFORMATION + { + NDIS_OID Oid; + PVOID InformationBuffer; + UINT InformationBufferLength; + UINT BytesRead; + UINT BytesNeeded; + } SET_INFORMATION; + } DATA; + UCHAR NdisReserved[9 * sizeof(void*)]; + union + { + UCHAR CallMgrReserved[2 * sizeof(void*)]; + UCHAR ProtocolReserved[2 * sizeof(void*)]; + } DUMMYUNIONNAME; + UCHAR MiniportReserved[2 * sizeof(void*)]; +} NDIS_REQUEST, *PNDIS_REQUEST; + +typedef struct _CO_ADDRESS_FAMILY +{ + NDIS_AF AddressFamily; + ULONG MajorVersion; + ULONG MinorVersion; +} CO_ADDRESS_FAMILY, *PCO_ADDRESS_FAMILY; + + +typedef void (NTAPI *CO_AF_REGISTER_NOTIFY_HANDLER)(NDIS_HANDLE, PCO_ADDRESS_FAMILY); +typedef void (NTAPI *CO_SEND_COMPLETE_HANDLER)(NDIS_STATUS, NDIS_HANDLE, PNDIS_PACKET); +typedef void (NTAPI *CO_STATUS_HANDLER)(NDIS_HANDLE, NDIS_HANDLE, NDIS_STATUS, PVOID, UINT); +typedef UINT (NTAPI *CO_RECEIVE_PACKET_HANDLER)(NDIS_HANDLE, NDIS_HANDLE, PNDIS_PACKET); +typedef void (NTAPI *OPEN_ADAPTER_COMPLETE_HANDLER)(NDIS_HANDLE, NDIS_STATUS, NDIS_STATUS); +typedef void (NTAPI *CLOSE_ADAPTER_COMPLETE_HANDLER)(NDIS_HANDLE, NDIS_STATUS); +typedef void (NTAPI *RESET_COMPLETE_HANDLER)(NDIS_HANDLE, NDIS_STATUS); +typedef void (NTAPI *REQUEST_COMPLETE_HANDLER)(NDIS_HANDLE, PNDIS_REQUEST, NDIS_STATUS); +typedef void (NTAPI *STATUS_HANDLER)(NDIS_HANDLE, NDIS_STATUS, PVOID, UINT); +typedef void (NTAPI *STATUS_COMPLETE_HANDLER)(NDIS_HANDLE); +typedef void (NTAPI *SEND_COMPLETE_HANDLER)(NDIS_HANDLE, PNDIS_PACKET, NDIS_STATUS); +typedef void (NTAPI *TRANSFER_DATA_COMPLETE_HANDLER)(NDIS_HANDLE, PNDIS_PACKET, NDIS_STATUS, UINT); +typedef NDIS_STATUS (NTAPI *RECEIVE_HANDLER)(NDIS_HANDLE, NDIS_HANDLE, PVOID, UINT, PVOID, UINT, UINT); +typedef void (NTAPI *RECEIVE_COMPLETE_HANDLER)(NDIS_HANDLE); +typedef INT (NTAPI *RECEIVE_PACKET_HANDLER)(NDIS_HANDLE, PNDIS_PACKET); +typedef void (NTAPI *BIND_HANDLER)(PNDIS_STATUS, NDIS_HANDLE, PNDIS_STRING, PVOID, PVOID); +typedef void (NTAPI *UNBIND_HANDLER)(PNDIS_STATUS, NDIS_HANDLE, NDIS_HANDLE); +typedef NDIS_STATUS (NTAPI *PNP_EVENT_HANDLER)(NDIS_HANDLE, PNET_PNP_EVENT); +typedef void (NTAPI *UNLOAD_PROTOCOL_HANDLER)(void); + + +typedef struct _NDIS_PROTOCOL_CHARACTERISTICS +{ + UCHAR MajorNdisVersion; + UCHAR MinorNdisVersion; + USHORT Filler; + UINT Reserved; + OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; + CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; + SEND_COMPLETE_HANDLER SendCompleteHandler; + TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; + RESET_COMPLETE_HANDLER ResetCompleteHandler; + REQUEST_COMPLETE_HANDLER RequestCompleteHandler; + RECEIVE_HANDLER ReceiveHandler; + RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; + STATUS_HANDLER StatusHandler; + STATUS_COMPLETE_HANDLER StatusCompleteHandler; + NDIS_STRING Name; + RECEIVE_PACKET_HANDLER ReceivePacketHandler; + BIND_HANDLER BindAdapterHandler; + UNBIND_HANDLER UnbindAdapterHandler; + PNP_EVENT_HANDLER PnPEventHandler; + UNLOAD_PROTOCOL_HANDLER UnloadHandler; + CO_SEND_COMPLETE_HANDLER CoSendCompleteHandler; + CO_STATUS_HANDLER CoStatusHandler; + CO_RECEIVE_PACKET_HANDLER CoReceivePacketHandler; + CO_AF_REGISTER_NOTIFY_HANDLER CoAfRegisterNotifyHandler; +} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; + #define NDIS_STATUS_FAILURE ((NDIS_STATUS) STATUS_UNSUCCESSFUL) NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *); +void WINAPI NdisRegisterProtocol(NDIS_STATUS *, NDIS_HANDLE *, NDIS_PROTOCOL_CHARACTERISTICS *, UINT); CCHAR WINAPI NdisSystemProcessorCount(void); #endif /* _NDIS_ */

1 0

Piotr Caban : msvcrt/tests: Add close tests on file descriptors that use the same HANDLE.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 96d476584e771bb352c8b8a84ff51f67a63f0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d476584e771bb352c8b8a84… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 19 18:43:31 2016 +0100 msvcrt/tests: Add close tests on file descriptors that use the same HANDLE. Based on Qian Hong patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ba8c3e3..dbb6cef 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2327,6 +2327,64 @@ static void test_write_flush(void) free(tempf); } +static void test_close(void) +{ + ioinfo *stdout_info, stdout_copy, *stderr_info, stderr_copy; + int fd1, fd2, ret1, ret2, ret3, ret4; + DWORD flags; + HANDLE h; + + /* test close on fds that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + fd1 = _open_osfhandle((intptr_t)h, 0); + ok(fd1 != -1, "_open_osfhandle failed (%d)\n", errno); + fd2 = _open_osfhandle((intptr_t)h, 0); + ok(fd2 != -1, "_open_osfhandle failed (%d)\n", errno); + ok(fd1 != fd2, "fd1 == fd2\n"); + + ok((HANDLE)_get_osfhandle(fd1) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd1), h); + ok((HANDLE)_get_osfhandle(fd2) == h, "handles mismatch (%p != %p)\n", + (HANDLE)_get_osfhandle(fd2), h); + ok(!close(fd1), "close(fd1) failed (%d)\n", errno); + ok(!GetHandleInformation(h, &flags), "GetHandleInformation succeeded\n"); + ok(close(fd2), "close(fd2) succeeded\n"); + + /* test close on stdout and stderr that use the same handle */ + h = CreateFileA("fdopen.tst", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "error opening fdopen.tst file\n"); + + /* tests output will not be visible from now on */ + stdout_info = &__pioinfo[STDOUT_FILENO/MSVCRT_FD_BLOCK_SIZE][STDOUT_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stderr_info = &__pioinfo[STDERR_FILENO/MSVCRT_FD_BLOCK_SIZE][STDERR_FILENO%MSVCRT_FD_BLOCK_SIZE]; + stdout_copy = *stdout_info; + stderr_copy = *stderr_info; + stdout_info->handle = h; + stderr_info->handle = h; + + ret1 = close(STDOUT_FILENO); + ret2 = GetHandleInformation(h, &flags); + ret3 = close(STDERR_FILENO); + ret4 = GetHandleInformation(h, &flags); + + *stdout_info = stdout_copy; + *stderr_info = stderr_copy; + SetStdHandle(STD_OUTPUT_HANDLE, stdout_info->handle); + SetStdHandle(STD_ERROR_HANDLE, stderr_info->handle); + /* stdout and stderr restored */ + + ok(!ret1, "close(STDOUT_FILENO) failed\n"); + ok(ret2, "GetHandleInformation failed\n"); + ok(!ret3, "close(STDERR_FILENO) failed\n"); + ok(!ret4, "GetHandleInformation succeeded\n"); + + DeleteFileA( "fdopen.tst" ); +} + START_TEST(file) { int arg_c; @@ -2393,6 +2451,7 @@ START_TEST(file) test_mktemp(); test__open_osfhandle(); test_write_flush(); + test_close(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Alexandre Julliard : wrc: Don' t convert class and menu names to uppercase in resource data.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 22cb2beb1cefb43928f194e4428bc30858cb34a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cb2beb1cefb43928f194e44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:28:32 2016 +0900 wrc: Don't convert class and menu names to uppercase in resource data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 8993a87..e23c789 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -657,11 +657,11 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) put_word(res, dlg->width); put_word(res, dlg->height); if(dlg->menu) - put_name_id(res, dlg->menu, TRUE, dlg->lvc.language); + put_name_id(res, dlg->menu, FALSE, dlg->lvc.language); else put_word(res, 0); if(dlg->dlgclass) - put_name_id(res, dlg->dlgclass, TRUE, dlg->lvc.language); + put_name_id(res, dlg->dlgclass, FALSE, dlg->lvc.language); else put_word(res, 0); if(dlg->title) @@ -709,7 +709,7 @@ static res_t *dialog2res(name_id_t *name, dialog_t *dlg) else put_word(res, ctrl->id); if(ctrl->ctlclass) - put_name_id(res, ctrl->ctlclass, TRUE, dlg->lvc.language); + put_name_id(res, ctrl->ctlclass, FALSE, dlg->lvc.language); else internal_error(__FILE__, __LINE__, "Control has no control-class\n"); if(ctrl->title)

1 0

Alexandre Julliard : wrc: Only allow control key characters ^A to ^Z.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: e8076eeced9b49b2e1211dd3f009105b39ed75bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8076eeced9b49b2e1211dd3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:29:45 2016 +0900 wrc: Only allow control key characters ^A to ^Z. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index e23c789..336e64e 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -297,8 +297,11 @@ static int parse_accel_string( const string_t *key, int flags ) } else if(key->str.cstr[0] == '^') { - keycode = toupper((unsigned char)key->str.cstr[1]) - '@'; - if(keycode >= ' ') + if (key->str.cstr[1] >= 'a' && key->str.cstr[1] <= 'z') + keycode = key->str.cstr[1] - 'a' + 1; + else if (key->str.cstr[1] >= 'A' && key->str.cstr[1] <= 'Z') + keycode = key->str.cstr[1] - 'A' + 1; + else { print_location( &key->loc ); error("Control-code out of range\n"); @@ -324,8 +327,11 @@ static int parse_accel_string( const string_t *key, int flags ) } else if(key->str.wstr[0] == '^') { - keycode = toupperW(key->str.wstr[1]) - '@'; - if(keycode >= ' ') + if (key->str.wstr[1] >= 'a' && key->str.wstr[1] <= 'z') + keycode = key->str.wstr[1] - 'a' + 1; + else if (key->str.wstr[1] >= 'A' && key->str.wstr[1] <= 'Z') + keycode = key->str.wstr[1] - 'A' + 1; + else { print_location( &key->loc ); error("Control-code out of range\n");

1 0

Alexandre Julliard : wrc: Avoid locale- or Unicode-dependent case conversions.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 865f23b5032171cdcd7221fce381c98f5ce6dd36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=865f23b5032171cdcd7221fce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:32:33 2016 +0900 wrc: Avoid locale- or Unicode-dependent case conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 6 ++++-- tools/wrc/parser.l | 2 +- tools/wrc/parser.y | 38 ++++++++++++-------------------------- tools/wrc/utils.c | 29 +++++++++++++++++++++++++++-- tools/wrc/utils.h | 2 ++ 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 336e64e..5b7e24c 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -263,11 +263,13 @@ static void string_to_upper(string_t *str) if(str->type == str_char) { - for (i = 0; i < str->size; i++) str->str.cstr[i] = toupper((unsigned char)str->str.cstr[i]); + for (i = 0; i < str->size; i++) + if (str->str.cstr[i] >= 'a' && str->str.cstr[i] <= 'z') str->str.cstr[i] -= 32; } else if(str->type == str_unicode) { - for (i = 0; i < str->size; i++) str->str.wstr[i] = toupperW(str->str.wstr[i]); + for (i = 0; i < str->size; i++) + if (str->str.wstr[i] >= 'a' && str->str.wstr[i] <= 'z') str->str.wstr[i] -= 32; } else { diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 80072b2..32a231b 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -250,7 +250,7 @@ static struct keyword keywords[] = { static int kw_cmp_func(const void *s1, const void *s2) { int ret; - ret = strcasecmp(KWP(s1)->keyword, KWP(s2)->keyword); + ret = compare_striA(KWP(s1)->keyword, KWP(s2)->keyword); if(!ret && (KWP(s1)->needcase || KWP(s2)->needcase)) return strcmp(KWP(s1)->keyword, KWP(s2)->keyword); else diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index b41e7d7..0f73f90 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2072,37 +2072,23 @@ static int get_class_idW(const WCHAR *cc) static const WCHAR szSTATIC[] = {'S','T','A','T','I','C',0}; static const WCHAR szSCROLLBAR[] = {'S','C','R','O','L','L','B','A','R',0}; - if(!strcmpiW(szBUTTON, cc)) - return CT_BUTTON; - if(!strcmpiW(szCOMBOBOX, cc)) - return CT_COMBOBOX; - if(!strcmpiW(szLISTBOX, cc)) - return CT_LISTBOX; - if(!strcmpiW(szEDIT, cc)) - return CT_EDIT; - if(!strcmpiW(szSTATIC, cc)) - return CT_STATIC; - if(!strcmpiW(szSCROLLBAR, cc)) - return CT_SCROLLBAR; - + if(!compare_striW(szBUTTON, cc)) return CT_BUTTON; + if(!compare_striW(szCOMBOBOX, cc)) return CT_COMBOBOX; + if(!compare_striW(szLISTBOX, cc)) return CT_LISTBOX; + if(!compare_striW(szEDIT, cc)) return CT_EDIT; + if(!compare_striW(szSTATIC, cc)) return CT_STATIC; + if(!compare_striW(szSCROLLBAR, cc)) return CT_SCROLLBAR; return -1; } static int get_class_idA(const char *cc) { - if(!strcasecmp("BUTTON", cc)) - return CT_BUTTON; - if(!strcasecmp("COMBOBOX", cc)) - return CT_COMBOBOX; - if(!strcasecmp("LISTBOX", cc)) - return CT_LISTBOX; - if(!strcasecmp("EDIT", cc)) - return CT_EDIT; - if(!strcasecmp("STATIC", cc)) - return CT_STATIC; - if(!strcasecmp("SCROLLBAR", cc)) - return CT_SCROLLBAR; - + if(!compare_striA("BUTTON", cc)) return CT_BUTTON; + if(!compare_striA("COMBOBOX", cc)) return CT_COMBOBOX; + if(!compare_striA("LISTBOX", cc)) return CT_LISTBOX; + if(!compare_striA("EDIT", cc)) return CT_EDIT; + if(!compare_striA("STATIC", cc)) return CT_STATIC; + if(!compare_striA("SCROLLBAR", cc)) return CT_SCROLLBAR; return -1; } diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5360b95..800692a 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -219,6 +219,31 @@ char *xstrdup(const char *str) return strcpy(s, str); } +int compare_striA( const char *str1, const char *str2 ) +{ + for (;;) + { + /* only the A-Z range is case-insensitive */ + char ch1 = (*str1 >= 'a' && *str1 <= 'z') ? *str1 + 'A' - 'a' : *str1; + char ch2 = (*str2 >= 'a' && *str2 <= 'z') ? *str2 + 'A' - 'a' : *str2; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + str1++; + str2++; + } +} + +int compare_striW( const WCHAR *str1, const WCHAR *str2 ) +{ + for (;;) + { + /* only the A-Z range is case-insensitive */ + WCHAR ch1 = (*str1 >= 'a' && *str1 <= 'z') ? *str1 + 'A' - 'a' : *str1; + WCHAR ch2 = (*str2 >= 'a' && *str2 <= 'z') ? *str2 + 'A' - 'a' : *str2; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + str1++; + str2++; + } +} /* ***************************************************************************** @@ -241,12 +266,12 @@ int compare_name_id(const name_id_t *n1, const name_id_t *n2) if(n1->name.s_name->type == str_char && n2->name.s_name->type == str_char) { - return strcasecmp(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); + return compare_striA(n1->name.s_name->str.cstr, n2->name.s_name->str.cstr); } else if(n1->name.s_name->type == str_unicode && n2->name.s_name->type == str_unicode) { - return strcmpiW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); + return compare_striW(n1->name.s_name->str.wstr, n2->name.s_name->str.wstr); } else { diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h index 19daa09..f0e8cd6 100644 --- a/tools/wrc/utils.h +++ b/tools/wrc/utils.h @@ -33,6 +33,8 @@ char *xstrdup(const char *str); #define __attribute__(X) #endif +int compare_striA( const char *str1, const char *str2 ); +int compare_striW( const WCHAR *str1, const WCHAR *str2 ); char *strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); int parser_error(const char *s, ...) __attribute__((format (printf, 1, 2))); int parser_warning(const char *s, ...) __attribute__((format (printf, 1, 2)));

1 0

Alexandre Julliard : wrc: Remove no longer needed use of libwine_static.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: fabf11c2406159c52919dc100b451a4b2cda8d42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabf11c2406159c52919dc100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:09 2016 +0900 wrc: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 2 +- tools/wrc/wrc.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 37dbe03..8c94ead 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -17,6 +17,6 @@ BISON_SRCS = parser.y wrc_EXTRADEFS = -DINCLUDEDIR="\"${includedir}\"" -EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWPP) $(LIBWINE_STATIC) +EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWPP) INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 4a0a749..cf8c793 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -21,7 +21,6 @@ #ifndef __WRC_WRC_H #define __WRC_WRC_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" #include "wrctypes.h"

1 0

Alexandre Julliard : wmc: Remove no longer needed use of libwine_static.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 8f4ee97092e7be6cc95313c259c5eac807ff18b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f4ee97092e7be6cc95313c25… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:40 2016 +0900 wmc: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/Makefile.in | 2 +- tools/wmc/lang.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 41b7236..a97da85 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -11,6 +11,6 @@ C_SRCS = \ BISON_SRCS = mcy.y -EXTRALIBS = $(GETTEXTPO_LIBS) $(LIBWINE_STATIC) +EXTRALIBS = $(GETTEXTPO_LIBS) INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 337d661..5a11c5b 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,7 +21,6 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" typedef struct language {

1 0

Alexandre Julliard : sfnt2fon: Remove no longer needed use of libwine_static.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 3712d9fdff1a56b1707df0ebfe72cdde35f38433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3712d9fdff1a56b1707df0ebf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 20 13:34:50 2016 +0900 sfnt2fon: Remove no longer needed use of libwine_static. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/Makefile.in | 2 +- tools/sfnt2fon/sfnt2fon.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/sfnt2fon/Makefile.in b/tools/sfnt2fon/Makefile.in index 5a92d85..c6d289f 100644 --- a/tools/sfnt2fon/Makefile.in +++ b/tools/sfnt2fon/Makefile.in @@ -3,4 +3,4 @@ PROGRAMS = sfnt2fon C_SRCS = sfnt2fon.c EXTRAINCL = $(FREETYPE_CFLAGS) -EXTRALIBS = $(FREETYPE_LIBS) $(LIBWINE_STATIC) +EXTRALIBS = $(FREETYPE_LIBS) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 7612bc2..ea915da 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -41,7 +41,6 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#define WINE_UNICODE_API /* nothing */ #include "wine/unicode.h" #include "wingdi.h" #include "basetsd.h"

1 0

Frédéric Delanoy : ntdll/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 22 Feb '16

22 Feb '16

Module: wine Branch: master Commit: 06b39c982d86777f408805967992a57a6811be2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b39c982d86777f408805967… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 19 22:10:55 2016 +0100 ntdll/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 7b1002a..f93c623 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -148,12 +148,8 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) if (namelen != len || memcmp(nameW, testfiles[i].nameW, len*sizeof(WCHAR))) continue; if (!testfiles[i].attr_done) { - if (testfiles[i].todo) { - todo_wine + todo_wine_if (testfiles[i].todo) ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } else { - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } testfiles[i].attr_done = TRUE; } testfiles[i].nfound++;

1 0