summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/oslib-win32.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index 6c818749d2..5723d3eb4c 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -40,9 +40,6 @@
#include "qemu/error-report.h"
#include <malloc.h>
-/* this must come after including "trace.h" */
-#include <shlobj.h>
-
static int get_allocation_granularity(void)
{
SYSTEM_INFO system_info;
@@ -237,17 +234,11 @@ int qemu_get_thread_id(void)
char *
qemu_get_local_state_dir(void)
{
- HRESULT result;
- char base_path[MAX_PATH+1] = "";
+ const char * const *data_dirs = g_get_system_data_dirs();
- result = SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL,
- /* SHGFP_TYPE_CURRENT */ 0, base_path);
- if (result != S_OK) {
- /* misconfigured environment */
- g_critical("CSIDL_COMMON_APPDATA unavailable: %ld", (long)result);
- abort();
- }
- return g_strdup(base_path);
+ g_assert(data_dirs && data_dirs[0]);
+
+ return g_strdup(data_dirs[0]);
}
void qemu_set_tty_echo(int fd, bool echo)