kernel32: Add stub for GetCurrentPackageId
André Hentschel
nerv at dawncrow.de
Tue Feb 19 16:19:34 CST 2013
http://bugs.winehq.org/show_bug.cgi?id=32743
If we want/need a better implementation later we have a problem with PACKAGE_VERSION for PACKAGE_ID as we use PACKAGE_VERSION already and it's defined by autoconf directly.
Some IRC lines for reference on this:
...
(22:37:03) Andre_H: use a different name for a win32 structure? undef PACKAGE_VERSION before defining it?
...
(22:40:23) ehoover: I would probable use AH_VERBATIM in configure.ac.
(22:42:55) ehoover: Andre_H: like so: AH_VERBATIM([PACKAGE_VERSION], [#undef PACKAGE_VERSION])
...
(22:55:10) vpovirk: or just put the undef in the source file amongst the includes
(22:55:31) vpovirk: and let there be an error if you include appmodel.h and PACKAGE_VERSION is defined
---
dlls/kernel32/kernel32.spec | 1 +
dlls/kernel32/version.c | 6 ++++
include/winerror.h | 79 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index f2f039b..93bfb77 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -498,6 +498,7 @@
@ stdcall GetCurrentConsoleFont(long long ptr)
@ stdcall GetCurrentDirectoryA(long ptr)
@ stdcall GetCurrentDirectoryW(long ptr)
+@ stdcall GetCurrentPackageId(ptr ptr)
@ stdcall GetCurrentProcess()
@ stdcall GetCurrentProcessId()
@ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber
diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c
index 9f21435..b9d13e4 100644
--- a/dlls/kernel32/version.c
+++ b/dlls/kernel32/version.c
@@ -201,3 +201,9 @@ BOOL WINAPI GetProductInfo(DWORD dwOSMajorVersion, DWORD dwOSMinorVersion, DWORD
return RtlGetProductInfo(dwOSMajorVersion, dwOSMinorVersion,
dwSpMajorVersion, dwSpMinorVersion, pdwReturnedProductType);
}
+
+LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer)
+{
+ FIXME("(%p %p): stub\n", len, buffer);
+ return APPMODEL_ERROR_NO_PACKAGE;
+}
diff --git a/include/winerror.h b/include/winerror.h
index b6281f8..347d942 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -1934,11 +1934,90 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
#define ERROR_RESOURCE_ENUM_USER_STOP 15106
#define ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED 15107
#define ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME 15108
+#define ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE 15110
+#define ERROR_MRM_INVALID_PRICONFIG 15111
+#define ERROR_MRM_INVALID_FILE_TYPE 15112
+#define ERROR_MRM_UNKNOWN_QUALIFIER 15113
+#define ERROR_MRM_INVALID_QUALIFIER_VALUE 15114
+#define ERROR_MRM_NO_CANDIDATE 15115
+#define ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE 15116
+#define ERROR_MRM_RESOURCE_TYPE_MISMATCH 15117
+#define ERROR_MRM_DUPLICATE_MAP_NAME 15118
+#define ERROR_MRM_DUPLICATE_ENTRY 15119
+#define ERROR_MRM_INVALID_RESOURCE_IDENTIFIER 15120
+#define ERROR_MRM_FILEPATH_TOO_LONG 15121
+#define ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE 15122
+#define ERROR_MRM_INVALID_PRI_FILE 15126
+#define ERROR_MRM_NAMED_RESOURCE_NOT_FOUND 15127
+#define ERROR_MRM_MAP_NOT_FOUND 15135
+#define ERROR_MRM_UNSUPPORTED_PROFILE_TYPE 15136
+#define ERROR_MRM_INVALID_QUALIFIER_OPERATOR 15137
+#define ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE 15138
+#define ERROR_MRM_AUTOMERGE_ENABLED 15139
+#define ERROR_MRM_TOO_MANY_RESOURCES 15140
+#define ERROR_MCA_INVALID_CAPABILITIES_STRING 15200
+#define ERROR_MCA_INVALID_VCP_VERSION 15201
+#define ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION 15202
+#define ERROR_MCA_MCCS_VERSION_MISMATCH 15203
+#define ERROR_MCA_UNSUPPORTED_MCCS_VERSION 15204
+#define ERROR_MCA_INTERNAL_ERROR 15205
+#define ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED 15206
+#define ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE 15207
+#define ERROR_AMBIGUOUS_SYSTEM_DEVICE 15250
+#define ERROR_SYSTEM_DEVICE_NOT_FOUND 15299
+#define ERROR_HASH_NOT_SUPPORTED 15300
+#define ERROR_HASH_NOT_PRESENT 15301
+#define ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED 15321
+#define ERROR_GPIO_CLIENT_INFORMATION_INVALID 15322
+#define ERROR_GPIO_VERSION_NOT_SUPPORTED 15323
+#define ERROR_GPIO_INVALID_REGISTRATION_PACKET 15324
+#define ERROR_GPIO_OPERATION_DENIED 15325
+#define ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE 15326
+#define ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED 15327
+#define ERROR_CANNOT_SWITCH_RUNLEVEL 15400
+#define ERROR_INVALID_RUNLEVEL_SETTING 15401
+#define ERROR_RUNLEVEL_SWITCH_TIMEOUT 15402
+#define ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT 15403
+#define ERROR_RUNLEVEL_SWITCH_IN_PROGRESS 15404
+#define ERROR_SERVICES_FAILED_AUTOSTART 15405
+#define ERROR_COM_TASK_STOP_PENDING 15501
+#define ERROR_INSTALL_OPEN_PACKAGE_FAILED 15600
+#define ERROR_INSTALL_PACKAGE_NOT_FOUND 15601
+#define ERROR_INSTALL_INVALID_PACKAGE 15602
+#define ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED 15603
+#define ERROR_INSTALL_OUT_OF_DISK_SPACE 15604
+#define ERROR_INSTALL_NETWORK_FAILURE 15605
+#define ERROR_INSTALL_REGISTRATION_FAILURE 15606
+#define ERROR_INSTALL_DEREGISTRATION_FAILURE 15607
+#define ERROR_INSTALL_CANCEL 15608
+#define ERROR_INSTALL_FAILED 15609
+#define ERROR_REMOVE_FAILED 15610
+#define ERROR_PACKAGE_ALREADY_EXISTS 15611
+#define ERROR_NEEDS_REMEDIATION 15612
+#define ERROR_INSTALL_PREREQUISITE_FAILED 15613
+#define ERROR_PACKAGE_REPOSITORY_CORRUPTED 15614
+#define ERROR_INSTALL_POLICY_FAILURE 15615
+#define ERROR_PACKAGE_UPDATING 15616
+#define ERROR_DEPLOYMENT_BLOCKED_BY_POLICY 15617
+#define ERROR_PACKAGES_IN_USE 15618
+#define ERROR_RECOVERY_FILE_CORRUPT 15619
+#define ERROR_INVALID_STAGED_SIGNATURE 15620
+#define ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED 15621
+#define ERROR_INSTALL_PACKAGE_DOWNGRADE 15622
+#define ERROR_SYSTEM_NEEDS_REMEDIATION 15623
+#define ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN 15624
+#define ERROR_RESILIENCY_FILE_CORRUPT 15625
+#define ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING 15626
/* HRESULT values for OLE, SHELL and other Interface stuff */
/* the codes 4000-40ff are reserved for OLE */
#undef NOERROR /* arpa/nameser_compat.h defines this */
+#define APPMODEL_ERROR_NO_PACKAGE 15700
+#define APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT 15701
+#define APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT 15702
+#define APPMODEL_ERROR_NO_APPLICATION 15703
+
#define E_NOT_SUFFICIENT_BUFFER HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)
#ifdef RC_INVOKED
--
1.8.0
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list