- Wine-Devel - list.winehq.org

[PATCH] ntdll/tests: Remove unused variable sbi from test_query_process
by Alex Henrie Sept. 5, 2021

Sept. 5, 2021

The code that used it was removed in commit 8ac77cfbf96689d83463928a9d0bdc5fcd054cb9. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/info.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e642427bffb..d05db6d1858 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -444,7 +444,6 @@ static void test_query_process(void) DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; - SYSTEM_BASIC_INFORMATION sbi; PROCESS_BASIC_INFORMATION pbi; THREAD_BASIC_INFORMATION tbi; OBJECT_ATTRIBUTES attr; @@ -492,8 +491,6 @@ static void test_query_process(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); spi = spi_buf; - pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength); - for (;;) { DWORD_PTR tid; -- 2.33.0

1 0

[PATCH] dbghelp: Use the internal modulename when comparing Module names.
by Alistair Leslie-Hughes Sept. 5, 2021

Sept. 5, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/elf_module.c | 4 ++-- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/symbol.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 7be7e8efce6..7f9f336d6b4 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1068,8 +1068,8 @@ static BOOL elf_load_debug_info_from_map(struct module* module, lret = dwarf2_parse(module, module->reloc_delta, thunks, fmap); ret = ret || lret; } - if (wcsstr(module->module.ModuleName, S_ElfW) || - !wcscmp(module->module.ModuleName, S_WineLoaderW)) + if (wcsstr(module->modulename, S_ElfW) || + !wcscmp(module->modulename, S_WineLoaderW)) { /* add the thunks for native libraries */ if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 3bc2a9e143a..66e9177c722 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -271,7 +271,7 @@ struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name for (module = pcs->lmodules; module; module = module->next) { - if (!wcsicmp(name, module->module.ModuleName)) return module; + if (!wcsnicmp(name, module->modulename, ARRAYSIZE(module->modulename))) return module; } SetLastError(ERROR_INVALID_NAME); return NULL; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 9863a736299..31cd7771ad2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1089,7 +1089,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, { if (pair.requested->type == DMT_PE && module_get_debug(&pair)) { - if (SymMatchStringW(pair.requested->module.ModuleName, mod, FALSE) && + if (SymMatchStringW(pair.requested->modulename, mod, FALSE) && symt_enum_module(&pair, bang + 1, se)) break; } @@ -1104,7 +1104,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, !module_get_containee(pair.pcs, pair.requested) && module_get_debug(&pair)) { - if (SymMatchStringW(pair.requested->module.ModuleName, mod, FALSE) && + if (SymMatchStringW(pair.requested->modulename, mod, FALSE) && symt_enum_module(&pair, bang + 1, se)) break; } -- 2.33.0

1 0

[PATCH] cmd: Fix capitalization of WCMD_ReadFile in comment
by Alex Henrie Sept. 5, 2021

Sept. 5, 2021

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index acf8f63b1f1..8c6ed1c057c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -212,7 +212,7 @@ void WCMD_leave_paged_mode(void) } /*************************************************************************** - * WCMD_Readfile + * WCMD_ReadFile * * Read characters in from a console/file, returning result in Unicode */ -- 2.33.0

1 0

[PATCH] msvcp140_1: Remove __cdecl on static functions where not needed.
by Francois Gouget Sept. 5, 2021

Sept. 5, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcp140_1/msvcp140_1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index 823adedf3ac..c6a6ff19f13 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -64,7 +64,7 @@ void __cdecl MSVCRT_operator_delete(void *mem) free(mem); } -static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) +static void* MSVCRT_operator_new_aligned(size_t size, size_t alignment) { void *retval; int freed; @@ -85,7 +85,7 @@ static void* __cdecl MSVCRT_operator_new_aligned(size_t size, size_t alignment) return NULL; } -static void __cdecl MSVCRT_operator_delete_aligned(void *mem, size_t alignment) +static void MSVCRT_operator_delete_aligned(void *mem, size_t alignment) { _aligned_free(mem); } -- 2.30.2

2 1

How to install Wine?
by igor evgen Sept. 5, 2021

Sept. 5, 2021

Hi there, I tried to install Wine (whatever latest version) on my Ubuntu 21.04. My computer Terminal advised: <wget dl.winehq.org/wine-builds/Release.key sudo apt-key add Release.key sudo apt-add-repository 'dl.winehq.org/wine-builds/ubuntu'>. The above was followed & done more than once, including the way recommended by winehq.org. (I mean to enter a site, copy a command to a Terminal, etc., as a dummy does.) However, Terminal answered: <The following packages have unmet dependencies. winehq-stable : Depends: wine-stable (= 6.0.1~hirsute-1) E: Unable to correct problems, you have held broken packages.> Does it mean that Wine cannot be installed on my 21.04? Kindly note, I am not a computer engineer, just a user.What I quoted from the Terminal program is not my expertise. Thank you.Igor

2 1

[PATCH] sppc: Stub SLClose.
by Esme Povirk Sept. 4, 2021

Sept. 4, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/slc/slc.spec | 2 +- dlls/sppc/sppc.c | 7 +++++++ dlls/sppc/sppc.spec | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 19895041a32..a5250df23b9 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -6,7 +6,7 @@ @ stub SLpGetLicenseAcquisitionInfo @ stub SLpGetMachineUGUID @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) sppc.SLClose @ stub SLConsumeRight @ stub SLConsumeWindowsRight @ stub SLDepositOfflineConfirmationId diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index c05f15a28db..ce3183f39bd 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -51,6 +51,13 @@ HRESULT WINAPI SLOpen(HSLC *handle) return S_OK; } +HRESULT WINAPI SLClose(HSLC handle) +{ + FIXME("(%p) stub\n", handle ); + + return S_OK; +} + HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); diff --git a/dlls/sppc/sppc.spec b/dlls/sppc/sppc.spec index 3ac40c23972..6926d4d8b6d 100644 --- a/dlls/sppc/sppc.spec +++ b/dlls/sppc/sppc.spec @@ -17,7 +17,7 @@ @ stub SLpSetActivationInProgress @ stub SLpTriggerServiceWorker @ stub SLpVLActivateProduct -@ stub SLClose +@ stdcall SLClose(ptr) @ stub SLConsumeRight @ stub SLDepositMigrationBlob @ stub SLDepositOfflineConfirmationId -- 2.25.1

1 0

[PATCH 2/2] wininet: Decoding is enabled by default
by Alistair Leslie-Hughes Sept. 4, 2021

Sept. 4, 2021

Unless explicitly turned off decoding of gzip, deflate is supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 62 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cef151c7bf2..4ac66660aa3 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -107,6 +107,7 @@ void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t si if(!ret) return NULL; + ret->decoding = -1; list_init(&ret->children); EnterCriticalSection( &WININET_cs ); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..462c7a47635 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -283,7 +283,7 @@ struct _object_header_t ULONG ErrorMask; DWORD dwInternalFlags; LONG refs; - BOOL decoding; + INT decoding; INTERNET_STATUS_CALLBACK lpfnStatusCB; struct list entry; struct list children; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d32f01be2c5..ed35025d5f4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3523,6 +3523,67 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_deflate(int port) +{ + DWORD len; + char buf[256]; + HINTERNET ses, con, req; + BOOL ret; + BOOL b; + char binary[] = "\x1f\x8b\x08"; + char text[] = "<!DOCTYPE HTML PUBLIC"; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "test.winehq.org", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + /* Default Decoding */ + req = HttpOpenRequestA(con, NULL, "/tests/gzip.php", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, L"Accept-Encoding: gzip, deflate", ~0u, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + len = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_LENGTH, buf, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND , "got %u\n", GetLastError()); + + ret = InternetReadFile(req, buf, 256, &len); + ok(ret, "InternetReadFile failed %d\n", GetLastError()); + ok(!strncmp(buf, text, strlen(text)), "got %s\n", debugstr_a(buf)); + + InternetCloseHandle(req); + InternetCloseHandle(con); + + /* Disabled Decoding */ + b = FALSE; + InternetSetOptionA(ses, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); + + con = InternetConnectA(ses, "test.winehq.org", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/tests/gzip.php", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, L"Accept-Encoding: gzip, deflate", ~0u, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + ret = InternetReadFile(req, buf, 256, &len); + ok(ret, "InternetReadFile failed %d\n", GetLastError()); + ok(!strncmp(buf, binary, strlen(binary)), "got %s\n", debugstr_a(buf)); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6097,6 +6158,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_deflate(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH 1/2] wininet: Set context length for http status 403
by Alistair Leslie-Hughes Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 +++- dlls/wininet/tests/http.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..4bfd93aa3be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,9 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..d32f01be2c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,11 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n\r\n"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3492,37 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD len; + char buf[256]; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + len = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_LENGTH, buf, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND , "got %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6096,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH v2 1/2] server: Add helper functions to perform atomic stores.
by Zebediah Figura Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/fd.c | 61 ++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/server/fd.c b/server/fd.c index a09fc9edfcf..79ddd0a96a9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -385,41 +385,44 @@ timeout_t monotonic_time; struct _KUSER_SHARED_DATA *user_shared_data = NULL; static const int user_shared_data_timeout = 16; +static void atomic_store_ulong(volatile ULONG *ptr, ULONG value) +{ + /* on x86 there should be total store order guarantees, so volatile is + * enough to ensure the stores aren't reordered by the compiler, and then + * they will always be seen in-order from other CPUs. On other archs, we + * need atomic intrinsics to guarantee that. */ +#if defined(__i386__) || defined(__x86_64__) + *ptr = value; +#else + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); +#endif +} + +static void atomic_store_long(volatile LONG *ptr, LONG value) +{ +#if defined(__i386__) || defined(__x86_64__) + *ptr = value; +#else + __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); +#endif +} + static void set_user_shared_data_time(void) { timeout_t tick_count = monotonic_time / 10000; - /* on X86 there should be total store order guarantees, so volatile is enough - * to ensure the stores aren't reordered by the compiler, and then they will - * always be seen in-order from other CPUs. On other archs, we need atomic - * intrinsics to guarantee that. */ -#if defined(__i386__) || defined(__x86_64__) - user_shared_data->SystemTime.High2Time = current_time >> 32; - user_shared_data->SystemTime.LowPart = current_time; - user_shared_data->SystemTime.High1Time = current_time >> 32; + atomic_store_long(&user_shared_data->SystemTime.High2Time, current_time >> 32); + atomic_store_ulong(&user_shared_data->SystemTime.LowPart, current_time); + atomic_store_long(&user_shared_data->SystemTime.High1Time, current_time >> 32); - user_shared_data->InterruptTime.High2Time = monotonic_time >> 32; - user_shared_data->InterruptTime.LowPart = monotonic_time; - user_shared_data->InterruptTime.High1Time = monotonic_time >> 32; + atomic_store_long(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32); + atomic_store_ulong(&user_shared_data->InterruptTime.LowPart, monotonic_time); + atomic_store_long(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32); - user_shared_data->TickCount.High2Time = tick_count >> 32; - user_shared_data->TickCount.LowPart = tick_count; - user_shared_data->TickCount.High1Time = tick_count >> 32; - *(volatile ULONG *)&user_shared_data->TickCountLowDeprecated = tick_count; -#else - __atomic_store_n(&user_shared_data->SystemTime.High2Time, current_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.LowPart, current_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->SystemTime.High1Time, current_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->InterruptTime.High2Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.LowPart, monotonic_time, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->InterruptTime.High1Time, monotonic_time >> 32, __ATOMIC_SEQ_CST); - - __atomic_store_n(&user_shared_data->TickCount.High2Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.LowPart, tick_count, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCount.High1Time, tick_count >> 32, __ATOMIC_SEQ_CST); - __atomic_store_n(&user_shared_data->TickCountLowDeprecated, tick_count, __ATOMIC_SEQ_CST); -#endif + atomic_store_long(&user_shared_data->TickCount.High2Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCount.LowPart, tick_count); + atomic_store_long(&user_shared_data->TickCount.High1Time, tick_count >> 32); + atomic_store_ulong(&user_shared_data->TickCountLowDeprecated, tick_count); } void set_current_time(void) -- 2.33.0

1 1

[PATCH] windowscodecs: Make the jpeg_encoder_*() functions static.
by Francois Gouget Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windowscodecs/libjpeg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 96a9b79f358..dff13c90db2 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -535,7 +535,7 @@ static void dest_mgr_term_destination(j_compress_ptr cinfo) } } -HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) +static HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -570,7 +570,7 @@ HRESULT CDECL jpeg_encoder_initialize(struct encoder* iface, IStream *stream) return S_OK; } -HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, +static HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -590,7 +590,7 @@ HRESULT CDECL jpeg_encoder_get_supported_format(struct encoder* iface, GUID *pix return S_OK; } -HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) +static HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct encoder_frame *frame) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -629,7 +629,7 @@ HRESULT CDECL jpeg_encoder_create_frame(struct encoder* iface, const struct enco return S_OK; } -HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, +static HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, DWORD line_count, DWORD stride) { struct jpeg_encoder *This = impl_from_encoder(iface); @@ -690,7 +690,7 @@ HRESULT CDECL jpeg_encoder_write_lines(struct encoder* iface, BYTE *data, return S_OK; } -HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); jmp_buf jmpbuf; @@ -705,12 +705,12 @@ HRESULT CDECL jpeg_encoder_commit_frame(struct encoder* iface) return S_OK; } -HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) +static HRESULT CDECL jpeg_encoder_commit_file(struct encoder* iface) { return S_OK; } -void CDECL jpeg_encoder_destroy(struct encoder* iface) +static void CDECL jpeg_encoder_destroy(struct encoder* iface) { struct jpeg_encoder *This = impl_from_encoder(iface); if (This->cinfo_initialized) -- 2.30.2

2 1