November 2023 - Wine-commits

Zebediah Figura : d3d10core/tests: Use slightly different values in test_sample_c_lz().
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 37845b0e41550453d2a7687a1f8b7f83f6295d76 URL: https://gitlab.winehq.org/wine/wine/-/commit/37845b0e41550453d2a7687a1f8b7f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 26 15:21:35 2023 -0500 d3d10core/tests: Use slightly different values in test_sample_c_lz(). For some arcane reason the native AMD driver on Windows seems to fail to clear (or read from?) layer 0. Work around that by using 0.0 there. --- dlls/d3d10core/tests/d3d10core.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 8db3b1abff6..fadf9211640 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -8427,7 +8427,7 @@ static void test_sample_c_lz(void) 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, }; - static const float depth_values[] = {1.0f, 0.0f, 0.5f, 0.6f, 0.4f, 0.1f}; + static const float depth_values[] = {0.0f, 1.0f, 0.5f, 0.6f, 0.4f, 0.1f}; static const struct { unsigned int layer; @@ -8436,8 +8436,8 @@ static void test_sample_c_lz(void) } tests[] = { - {0, 0.5f, 0.0f}, - {1, 0.5f, 1.0f}, + {0, 0.5f, 1.0f}, + {1, 0.5f, 0.0f}, {2, 0.5f, 0.0f}, {3, 0.5f, 0.0f}, {4, 0.5f, 1.0f}, @@ -8450,8 +8450,8 @@ static void test_sample_c_lz(void) {4, 0.0f, 0.0f}, {5, 0.0f, 0.0f}, - {0, 1.0f, 0.0f}, - {1, 1.0f, 1.0f}, + {0, 1.0f, 1.0f}, + {1, 1.0f, 0.0f}, {2, 1.0f, 1.0f}, {3, 1.0f, 1.0f}, {4, 1.0f, 1.0f}, @@ -8538,6 +8538,8 @@ static void test_sample_c_lz(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + winetest_push_context("Layer %u, ref %f", tests[i].layer, tests[i].d_ref); + ps_constant.x = tests[i].d_ref; ps_constant.y = tests[i].layer; ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, @@ -8547,6 +8549,8 @@ static void test_sample_c_lz(void) /* Avoid testing values affected by seamless cube map filtering. */ SetRect(&rect, 100, 100, 540, 380); check_texture_sub_resource_float(rt_texture, 0, &rect, tests[i].expected, 2); + + winetest_pop_context(); } ID3D10Texture2D_Release(texture);

1 0

Zebediah Figura : d3d11/tests: Use slightly different values in test_sample_c_lz().
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 15aca9053740957032d008ac096f9f4f2f2acbfd URL: https://gitlab.winehq.org/wine/wine/-/commit/15aca9053740957032d008ac096f9f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 26 16:05:55 2023 -0500 d3d11/tests: Use slightly different values in test_sample_c_lz(). For some arcane reason the native AMD driver on Windows seems to fail to clear (or read from?) layer 0. Work around that by using 0.0 there. --- dlls/d3d11/tests/d3d11.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d16a1088732..ecc01f50bfa 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10958,7 +10958,7 @@ static void test_sample_c_lz(void) 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, }; - static const float depth_values[] = {1.0f, 0.0f, 0.5f, 0.6f, 0.4f, 0.1f}; + static const float depth_values[] = {0.0f, 1.0f, 0.5f, 0.6f, 0.4f, 0.1f}; static const struct { unsigned int layer; @@ -10967,8 +10967,8 @@ static void test_sample_c_lz(void) } tests[] = { - {0, 0.5f, 0.0f}, - {1, 0.5f, 1.0f}, + {0, 0.5f, 1.0f}, + {1, 0.5f, 0.0f}, {2, 0.5f, 0.0f}, {3, 0.5f, 0.0f}, {4, 0.5f, 1.0f}, @@ -10981,8 +10981,8 @@ static void test_sample_c_lz(void) {4, 0.0f, 0.0f}, {5, 0.0f, 0.0f}, - {0, 1.0f, 0.0f}, - {1, 1.0f, 1.0f}, + {0, 1.0f, 1.0f}, + {1, 1.0f, 0.0f}, {2, 1.0f, 1.0f}, {3, 1.0f, 1.0f}, {4, 1.0f, 1.0f},

1 0

Alexandre Julliard : include: Use proper dllimports for userenv functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: b82428b3ae1bec0646e5e6b182075dbecb853890 URL: https://gitlab.winehq.org/wine/wine/-/commit/b82428b3ae1bec0646e5e6b182075d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:24:42 2023 +0100 include: Use proper dllimports for userenv functions. --- dlls/userenv/Makefile.in | 1 + include/userenv.h | 58 ++++++++++++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index c57e421df37..193232e9428 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_USERENV_ MODULE = userenv.dll IMPORTS = advapi32 IMPORTLIB = userenv diff --git a/include/userenv.h b/include/userenv.h index afa35156995..a518de83a23 100644 --- a/include/userenv.h +++ b/include/userenv.h @@ -22,6 +22,12 @@ #include <wbemcli.h> #include <profinfo.h> +#ifdef _USERENV_ +#define USERENVAPI +#else +#define USERENVAPI DECLSPEC_IMPORT +#endif + #define PT_TEMPORARY 0x00000001 #define PT_ROAMING 0x00000002 #define PT_MANDATORY 0x00000004 @@ -73,32 +79,32 @@ DECL_WINELIB_TYPE_AW(PGROUP_POLICY_OBJECT) extern "C" { #endif -BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL); -BOOL WINAPI DestroyEnvironmentBlock(LPVOID); -HANDLE WINAPI EnterCriticalPolicySection(BOOL); -BOOL WINAPI ExpandEnvironmentStringsForUserA(HANDLE,LPCSTR,LPSTR,DWORD); -BOOL WINAPI ExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); -#define ExpandEnvironmentStringsForUser WINELIB_NAME_AW(ExpandEnvironmentStringsForUser) -DWORD WINAPI GetAppliedGPOListW(DWORD,LPCWSTR,PSID,GUID*,PGROUP_POLICY_OBJECTW*); -DWORD WINAPI GetAppliedGPOListA(DWORD,LPCSTR,PSID,GUID*,PGROUP_POLICY_OBJECTA*); -#define GetAppliedGPOList WINELIB_NAME_AW(GetAppliedGPOList) -BOOL WINAPI GetUserProfileDirectoryA(HANDLE,LPSTR,LPDWORD); -BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD); -#define GetUserProfileDirectory WINELIB_NAME_AW(GetUserProfileDirectory) -BOOL WINAPI GetProfilesDirectoryA(LPSTR,LPDWORD); -BOOL WINAPI GetProfilesDirectoryW(LPWSTR,LPDWORD); -#define GetProfilesDirectory WINELIB_NAME_AW(GetProfilesDirectory) -BOOL WINAPI GetAllUsersProfileDirectoryA(LPSTR,LPDWORD); -BOOL WINAPI GetAllUsersProfileDirectoryW(LPWSTR,LPDWORD); -#define GetAllUsersProfileDirectory WINELIB_NAME_AW(GetAllUsersProfileDirectory) -BOOL WINAPI GetProfileType(DWORD*); -BOOL WINAPI LeaveCriticalPolicySection(HANDLE); -BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA); -BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW); -#define LoadUserProfile WINELIB_NAME_AW(LoadUserProfile) -BOOL WINAPI RegisterGPNotification(HANDLE,BOOL); -BOOL WINAPI UnloadUserProfile(HANDLE,HANDLE); -BOOL WINAPI UnregisterGPNotification(HANDLE); +USERENVAPI BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL); +USERENVAPI BOOL WINAPI DestroyEnvironmentBlock(LPVOID); +USERENVAPI HANDLE WINAPI EnterCriticalPolicySection(BOOL); +USERENVAPI BOOL WINAPI ExpandEnvironmentStringsForUserA(HANDLE,LPCSTR,LPSTR,DWORD); +USERENVAPI BOOL WINAPI ExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); +#define ExpandEnvironmentStringsForUser WINELIB_NAME_AW(ExpandEnvironmentStringsForUser) +USERENVAPI DWORD WINAPI GetAppliedGPOListW(DWORD,LPCWSTR,PSID,GUID*,PGROUP_POLICY_OBJECTW*); +USERENVAPI DWORD WINAPI GetAppliedGPOListA(DWORD,LPCSTR,PSID,GUID*,PGROUP_POLICY_OBJECTA*); +#define GetAppliedGPOList WINELIB_NAME_AW(GetAppliedGPOList) +USERENVAPI BOOL WINAPI GetUserProfileDirectoryA(HANDLE,LPSTR,LPDWORD); +USERENVAPI BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD); +#define GetUserProfileDirectory WINELIB_NAME_AW(GetUserProfileDirectory) +USERENVAPI BOOL WINAPI GetProfilesDirectoryA(LPSTR,LPDWORD); +USERENVAPI BOOL WINAPI GetProfilesDirectoryW(LPWSTR,LPDWORD); +#define GetProfilesDirectory WINELIB_NAME_AW(GetProfilesDirectory) +USERENVAPI BOOL WINAPI GetAllUsersProfileDirectoryA(LPSTR,LPDWORD); +USERENVAPI BOOL WINAPI GetAllUsersProfileDirectoryW(LPWSTR,LPDWORD); +#define GetAllUsersProfileDirectory WINELIB_NAME_AW(GetAllUsersProfileDirectory) +USERENVAPI BOOL WINAPI GetProfileType(DWORD*); +USERENVAPI BOOL WINAPI LeaveCriticalPolicySection(HANDLE); +USERENVAPI BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA); +USERENVAPI BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW); +#define LoadUserProfile WINELIB_NAME_AW(LoadUserProfile) +USERENVAPI BOOL WINAPI RegisterGPNotification(HANDLE,BOOL); +USERENVAPI BOOL WINAPI UnloadUserProfile(HANDLE,HANDLE); +USERENVAPI BOOL WINAPI UnregisterGPNotification(HANDLE); #ifdef __cplusplus }

1 0

Alexandre Julliard : include: Use proper dllimports for credui functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 9a7e0382566cf8893e1c13b4068821a47f731651 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a7e0382566cf8893e1c13b4068821… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:26:23 2023 +0100 include: Use proper dllimports for credui functions. --- dlls/credui/Makefile.in | 1 + include/wincred.h | 42 +++++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index f89d1dc2cb0..29614f70dd4 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_CREDUI_ MODULE = credui.dll IMPORTLIB = credui IMPORTS = comctl32 user32 advapi32 diff --git a/include/wincred.h b/include/wincred.h index 6309ce6d570..ad4c06f5f60 100644 --- a/include/wincred.h +++ b/include/wincred.h @@ -31,6 +31,14 @@ extern "C" { #endif #endif +#ifndef CREDUIAPI +#ifdef _CREDUI_ +#define CREDUIAPI +#else +#define CREDUIAPI DECLSPEC_IMPORT +#endif +#endif + #ifndef __SECHANDLE_DEFINED__ #define __SECHANDLE_DEFINED__ typedef struct _SecHandle @@ -273,25 +281,25 @@ WINADVAPI BOOL WINAPI CredWriteA(PCREDENTIALA,DWORD); WINADVAPI BOOL WINAPI CredWriteW(PCREDENTIALW,DWORD); #define CredWrite WINELIB_NAME_AW(CredWrite) -BOOL WINAPI CredPackAuthenticationBufferW(DWORD,LPWSTR,LPWSTR,PBYTE,DWORD *); -BOOL WINAPI CredUnPackAuthenticationBufferW(DWORD,PVOID,DWORD,LPWSTR,DWORD *,LPWSTR,DWORD *,LPWSTR,DWORD *); -DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); -DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); -#define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials) -DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR,BOOL); -DWORD WINAPI CredUIConfirmCredentialsA(PCSTR,BOOL); -#define CredUIConfirmCredentials WINELIB_NAME_AW(CredUIConfirmCredentials) -DWORD WINAPI CredUIParseUserNameW(PCWSTR,PWSTR,ULONG,PWSTR,ULONG); -DWORD WINAPI CredUIParseUserNameA(PCSTR,PSTR,ULONG,PSTR,ULONG); -#define CredUIParseUserName WINELIB_NAME_AW(CredUIParseUserName) -DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); -DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); -#define CredUIPromptForCredentials WINELIB_NAME_AW(CredUIPromptForCredentials) -DWORD WINAPI CredUIPromptForWindowsCredentialsW(PCREDUI_INFOW,DWORD,ULONG *,LPCVOID,ULONG,LPVOID *, ULONG *, BOOL *, +CREDUIAPI BOOL WINAPI CredPackAuthenticationBufferW(DWORD,LPWSTR,LPWSTR,PBYTE,DWORD *); +CREDUIAPI BOOL WINAPI CredUnPackAuthenticationBufferW(DWORD,PVOID,DWORD,LPWSTR,DWORD *,LPWSTR,DWORD *,LPWSTR,DWORD *); +CREDUIAPI DWORD WINAPI CredUICmdLinePromptForCredentialsW(PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); +CREDUIAPI DWORD WINAPI CredUICmdLinePromptForCredentialsA(PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); +#define CredUICmdLinePromptForCredentials WINELIB_NAME_AW(CredUICmdLinePromptForCredentials) +CREDUIAPI DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR,BOOL); +CREDUIAPI DWORD WINAPI CredUIConfirmCredentialsA(PCSTR,BOOL); +#define CredUIConfirmCredentials WINELIB_NAME_AW(CredUIConfirmCredentials) +CREDUIAPI DWORD WINAPI CredUIParseUserNameW(PCWSTR,PWSTR,ULONG,PWSTR,ULONG); +CREDUIAPI DWORD WINAPI CredUIParseUserNameA(PCSTR,PSTR,ULONG,PSTR,ULONG); +#define CredUIParseUserName WINELIB_NAME_AW(CredUIParseUserName) +CREDUIAPI DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW,PCWSTR,PCtxtHandle,DWORD,PWSTR,ULONG,PWSTR,ULONG,PBOOL,DWORD); +CREDUIAPI DWORD WINAPI CredUIPromptForCredentialsA(PCREDUI_INFOA,PCSTR,PCtxtHandle,DWORD,PSTR,ULONG,PSTR,ULONG,PBOOL,DWORD); +#define CredUIPromptForCredentials WINELIB_NAME_AW(CredUIPromptForCredentials) +CREDUIAPI DWORD WINAPI CredUIPromptForWindowsCredentialsW(PCREDUI_INFOW,DWORD,ULONG *,LPCVOID,ULONG,LPVOID *, ULONG *, BOOL *, DWORD); -DWORD WINAPI CredUIStoreSSOCredW(PCWSTR,PCWSTR,PCWSTR,BOOL); +CREDUIAPI DWORD WINAPI CredUIStoreSSOCredW(PCWSTR,PCWSTR,PCWSTR,BOOL); /* Note: no CredUIStoreSSOCredA in PSDK header */ -DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); +CREDUIAPI DWORD WINAPI CredUIReadSSOCredW(PCWSTR,PWSTR*); /* Note: no CredUIReadSSOCredA in PSDK header */ #ifdef __cplusplus

1 0

Alexandre Julliard : include: Use proper dllimports for winscard functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: e7f44130ebdeaf9ec4cbbeb7d0ed9cc3854c0c94 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7f44130ebdeaf9ec4cbbeb7d0ed9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:29:45 2023 +0100 include: Use proper dllimports for winscard functions. --- dlls/winscard/winscard.c | 1 + include/winscard.h | 156 ++++++++++++++++++++++++----------------------- 2 files changed, 81 insertions(+), 76 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for slc functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 32cdd5d487e9223664adadbb775d75b022aec29c URL: https://gitlab.winehq.org/wine/wine/-/commit/32cdd5d487e9223664adadbb775d75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:30:27 2023 +0100 include: Use proper dllimports for slc functions. --- dlls/sppc/Makefile.in | 1 + include/slpublic.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in index 81a59392c62..e9209fe4b71 100644 --- a/dlls/sppc/Makefile.in +++ b/dlls/sppc/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_SLC_ MODULE = sppc.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/include/slpublic.h b/include/slpublic.h index 3f3a39274d1..97fa8c798c9 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -26,7 +26,7 @@ extern "C" { #ifdef _SLC_ #define SLCAPI #else -#define SLCAPI DECLSPEC_HIDDEN +#define SLCAPI DECLSPEC_IMPORT #endif typedef GUID SLID;

1 0

Alexandre Julliard : include: Use proper dllimports for wmi functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 333ced9869ebb49a1d6830e842f866a0eb1439b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/333ced9869ebb49a1d6830e842f866… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:31:39 2023 +0100 include: Use proper dllimports for wmi functions. --- dlls/wmi/Makefile.in | 1 + include/wmium.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmi/Makefile.in b/dlls/wmi/Makefile.in index fde1177f9a5..9b6d56ab3da 100644 --- a/dlls/wmi/Makefile.in +++ b/dlls/wmi/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -D_WMI_SOURCE_ MODULE = wmi.dll IMPORTS = advapi32 diff --git a/include/wmium.h b/include/wmium.h index 887c2b4ccf5..bbb13a3dbf4 100644 --- a/include/wmium.h +++ b/include/wmium.h @@ -22,7 +22,7 @@ #ifdef _WMI_SOURCE_ #define WMIAPI __stdcall #else -#define WMIAPI DECLSPEC_HIDDEN __stdcall +#define WMIAPI DECLSPEC_IMPORT __stdcall #endif #include <guiddef.h>

1 0

Alexandre Julliard : include: Use proper dllimports for olectl functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: b06a1ec1965245ab290bfb3f1ca691bb02aab5ef URL: https://gitlab.winehq.org/wine/wine/-/commit/b06a1ec1965245ab290bfb3f1ca691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:32:20 2023 +0100 include: Use proper dllimports for olectl functions. --- include/olectl.h | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index 2ba37b48a5e..fe02a6236b9 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -27,7 +27,13 @@ extern "C" { #endif - +#ifdef _OLEAUT32_ +#define WINOLECTLAPI STDAPI +#define WINOLECTLAPI_(type) STDAPI_(type) +#else +#define WINOLECTLAPI DECLSPEC_IMPORT STDAPI +#define WINOLECTLAPI_(type) DECLSPEC_IMPORT STDAPI_(type) +#endif /* * Ole Control Interfaces @@ -183,44 +189,33 @@ typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; #define LP_VGACOLOR 0x2 #define LP_COLOR 0x4 -HRESULT WINAPI DllRegisterServer(void) DECLSPEC_HIDDEN; -HRESULT WINAPI DllUnregisterServer(void) DECLSPEC_HIDDEN; - -HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); - -HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); +HRESULT WINAPI DllRegisterServer(void); +HRESULT WINAPI DllUnregisterServer(void); -HRESULT WINAPI OleCreatePropertyFrame( +WINOLECTLAPI_(HCURSOR) OleIconToCursor( HINSTANCE hinstExe, HICON hicon); +WINOLECTLAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); +WINOLECTLAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, LPCOLESTR lpszCaption, ULONG cObjects, LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved, LPVOID pvReserved ); - -HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, +WINOLECTLAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, REFIID riid, LPVOID *lplpvObj ); - -HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunMode, +WINOLECTLAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunMode, REFIID riid, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, LPVOID *lplpvObj ); - -HRESULT WINAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); - -HRESULT WINAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, +WINOLECTLAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); +WINOLECTLAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, IDispatch **ppdispPicture ); - -HRESULT WINAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); - -HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, +WINOLECTLAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); +WINOLECTLAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ); - -HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, +WINOLECTLAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, BOOL fOwn, LPVOID * lplpvObj ); - -HRESULT WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, +WINOLECTLAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, LPVOID* lplpvObj); - -HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal, +WINOLECTLAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal, COLORREF* lpcolorref); /* Reflected Window Message IDs */

1 0

Alexandre Julliard : include: Use proper dllimports for more wininet functions.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 9da663b4802dbaff6f80191c09266b1718ce5e15 URL: https://gitlab.winehq.org/wine/wine/-/commit/9da663b4802dbaff6f80191c09266b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:32:44 2023 +0100 include: Use proper dllimports for more wininet functions. --- include/wininet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 158b005d36c..0de2b830812 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1742,8 +1742,8 @@ INTERNETAPI BOOL WINAPI InternetSetDialStateW(LPCWSTR ,DWORD ,DWORD); #define InternetSetDialState WINELIB_NAME_AW(InternetSetDialState) #define INTERNET_DIALSTATE_DISCONNECTED 1 -BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); -BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) typedef struct AutoProxyHelperVtbl @@ -1779,8 +1779,8 @@ typedef BOOL (CALLBACK *pfnInternetInitializeAutoProxyDll)(DWORD, LPSTR, LPSTR, #define PROXY_AUTO_DETECT_TYPE_DHCP 1 #define PROXY_AUTO_DETECT_TYPE_DNS_A 2 -BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); -BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD); +INTERNETAPI BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); +INTERNETAPI BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD); #ifdef __cplusplus }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 07 Nov '23

07 Nov '23

Module: wine Branch: master Commit: 66dfe504d0b93595677c030ca175657047d391d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/66dfe504d0b93595677c030ca17565… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Nov 7 10:30:44 2023 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index a4315899021..c71d0fd13e7 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-10-11 23:56+0300\n" +"PO-Revision-Date: 2023-11-07 09:32+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -18539,10 +18539,8 @@ msgid "MIME types" msgstr "MIME tipai" #: programs/winecfg/winecfg.rc:311 -#, fuzzy -#| msgid "Manage file &associations" msgid "Manage file and protocol &associations" -msgstr "Valdyti failų susie&jimus" +msgstr "Valdyti failų ir protokolų susie&jimus" #: programs/winecfg/winecfg.rc:314 msgid "Folders"

1 0