wine-commits September 2023

wine-commits@winehq.org

1 participants
920 discussions

Hans Leidekker : ws2_32/tests: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 3c2e980d8df165a20dfd894ddfbc69e78b4e4881 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c2e980d8df165a20dfd894ddfbc69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 11:30:11 2023 +0200 ws2_32/tests: Call GetAdaptersAddresses() in a loop. --- dlls/ws2_32/tests/sock.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2899f17dfba..a1fefb45d1e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12236,12 +12236,29 @@ static void test_get_interface_list(void) closesocket(s); } +static IP_ADAPTER_ADDRESSES *get_adapters(void) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static void test_bind(void) { const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; - IP_ADAPTER_ADDRESSES *adapters = NULL, *adapter; - ULONG ip_addrs_size = 0; + IP_ADAPTER_ADDRESSES *adapters, *adapter; struct sockaddr addr; SOCKET s, s2; int ret, len; @@ -12313,11 +12330,8 @@ static void test_bind(void) closesocket(s); - ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &ip_addrs_size); - ok(ret == ERROR_BUFFER_OVERFLOW, "got error %u\n", ret); - adapters = malloc(ip_addrs_size); - ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &ip_addrs_size); - ok(!ret, "got error %u\n", ret); + adapters = get_adapters(); + ok(adapters != NULL, "can't get adapters\n"); for (adapter = adapters; adapter != NULL; adapter = adapter->Next) {

1 0

Hans Leidekker : ws2_32/tests: Use CRT allocation functions.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: e5df70ce6cef381fca24badd9ac1a18350cde13d URL: https://gitlab.winehq.org/wine/wine/-/commit/e5df70ce6cef381fca24badd9ac1a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 11:19:06 2023 +0200 ws2_32/tests: Use CRT allocation functions. --- dlls/ws2_32/tests/protocol.c | 32 ++++++++++++++++---------------- dlls/ws2_32/tests/sock.c | 14 +++++++------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 91356c43f7c..8a1efb6b5d0 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -96,7 +96,7 @@ static void test_WSAEnumProtocolsA(void) error = WSAGetLastError(); ok( error == WSAENOBUFS, "Expected 10055, received %ld\n", error); - buffer = HeapAlloc( GetProcessHeap(), 0, len ); + buffer = malloc( len ); if (buffer) { @@ -113,7 +113,7 @@ static void test_WSAEnumProtocolsA(void) buffer[i].dwServiceFlags1); } - HeapFree( GetProcessHeap(), 0, buffer ); + free( buffer ); } /* Test invalid protocols in the list */ @@ -123,7 +123,7 @@ static void test_WSAEnumProtocolsA(void) ok( error == WSAENOBUFS || broken(error == WSAEFAULT) /* NT4 */, "Expected 10055, received %ld\n", error); - buffer = HeapAlloc( GetProcessHeap(), 0, len ); + buffer = malloc( len ); if (buffer) { @@ -141,7 +141,7 @@ static void test_WSAEnumProtocolsA(void) } ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); - HeapFree( GetProcessHeap(), 0, buffer ); + free( buffer ); } } @@ -164,7 +164,7 @@ static void test_WSAEnumProtocolsW(void) error = WSAGetLastError(); ok( error == WSAENOBUFS, "Expected 10055, received %ld\n", error); - buffer = HeapAlloc( GetProcessHeap(), 0, len ); + buffer = malloc( len ); if (buffer) { @@ -181,7 +181,7 @@ static void test_WSAEnumProtocolsW(void) buffer[i].dwServiceFlags1); } - HeapFree( GetProcessHeap(), 0, buffer ); + free( buffer ); } /* Test invalid protocols in the list */ @@ -191,7 +191,7 @@ static void test_WSAEnumProtocolsW(void) ok( error == WSAENOBUFS || broken(error == WSAEFAULT) /* NT4 */, "Expected 10055, received %ld\n", error); - buffer = HeapAlloc( GetProcessHeap(), 0, len ); + buffer = malloc( len ); if (buffer) { @@ -209,7 +209,7 @@ static void test_WSAEnumProtocolsW(void) } ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); - HeapFree( GetProcessHeap(), 0, buffer ); + free( buffer ); } } @@ -2595,8 +2595,8 @@ static void test_gethostbyname(void) ret = GetIpForwardTable(NULL, &route_size, FALSE); ok(ret == ERROR_INSUFFICIENT_BUFFER, "GetIpForwardTable failed with a different error: %d\n", ret); - adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); - routes = HeapAlloc(GetProcessHeap(), 0, route_size); + adapters = malloc(adap_size); + routes = malloc(route_size); ret = GetAdaptersInfo(adapters, &adap_size); ok(ret == NO_ERROR, "GetAdaptersInfo failed, error: %d\n", ret); @@ -2633,8 +2633,8 @@ static void test_gethostbyname(void) ok(found_default, "failed to find the first IP from gethostbyname!\n"); cleanup: - HeapFree(GetProcessHeap(), 0, adapters); - HeapFree(GetProcessHeap(), 0, routes); + free(adapters); + free(routes); } static void test_gethostbyname_hack(void) @@ -2792,13 +2792,13 @@ static void test_WSAEnumNameSpaceProvidersA(void) todo_wine ok(error == WSAEFAULT, "Expected 10014, got %lu\n", error); - name = HeapAlloc(GetProcessHeap(), 0, len); + name = malloc(len); ret = WSAEnumNameSpaceProvidersA(&len, name); todo_wine ok(ret > 0, "Expected more than zero name space providers\n"); - HeapFree(GetProcessHeap(), 0, name); + free(name); } static void test_WSAEnumNameSpaceProvidersW(void) @@ -2839,7 +2839,7 @@ static void test_WSAEnumNameSpaceProvidersW(void) todo_wine ok(error == WSAEFAULT, "Expected 10014, got %lu\n", error); - name = HeapAlloc(GetProcessHeap(), 0, len); + name = malloc(len); ret = WSAEnumNameSpaceProvidersW(&len, name); todo_wine @@ -2868,7 +2868,7 @@ static void test_WSAEnumNameSpaceProvidersW(void) } } - HeapFree(GetProcessHeap(), 0, name); + free(name); } static void test_WSCGetProviderInfo(void) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e53d9991e56..2899f17dfba 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3114,7 +3114,7 @@ static void test_WSASocket(void) ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", err, WSAENOBUFS); - pi = HeapAlloc(GetProcessHeap(), 0, pi_size); + pi = malloc(pi_size); ok(pi != NULL, "Failed to allocate memory\n"); items = WSAEnumProtocolsA(wsaproviders, pi, &pi_size); @@ -3123,7 +3123,7 @@ static void test_WSASocket(void) if (items == 0) { skip("No protocols enumerated.\n"); - HeapFree(GetProcessHeap(), 0, pi); + free(pi); return; } @@ -3210,7 +3210,7 @@ static void test_WSASocket(void) closesocket(sock); - HeapFree(GetProcessHeap(), 0, pi); + free(pi); pi_size = 0; items = WSAEnumProtocolsA(NULL, NULL, &pi_size); @@ -3220,7 +3220,7 @@ static void test_WSASocket(void) ok(err == WSAENOBUFS, "WSAEnumProtocolsA error is %d, not WSAENOBUFS(%d)\n", err, WSAENOBUFS); - pi = HeapAlloc(GetProcessHeap(), 0, pi_size); + pi = malloc(pi_size); ok(pi != NULL, "Failed to allocate memory\n"); items = WSAEnumProtocolsA(NULL, pi, &pi_size); @@ -3277,7 +3277,7 @@ static void test_WSASocket(void) closesocket(sock); } - HeapFree(GetProcessHeap(), 0, pi); + free(pi); SetLastError(0xdeadbeef); /* starting on vista the socket function returns error during the socket @@ -5944,7 +5944,7 @@ static void test_send(void) hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); - buffer = HeapAlloc(GetProcessHeap(), 0, buflen); + buffer = malloc(buflen); /* fill the buffer with some nonsense */ for (i = 0; i < buflen; ++i) @@ -6022,7 +6022,7 @@ end: } if (ov.hEvent) CloseHandle(ov.hEvent); - HeapFree(GetProcessHeap(), 0, buffer); + free(buffer); } #define WM_SOCKET (WM_USER+100)

1 0

Biswapriyo Nath : include: Add IPackage2 definition in windows.applicationmodel.idl.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: e08435a89171f917e9eaca8c71f4c03056bc13ff URL: https://gitlab.winehq.org/wine/wine/-/commit/e08435a89171f917e9eaca8c71f4c0… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Sep 8 08:54:59 2023 +0000 include: Add IPackage2 definition in windows.applicationmodel.idl. Required for GNOME/glib project. --- include/windows.applicationmodel.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/windows.applicationmodel.idl b/include/windows.applicationmodel.idl index 9c3718dc87d..dfb22d5c371 100644 --- a/include/windows.applicationmodel.idl +++ b/include/windows.applicationmodel.idl @@ -36,6 +36,7 @@ namespace Windows.ApplicationModel { interface IAppDisplayInfo; interface IPackage; + interface IPackage2; interface IPackage3; interface IPackageStatus; interface IPackageId; @@ -92,6 +93,22 @@ namespace Windows.ApplicationModel { [propget] HRESULT Dependencies([out, retval] Windows.Foundation.Collections.IVectorView<Windows.ApplicationModel.Package *> **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.ApplicationModel.Package), + uuid(a6612fb6-7688-4ace-95fb-359538e7aa01) + ] + interface IPackage2 : IInspectable + { + [propget] HRESULT DisplayName([out, retval] HSTRING *value); + [propget] HRESULT PublisherDisplayName([out, retval] HSTRING *value); + [propget] HRESULT Description([out, retval] HSTRING *value); + [propget] HRESULT Logo([out, retval] Windows.Foundation.Uri **value); + [propget] HRESULT IsResourcePackage([out, retval] boolean *value); + [propget] HRESULT IsBundle([out, retval] boolean *value); + [propget] HRESULT IsDevelopmentMode([out, retval] boolean *value); + } + [ exclusiveto(Windows.ApplicationModel.Package), uuid(5f738b61-f86a-4917-93d1-f1ee9d3b35d9),

1 0

Stefan Dösinger : d3d8/tests: Don't check messages when doing the minimization workaround dance.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 763dc064504d729029f227e220c858fdb8a8178e URL: https://gitlab.winehq.org/wine/wine/-/commit/763dc064504d729029f227e220c858… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 6 14:40:52 2023 +0300 d3d8/tests: Don't check messages when doing the minimization workaround dance. --- dlls/d3d8/tests/device.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ec6f2ce51b3..b61ad207cc9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3203,9 +3203,15 @@ static void test_wndproc(void) /* I have to minimize and restore the focus window, otherwise native d3d8 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window - * restore is triggered by the user. */ + * restore is triggered by the user. + * + * fvwm randomly sends a focus loss notification when we minimize, so do it + * before checking the incoming messages. It might match WM_ACTIVATEAPP but has + * a wrong WPARAM. Use SW_SHOWMINNOACTIVE to make sure we don't accidentally + * activate the window at this point and miss our WM_ACTIVATEAPP(wparam=1). */ + ShowWindow(focus_window, SW_SHOWMINNOACTIVE); + flush_events(); expect_messages = reactivate_messages; - ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ SetForegroundWindow(focus_window);

1 0

Stefan Dösinger : d3d9/tests: Don't check messages when doing the minimization workaround dance.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 49e1d2ea215548a30db6962e24030da4a24557cd URL: https://gitlab.winehq.org/wine/wine/-/commit/49e1d2ea215548a30db6962e24030d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 6 14:38:46 2023 +0300 d3d9/tests: Don't check messages when doing the minimization workaround dance. --- dlls/d3d9/tests/device.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d36b76156f5..c972e97f572 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4230,9 +4230,15 @@ static void test_wndproc(void) /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window - * restore is triggered by the user. */ + * restore is triggered by the user. + * + * fvwm randomly sends a focus loss notification when we minimize, so do it + * before checking the incoming messages. It might match WM_ACTIVATEAPP but has + * a wrong WPARAM. Use SW_SHOWMINNOACTIVE to make sure we don't accidentally + * activate the window at this point and miss our WM_ACTIVATEAPP(wparam=1). */ + ShowWindow(focus_window, SW_SHOWMINNOACTIVE); + flush_events(); expect_messages = tests[i].reactivate_messages; - ShowWindow(focus_window, SW_MINIMIZE); ShowWindow(focus_window, SW_RESTORE); /* Set focus twice to make KDE and fvwm in focus-follows-mouse mode happy. */ SetForegroundWindow(focus_window);

1 0

Stefan Dösinger : d3d9/tests: Don't fail test_reset_fullscreen if the WM resizes us.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 4bc8b73cf34175faea59b152878c484d16d7feda URL: https://gitlab.winehq.org/wine/wine/-/commit/4bc8b73cf34175faea59b152878c48… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 6 14:11:07 2023 +0300 d3d9/tests: Don't fail test_reset_fullscreen if the WM resizes us. fvwm does that for two independent reasons. The important thing is that we don't receive a WM_SIZE during the reset call itself. --- dlls/d3d9/tests/device.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8284e3365c8..d36b76156f5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4757,6 +4757,7 @@ static void test_reset_fullscreen(void) IDirect3DDevice9 *device; WNDCLASSEXA wc = {0}; IDirect3D9 *d3d; + RECT r1, r2; HRESULT hr; ATOM atom; static const struct message messages[] = @@ -4835,7 +4836,35 @@ static void test_reset_fullscreen(void) device_desc.flags = CREATE_DEVICE_FULLSCREEN; ok(SUCCEEDED(reset_device(device, &device_desc)), "Failed to reset device.\n"); + /* We shouldn't receive a WM_SIZE message during the reset because d3d filters + * messages sent to the focus window. This is important because some games + * respond to WM_SIZE messages by calling Reset(), resulting in an endless + * recursion. */ + ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); + GetWindowRect(device_window, &r1); + flush_events(); + GetWindowRect(device_window, &r2); + + /* fvwm2 and 3 resize the window though. We learn about this when processing + * events, after Reset() has finished and d3d is no longer filtering window + * messages. This still shouldn't happen but won't lead to an endless recursion. + * + * As far as I understand the fvwm3 source code, the WM doesn't expect a window + * to change from size A maximized to size B maximized. It will un-maximize the + * window, picking the stored normal size - which appens to be the size of the + * first fullscreen mode above, but not necessarily the screen size at startup. + * + * fvwm2 on the other hand doesn't understand mode switches at all. It will see + * the window is fullscreen (it has separate flags for fullscreen and maximized), + * and try to resize it to what it thinks is the display mode - which is the mode + * that fvwm2 was started with. The above fvwm3 bug also exists in fvwm2 but is + * hidden by the mode bug. + * + * This comment is based on a very superficial understanding of fvwm's event + * and window dimension handling code, which is about 10k lines of code. So it + * may be wrong. */ + todo_wine_if(!EqualRect(&r1, &r2)) ok(!wm_size_received, "Received unexpected WM_SIZE message.\n"); cleanup:

1 0

Alex Henrie : winemenubuilder: Use CRT allocation functions.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: a0e28f3fdb5cb0be46210d8626824b6c649f7fe4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0e28f3fdb5cb0be46210d8626824b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 7 19:22:13 2023 -0600 winemenubuilder: Use CRT allocation functions. --- programs/winemenubuilder/winemenubuilder.c | 144 ++++++++++++++--------------- 1 file changed, 72 insertions(+), 72 deletions(-)

1 0

Alex Henrie : wineboot: Use CRT allocation functions.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: dab59ded277ea5e1e3884bb6f05e1b40a9f6a474 URL: https://gitlab.winehq.org/wine/wine/-/commit/dab59ded277ea5e1e3884bb6f05e1b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 7 19:12:10 2023 -0600 wineboot: Use CRT allocation functions. --- programs/wineboot/shutdown.c | 15 ++++++------ programs/wineboot/wineboot.c | 57 ++++++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 37 deletions(-)

1 0

Alex Henrie : oleview: Use CRT allocation functions.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 58e62fff585fc27c7590bee103203c27710d0283 URL: https://gitlab.winehq.org/wine/wine/-/commit/58e62fff585fc27c7590bee103203c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 7 19:03:13 2023 -0600 oleview: Use CRT allocation functions. --- programs/oleview/pane.c | 6 +++--- programs/oleview/tree.c | 4 ++-- programs/oleview/typelib.c | 26 ++++++++++++-------------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index 9e4cd283759..2465331ddc8 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -120,7 +120,7 @@ static LRESULT CALLBACK PaneProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa HIWORD(lParam), TRUE); break; case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pane); + free(pane); break; default: return DefWindowProcW(hWnd, uMsg, wParam, lParam); @@ -149,12 +149,12 @@ BOOL CreatePanedWindow(HWND hWnd, HWND *hWndCreated, HINSTANCE hInst) const WCHAR wszPaneClass[] = { 'P','A','N','E','\0' }; PANE *pane; - pane = HeapAlloc(GetProcessHeap(), 0, sizeof(PANE)); + pane = malloc(sizeof(PANE)); *hWndCreated = CreateWindowW(wszPaneClass, NULL, WS_CHILD|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWnd, (HMENU)pane, hInst, NULL); if(!*hWndCreated) { - HeapFree(GetProcessHeap(), 0, pane); + free(pane); return FALSE; } diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index b63a881a53f..e8f04322423 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -41,7 +41,7 @@ static LPARAM CreateITEM_INFO(INT flag, const WCHAR *info, const WCHAR *clsid, c { ITEM_INFO *reg; - reg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITEM_INFO)); + reg = calloc(1, sizeof(ITEM_INFO)); reg->cFlag = flag; lstrcpyW(reg->info, info); @@ -651,7 +651,7 @@ static LRESULT CALLBACK TreeProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa { if (info->loaded) ReleaseInst(nm->itemOld.hItem); - HeapFree(GetProcessHeap(), 0, info); + free(info); } break; } diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index e5e6b8f8f57..fd49cbd1782 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -124,13 +124,13 @@ static void SaveIdl(WCHAR *wszFileName) } len = WideCharToMultiByte( CP_UTF8, 0, data->idl, data->idlLen, NULL, 0, NULL, NULL ); - wszIdl = HeapAlloc(GetProcessHeap(), 0, len); + wszIdl = malloc(len); WideCharToMultiByte( CP_UTF8, 0, data->idl, data->idlLen, wszIdl, len, NULL, NULL ); if(!WriteFile(hFile, wszIdl, len, &dwNumWrite, NULL)) ShowLastError(); - HeapFree(GetProcessHeap(), 0, wszIdl); + free(wszIdl); CloseHandle(hFile); } @@ -183,8 +183,7 @@ static void AddToTLDataStrW(TYPELIB_DATA *pTLData, const WCHAR *wszSource) { int SourceLen = lstrlenW(wszSource); - pTLData->idl = HeapReAlloc(GetProcessHeap(), 0, pTLData->idl, - sizeof(WCHAR)*(pTLData->idlLen+SourceLen+1)); + pTLData->idl = realloc(pTLData->idl, sizeof(WCHAR) * (pTLData->idlLen + SourceLen + 1)); memcpy(&pTLData->idl[pTLData->idlLen], wszSource, sizeof(WCHAR)*(SourceLen+1)); pTLData->idlLen += SourceLen; @@ -205,8 +204,8 @@ static void AddToTLDataStrWithTabsW(TYPELIB_DATA *pTLData, WCHAR *wszSource) } if(*(pSourcePos - 1) != L'\n') newLinesNo++; - pTLData->idl = HeapReAlloc(GetProcessHeap(), 0, pTLData->idl, - sizeof(WCHAR)*(pTLData->idlLen+lineLen+4*newLinesNo+1)); + pTLData->idl = realloc(pTLData->idl, + sizeof(WCHAR) * (pTLData->idlLen + lineLen + 4 * newLinesNo + 1)); pSourcePos = wszSource; pSourceBeg = wszSource; @@ -244,9 +243,9 @@ static TYPELIB_DATA *InitializeTLData(void) { TYPELIB_DATA *pTLData; - pTLData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TYPELIB_DATA)); + pTLData = calloc(1, sizeof(TYPELIB_DATA)); - pTLData->idl = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + pTLData->idl = malloc(sizeof(WCHAR)); pTLData->idl[0] = '\0'; return pTLData; @@ -572,12 +571,11 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszAfter); } - bstrParamNames = HeapAlloc(GetProcessHeap(), 0, - sizeof(BSTR)*(pFuncDesc->cParams+1)); + bstrParamNames = malloc(sizeof(BSTR) * (pFuncDesc->cParams + 1)); if(FAILED(ITypeInfo_GetNames(pTypeInfo, pFuncDesc->memid, bstrParamNames, pFuncDesc->cParams+1, &namesNo))) { - HeapFree(GetProcessHeap(), 0, bstrParamNames); + free(bstrParamNames); continue; } SysFreeString(bstrParamNames[0]); @@ -660,7 +658,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, L");\n"); SendMessageW(typelib.hTree, TVM_INSERTITEMW, 0, (LPARAM)&tvis); - HeapFree(GetProcessHeap(), 0, bstrParamNames); + free(bstrParamNames); SysFreeString(bstrName); SysFreeString(bstrHelpString); ITypeInfo_ReleaseFuncDesc(pTypeInfo, pFuncDesc); @@ -1449,8 +1447,8 @@ static void EmptyTLTree(void) SendMessageW(typelib.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); if(tvi.lParam) { - HeapFree(GetProcessHeap(), 0, ((TYPELIB_DATA *)tvi.lParam)->idl); - HeapFree(GetProcessHeap(), 0, (TYPELIB_DATA *)tvi.lParam); + free(((TYPELIB_DATA*)tvi.lParam)->idl); + free((TYPELIB_DATA*)tvi.lParam); } SendMessageW(typelib.hTree, TVM_DELETEITEM, 0, (LPARAM)del);

1 0

Alex Henrie : extrac32: Use CRT allocation functions.
by Alexandre Julliard 08 Sep '23

08 Sep '23

Module: wine Branch: master Commit: 810bde3b2538cf0e1a433804ebf0070acc4fc4bd URL: https://gitlab.winehq.org/wine/wine/-/commit/810bde3b2538cf0e1a433804ebf007… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 7 18:58:48 2023 -0600 extrac32: Use CRT allocation functions. --- programs/extrac32/extrac32.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 3741f16b3cd..6d6dd2eb2ef 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -136,13 +136,12 @@ static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) BOOL new_arg; WINE_TRACE("cmdline: %s\n", wine_dbgstr_w(cmdline)); - str = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); + str = wcsdup(cmdline); if(!str) return NULL; - lstrcpyW(str, cmdline); - argv = HeapAlloc(GetProcessHeap(), 0, (max_argc + 1) * sizeof(LPWSTR)); + argv = malloc((max_argc + 1) * sizeof(WCHAR*)); if(!argv) { - HeapFree(GetProcessHeap(), 0, str); + free(str); return NULL; } @@ -192,11 +191,10 @@ static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) /* Realloc argv here because there always should be at least one reserved cell for terminating NULL */ max_argc *= 2; - argv = HeapReAlloc(GetProcessHeap(), 0, argv, - (max_argc + 1) * sizeof(LPWSTR)); + argv = realloc(argv, (max_argc + 1) * sizeof(WCHAR*)); if(!argv) { - HeapFree(GetProcessHeap(), 0, str); + free(str); return NULL; } }

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
92
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 September 2023