Skip to content

Commit cafea03

Browse files
RodrigoHolztrattnereddyStreamlabs
RodrigoHolztrattner
authored and
eddyStreamlabs
committed
Add castings and defines to reduce the amount of warnings (#149)
1 parent e8af3a4 commit cafea03

12 files changed

Lines changed: 107 additions & 95 deletions

File tree

‎obs-studio-client/source/input.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,11 @@ Nan::NAN_METHOD_RETURN_TYPE osn::Input::GetPublicSources(Nan::NAN_METHOD_ARGS_TY
235235
if (!ValidateResponse(response))
236236
return;
237237

238-
v8::Local<v8::Array> arr = Nan::New<v8::Array>(response.size() - 1);
238+
v8::Local<v8::Array> arr = Nan::New<v8::Array>(int(response.size() - 1));
239239
for (size_t idx = 1; idx < response.size(); idx++) {
240240
osn::Input* obj = new osn::Input(response[idx - 1].value_union.ui64);
241241
auto object = osn::Input::Store(obj);
242-
Nan::Set(arr, idx, object);
242+
Nan::Set(arr, uint32_t(idx), object);
243243
}
244244

245245
info.GetReturnValue().Set(arr);
@@ -750,11 +750,11 @@ Nan::NAN_METHOD_RETURN_TYPE osn::Input::Filters(Nan::NAN_METHOD_ARGS_TYPE info)
750750
if (!ValidateResponse(response))
751751
return;
752752

753-
v8::Local<v8::Array> arr = Nan::New<v8::Array>(response.size() - 1);
753+
v8::Local<v8::Array> arr = Nan::New<v8::Array>(int(response.size()) - 1);
754754
for (size_t idx = 1; idx < response.size(); idx++) {
755755
osn::Filter* obj = new osn::Filter(response[idx].value_union.ui64);
756756
auto object = osn::Filter::Store(obj);
757-
Nan::Set(arr, idx - 1, object);
757+
Nan::Set(arr, uint32_t(idx) - 1, object);
758758
}
759759

760760
info.GetReturnValue().Set(arr);

‎obs-studio-client/source/isource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void osn::ISource::callback_handler(void* data, std::shared_ptr<std::vector<Sour
7878
v8::String::NewFromUtf8(isolate, "hotkeyDescription"),
7979
v8::String::NewFromUtf8(isolate, hotkeyInfo.hotkeyDesc.c_str()));
8080
argv->ToObject()->Set(
81-
v8::String::NewFromUtf8(isolate, "hotkeyId"), v8::Number::New(isolate, hotkeyInfo.hotkeyId));
81+
v8::String::NewFromUtf8(isolate, "hotkeyId"), v8::Number::New(isolate, double(hotkeyInfo.hotkeyId)));
8282
args[0] = argv;
8383

8484
Nan::Call(m_callback_function, 1, args);

‎obs-studio-client/source/nodeobs_settings.cpp‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ std::vector<settings::SubCategory>
1515
std::vector<settings::SubCategory> category;
1616

1717
uint32_t indexData = 0;
18-
for (int i = 0; i < subCategoriesCount; i++) {
18+
for (int i = 0; i < int(subCategoriesCount); i++) {
1919
settings::SubCategory sc;
2020

2121
size_t* sizeMessage = reinterpret_cast<size_t*>(buffer.data() + indexData);
2222
indexData += sizeof(size_t);
2323

2424
std::string name(buffer.data() + indexData, *sizeMessage);
25-
indexData += *sizeMessage;
25+
indexData += uint32_t(*sizeMessage);
2626

2727
size_t* paramsCount = reinterpret_cast<size_t*>(buffer.data() + indexData);
2828
indexData += sizeof(size_t);
@@ -33,25 +33,25 @@ std::vector<settings::SubCategory>
3333
indexData += sizeof(size_t);
3434

3535
std::string name(buffer.data() + indexData, *sizeName);
36-
indexData += *sizeName;
36+
indexData += uint32_t(*sizeName);
3737

3838
size_t* sizeDescription = reinterpret_cast<std::size_t*>(buffer.data() + indexData);
3939
indexData += sizeof(size_t);
4040

4141
std::string description(buffer.data() + indexData, *sizeDescription);
42-
indexData += *sizeDescription;
42+
indexData += uint32_t(*sizeDescription);
4343

4444
size_t* sizeType = reinterpret_cast<std::size_t*>(buffer.data() + indexData);
4545
indexData += sizeof(size_t);
4646

4747
std::string type(buffer.data() + indexData, *sizeType);
48-
indexData += *sizeType;
48+
indexData += uint32_t(*sizeType);
4949

5050
size_t* sizeSubType = reinterpret_cast<std::size_t*>(buffer.data() + indexData);
5151
indexData += sizeof(size_t);
5252

5353
std::string subType(buffer.data() + indexData, *sizeSubType);
54-
indexData += *sizeSubType;
54+
indexData += uint32_t(*sizeSubType);
5555

5656
bool* enabled = reinterpret_cast<bool*>(buffer.data() + indexData);
5757
indexData += sizeof(bool);
@@ -68,7 +68,7 @@ std::vector<settings::SubCategory>
6868
std::vector<char> currentValue;
6969
currentValue.resize(*sizeOfCurrentValue);
7070
memcpy(currentValue.data(), buffer.data() + indexData, *sizeOfCurrentValue);
71-
indexData += *sizeOfCurrentValue;
71+
indexData += uint32_t(*sizeOfCurrentValue);
7272

7373
size_t* sizeOfValues = reinterpret_cast<size_t*>(buffer.data() + indexData);
7474
indexData += sizeof(size_t);
@@ -79,7 +79,7 @@ std::vector<settings::SubCategory>
7979
std::vector<char> values;
8080
values.resize(*sizeOfValues);
8181
memcpy(values.data(), buffer.data() + indexData, *sizeOfValues);
82-
indexData += *sizeOfValues;
82+
indexData += uint32_t(*sizeOfValues);
8383

8484
param.name = name;
8585
param.description = description;
@@ -95,7 +95,7 @@ std::vector<settings::SubCategory>
9595
sc.params.push_back(param);
9696
}
9797
sc.name = name;
98-
sc.paramsCount = *paramsCount;
98+
sc.paramsCount = uint32_t(*paramsCount);
9999
category.push_back(sc);
100100
}
101101
return category;
@@ -119,8 +119,8 @@ void settings::OBS_settings_getSettings(const v8::FunctionCallbackInfo<v8::Value
119119
v8::Isolate* isolate = v8::Isolate::GetCurrent();
120120
v8::Local<v8::Array> rval = v8::Array::New(isolate);
121121

122-
std::vector<settings::SubCategory> categorySettings =
123-
serializeCategory(response[1].value_union.ui64, response[2].value_union.ui64, response[3].value_bin);
122+
std::vector<settings::SubCategory> categorySettings = serializeCategory(
123+
uint32_t(response[1].value_union.ui64), uint32_t(response[2].value_union.ui64), response[3].value_bin);
124124

125125
for (int i = 0; i < categorySettings.size(); i++) {
126126
v8::Local<v8::Object> subCategory = v8::Object::New(isolate);
@@ -161,12 +161,12 @@ void settings::OBS_settings_getSettings(const v8::FunctionCallbackInfo<v8::Value
161161
else if (params.at(j).type.compare("OBS_PROPERTY_INT") == 0) {
162162
int64_t *value = reinterpret_cast<int64_t*>(params.at(j).currentValue.data());
163163
parameter->Set(v8::String::NewFromUtf8(isolate, "currentValue"),
164-
v8::Integer::New(isolate, *value));
164+
v8::Integer::New(isolate, int32_t(*value)));
165165
}
166166
else if (params.at(j).type.compare("OBS_PROPERTY_UINT") == 0) {
167167
uint64_t *value = reinterpret_cast<uint64_t*>(params.at(j).currentValue.data());
168168
parameter->Set(v8::String::NewFromUtf8(isolate, "currentValue"),
169-
v8::Integer::New(isolate, *value));
169+
v8::Integer::New(isolate, int32_t(*value)));
170170
}
171171
else if (params.at(j).type.compare("OBS_PROPERTY_BOOL") == 0) {
172172
bool *value = reinterpret_cast<bool*>(params.at(j).currentValue.data());
@@ -182,7 +182,7 @@ void settings::OBS_settings_getSettings(const v8::FunctionCallbackInfo<v8::Value
182182
if (params.at(j).subType.compare("OBS_COMBO_FORMAT_INT") == 0) {
183183
int64_t *value = reinterpret_cast<int64_t*>(params.at(j).currentValue.data());
184184
parameter->Set(v8::String::NewFromUtf8(isolate, "currentValue"),
185-
v8::Integer::New(isolate, *value));
185+
v8::Integer::New(isolate, int32_t(*value)));
186186
}
187187
else if (params.at(j).subType.compare("OBS_COMBO_FORMAT_FLOAT") == 0) {
188188
double *value = reinterpret_cast<double*>(params.at(j).currentValue.data());
@@ -212,21 +212,21 @@ void settings::OBS_settings_getSettings(const v8::FunctionCallbackInfo<v8::Value
212212
size_t* sizeName = reinterpret_cast<std::size_t*>(params.at(j).values.data() + indexData);
213213
indexData += sizeof(size_t);
214214
std::string name(params.at(j).values.data() + indexData, *sizeName);
215-
indexData += *sizeName;
215+
indexData += uint32_t(*sizeName);
216216

217217
int64_t* value = reinterpret_cast<int64_t*>(params.at(j).values.data() + indexData);
218218

219219
indexData += sizeof(int64_t);
220220

221221
valueObject->Set(v8::String::NewFromUtf8(isolate, name.c_str()),
222-
v8::Integer::New(isolate, *value));
222+
v8::Integer::New(isolate, int32_t(*value)));
223223
}
224224
else if (params.at(j).subType.compare("OBS_COMBO_FORMAT_FLOAT") == 0) {
225225
size_t *sizeName =
226226
reinterpret_cast<std::size_t*>(params.at(j).values.data() + indexData);
227227
indexData += sizeof(size_t);
228228
std::string name(params.at(j).values.data() + indexData, *sizeName);
229-
indexData += *sizeName;
229+
indexData += uint32_t(*sizeName);
230230

231231
double* value = reinterpret_cast<double*>(params.at(j).values.data() + indexData);
232232

@@ -240,12 +240,12 @@ void settings::OBS_settings_getSettings(const v8::FunctionCallbackInfo<v8::Value
240240
reinterpret_cast<std::size_t*>(params.at(j).values.data() + indexData);
241241
indexData += sizeof(size_t);
242242
std::string name(params.at(j).values.data() + indexData, *sizeName);
243-
indexData += *sizeName;
243+
indexData += uint32_t(*sizeName);
244244

245245
size_t* sizeValue = reinterpret_cast<std::size_t*>(params.at(j).values.data() + indexData);
246246
indexData += sizeof(size_t);
247247
std::string value(params.at(j).values.data() + indexData, *sizeValue);
248-
indexData += *sizeValue;
248+
indexData += uint32_t(*sizeValue);
249249

250250
valueObject->Set(
251251
v8::String::NewFromUtf8(isolate, name.c_str()),
@@ -287,7 +287,7 @@ std::vector<char> deserializeCategory(uint32_t* subCategoriesCount, uint32_t* si
287287

288288
std::vector<settings::SubCategory> sucCategories;
289289
int sizeSettings = settings->Length();
290-
for (int i = 0; i < settings->Length(); i++) {
290+
for (int i = 0; i < int(settings->Length()); i++) {
291291
settings::SubCategory sc;
292292

293293
v8::Local<v8::Object> subCategoryObject = v8::Local<v8::Object>::Cast(settings->Get(i));
@@ -301,7 +301,7 @@ std::vector<char> deserializeCategory(uint32_t* subCategoriesCount, uint32_t* si
301301

302302
sc.paramsCount = parameters->Length();
303303
int sizeParams = parameters->Length();
304-
for (int j = 0; j < parameters->Length(); j++) {
304+
for (int j = 0; j < int(parameters->Length()); j++) {
305305
settings::Parameter param;
306306

307307
v8::Local<v8::Object> parameterObject = v8::Local<v8::Object>::Cast(parameters->Get(j));
@@ -322,19 +322,22 @@ std::vector<char> deserializeCategory(uint32_t* subCategoriesCount, uint32_t* si
322322
param.currentValue.resize(strlen(*value));
323323
memcpy(param.currentValue.data(), *value, strlen(*value));
324324
} else if (param.type.compare("OBS_PROPERTY_INT") == 0) {
325-
int64_t value = parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue();
325+
int64_t value =
326+
int64_t(parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue());
326327

327328
param.sizeOfCurrentValue = sizeof(value);
328329
param.currentValue.resize(sizeof(value));
329330
memcpy(param.currentValue.data(), &value, sizeof(value));
330331
} else if (param.type.compare("OBS_PROPERTY_UINT") == 0) {
331-
uint64_t value = parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue();
332+
uint64_t value =
333+
uint64_t(parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue());
332334

333335
param.sizeOfCurrentValue = sizeof(value);
334336
param.currentValue.resize(sizeof(value));
335337
memcpy(param.currentValue.data(), &value, sizeof(value));
336338
} else if (param.type.compare("OBS_PROPERTY_BOOL") == 0) {
337-
uint64_t value = parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue();
339+
uint64_t value =
340+
uint64_t(parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue());
338341

339342
param.sizeOfCurrentValue = sizeof(value);
340343
param.currentValue.resize(sizeof(value));
@@ -352,7 +355,7 @@ std::vector<char> deserializeCategory(uint32_t* subCategoriesCount, uint32_t* si
352355

353356
if (subType.compare("OBS_COMBO_FORMAT_INT") == 0) {
354357
int64_t value =
355-
parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue();
358+
int64_t(parameterObject->Get(v8::String::NewFromUtf8(isolate, "currentValue"))->NumberValue());
356359

357360
param.sizeOfCurrentValue = sizeof(value);
358361
param.currentValue.resize(sizeof(value));
@@ -382,8 +385,8 @@ std::vector<char> deserializeCategory(uint32_t* subCategoriesCount, uint32_t* si
382385
buffer.insert(buffer.end(), serializedBuf.begin(), serializedBuf.end());
383386
}
384387

385-
*subCategoriesCount = sucCategories.size();
386-
*sizeStruct = buffer.size();
388+
*subCategoriesCount = uint32_t(sucCategories.size());
389+
*sizeStruct = uint32_t(buffer.size());
387390

388391
return buffer;
389392
}

‎obs-studio-client/source/nodeobs_settings.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ namespace settings
3030
*reinterpret_cast<size_t*>(buffer.data() + indexBuffer) = name.length();
3131
indexBuffer += sizeof(size_t);
3232
memcpy(buffer.data() + indexBuffer, name.data(), name.length());
33-
indexBuffer += name.length();
33+
indexBuffer += uint32_t(name.length());
3434

3535
*reinterpret_cast<size_t*>(buffer.data() + indexBuffer) = description.length();
3636
indexBuffer += sizeof(size_t);
3737
memcpy(buffer.data() + indexBuffer, description.data(), description.length());
38-
indexBuffer += description.length();
38+
indexBuffer += uint32_t(description.length());
3939

4040
*reinterpret_cast<size_t*>(buffer.data() + indexBuffer) = type.length();
4141
indexBuffer += sizeof(size_t);
4242
memcpy(buffer.data() + indexBuffer, type.data(), type.length());
43-
indexBuffer += type.length();
43+
indexBuffer += uint32_t(type.length());
4444

4545
*reinterpret_cast<size_t*>(buffer.data() + indexBuffer) = subType.length();
4646
indexBuffer += sizeof(size_t);
4747
memcpy(buffer.data() + indexBuffer, subType.data(), subType.length());
48-
indexBuffer += subType.length();
48+
indexBuffer += uint32_t(subType.length());
4949

5050
*reinterpret_cast<bool*>(buffer.data() + indexBuffer) = enabled;
5151
indexBuffer += sizeof(bool);
@@ -58,7 +58,7 @@ namespace settings
5858
indexBuffer += sizeof(size_t);
5959

6060
memcpy(buffer.data() + indexBuffer, currentValue.data(), sizeOfCurrentValue);
61-
indexBuffer += sizeOfCurrentValue;
61+
indexBuffer += uint32_t(sizeOfCurrentValue);
6262

6363
*reinterpret_cast<size_t*>(buffer.data() + indexBuffer) = sizeOfValues;
6464
indexBuffer += sizeof(size_t);
@@ -67,7 +67,7 @@ namespace settings
6767
indexBuffer += sizeof(size_t);
6868

6969
memcpy(buffer.data() + indexBuffer, values.data(), sizeOfValues);
70-
indexBuffer += sizeOfValues;
70+
indexBuffer += uint32_t(sizeOfValues);
7171

7272
return buffer;
7373
}
@@ -90,7 +90,7 @@ namespace settings
9090
*reinterpret_cast<size_t*>(buffer.data()) = name.length();
9191
indexBuffer += sizeof(size_t);
9292
memcpy(buffer.data() + indexBuffer, name.data(), name.length());
93-
indexBuffer += name.length();
93+
indexBuffer += uint32_t(name.length());
9494

9595
*reinterpret_cast<uint32_t*>(buffer.data() + indexBuffer) = paramsCount;
9696
indexBuffer += sizeof(uint32_t);

‎obs-studio-client/source/scene.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,11 @@ Nan::NAN_METHOD_RETURN_TYPE osn::Scene::GetItems(Nan::NAN_METHOD_ARGS_TYPE info)
353353
if (!ValidateResponse(response))
354354
return;
355355

356-
auto arr = Nan::New<v8::Array>(response.size() - 1);
356+
auto arr = Nan::New<v8::Array>(int(response.size()) - 1);
357357

358358
for (size_t i = 1; i < response.size(); i++) {
359359
osn::SceneItem* obj = new osn::SceneItem(response[i].value_union.ui64);
360-
Nan::Set(arr, i - 1, osn::SceneItem::Store(obj));
360+
Nan::Set(arr, uint32_t(i - 1), osn::SceneItem::Store(obj));
361361
}
362362

363363
info.GetReturnValue().Set(arr);
@@ -387,11 +387,11 @@ Nan::NAN_METHOD_RETURN_TYPE osn::Scene::GetItemsInRange(Nan::NAN_METHOD_ARGS_TYP
387387
if (!ValidateResponse(response))
388388
return;
389389

390-
auto arr = Nan::New<v8::Array>(response.size() - 1);
390+
auto arr = Nan::New<v8::Array>(int(response.size() - 1));
391391

392392
for (size_t i = 1; i < response.size(); i++) {
393393
osn::SceneItem* obj = new osn::SceneItem(response[i].value_union.ui64);
394-
Nan::Set(arr, i - 1, osn::SceneItem::Store(obj));
394+
Nan::Set(arr, uint32_t(i - 1), osn::SceneItem::Store(obj));
395395
}
396396

397397
info.GetReturnValue().Set(arr);

‎obs-studio-client/source/utility.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,19 @@
2121

2222
// This is from enc-amf
2323
#if (defined _WIN32) || (defined _WIN64) // Windows
24+
25+
#ifndef WIN32_LEAN_AND_MEAN
2426
#define WIN32_LEAN_AND_MEAN
27+
#endif
28+
29+
#ifdef WINVER
30+
#undef WINVER
31+
#endif
2532
#define WINVER 0x601
33+
34+
#ifdef _WIN32_WINNT
35+
#undef _WIN32_WINNT
36+
#endif
2637
#define _WIN32_WINNT 0x601
2738
#include <windows.h>
2839

‎obs-studio-server/source/nodeobs_api.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
#include "util/lexer.h"
44

55
#ifdef _WIN32
6+
7+
#ifdef _WIN32_WINNT
8+
#undef _WIN32_WINNT
9+
#endif
10+
611
#define _WIN32_WINNT 0x0502
712

813
#include <ShlObj.h>
@@ -18,7 +23,9 @@
1823
#define getcwd _getcwd
1924
#endif
2025

26+
#ifndef WIN32_LEAN_AND_MEAN
2127
#define WIN32_LEAN_AND_MEAN
28+
#endif
2229

2330
#include <audiopolicy.h>
2431
#include <mmdeviceapi.h>

0 commit comments

Comments
 (0)