diff options
| author | Julian Eisel <julian@blender.org> | 2020-03-12 17:58:03 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-03-12 17:58:03 +0300 |
| commit | b86be9b2145458037fd0b17433b7af0efa7b6472 (patch) | |
| tree | f333625555402992ebb35d258f93eda1130389e6 /source/blender/blendthumb/src/Dll.cpp | |
| parent | 00f83ec125207e90bf180b3eb7752d8cb6482a86 (diff) | |
| parent | cb6cec904fa14ce0ab10a2a53af5c936d56376cf (diff) | |
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
Diffstat (limited to 'source/blender/blendthumb/src/Dll.cpp')
| -rw-r--r-- | source/blender/blendthumb/src/Dll.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blendthumb/src/Dll.cpp b/source/blender/blendthumb/src/Dll.cpp index 08b3d253be8..fec792ebfeb 100644 --- a/source/blender/blendthumb/src/Dll.cpp +++ b/source/blender/blendthumb/src/Dll.cpp @@ -159,7 +159,8 @@ struct REGISTRY_ENTRY { PCWSTR pszKeyName; PCWSTR pszValueName; DWORD dwValueType; - PCWSTR pszData; + PCWSTR pszData; // These two fields could/should have been a union, but C++ + DWORD dwData; // only lets you initalize the first field in a union. }; // Creates a registry key (if needed) and sets the default value of the key @@ -187,7 +188,7 @@ HRESULT CreateRegKeyAndSetValue(const REGISTRY_ENTRY *pRegistryEntry) break; case REG_DWORD: size = sizeof(DWORD); - data = (DWORD)pRegistryEntry->pszData; + data = pRegistryEntry->dwData; lpData = (BYTE *)&data; break; default: @@ -235,6 +236,7 @@ STDAPI DllRegisterServer() L"Software\\Classes\\.blend\\", L"Treatment", REG_DWORD, + 0, 0}, // doesn't appear to do anything... {HKEY_CURRENT_USER, L"Software\\Classes\\.blend\\ShellEx\\{e357fccd-a995-4576-b01f-234630154e96}", |