Skip to content

Commit

Permalink
Merge pull request #3270 from Sonicadvance1/x11_thunk_lock
Browse files Browse the repository at this point in the history
Thunks/libX11: Change lock functions to nullptr by default
  • Loading branch information
Sonicadvance1 committed Nov 14, 2023
2 parents 4a31b61 + 0aa4190 commit db63241
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions ThunkLibs/libX11/libX11_Guest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,6 @@ extern "C" {
return rv;
}

static void LockMutexFunction(LockInfoPtr) {
fprintf(stderr, "libX11: LockMutex\n");
}

static void UnlockMutexFunction(LockInfoPtr) {
fprintf(stderr, "libX11: LockMutex\n");
}

int XFree(void* ptr) {
// This function must be able to handle both guest heap pointers *and* host heap pointers,
// so it only forwards to the native host library for the latter.
Expand Down Expand Up @@ -368,8 +360,8 @@ extern "C" {
return fexfn_pack_XUnregisterIMInstantiateCallback(dpy, rdb, res_name, res_class, AllocateHostTrampolineForGuestFunction(callback), client_data);
}

void (*_XLockMutex_fn)(LockInfoPtr) = LockMutexFunction;
void (*_XUnlockMutex_fn)(LockInfoPtr) = UnlockMutexFunction;
void (*_XLockMutex_fn)(LockInfoPtr) = nullptr;
void (*_XUnlockMutex_fn)(LockInfoPtr) = nullptr;
LockInfoPtr _Xglobal_lock = (LockInfoPtr)0x4142434445464748ULL;
}

Expand Down

0 comments on commit db63241

Please sign in to comment.