Skip to content

Commit 597bcf8

Browse files
pedro-wSiegeLord
authored andcommitted
Fix issues from code review
1 parent e104391 commit 597bcf8

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

addons/native_dialog/win_dialog.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ bool _al_show_native_file_dialog(ALLEGRO_DISPLAY *display,
245245
wpath = _twin_ustr_to_tchar(path);
246246
}
247247
else {
248-
//al_ustr_encode_utf16(path, buf, sizeof(buf));
249248
/* Extract the directory from the path. */
250249
initial_dir_path = al_clone_path(fd->fc_initial_path);
251250
if (initial_dir_path) {

src/win/wgl_disp.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,35 +99,35 @@ static HGLRC init_temp_context(HWND wnd)
9999
memset(&pfd, 0, sizeof(pfd));
100100
pfd.nSize = sizeof(pfd);
101101
pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL
102-
| PFD_DOUBLEBUFFER_DONTCARE | PFD_STEREO_DONTCARE;
102+
| PFD_DOUBLEBUFFER_DONTCARE | PFD_STEREO_DONTCARE;
103103
pfd.iPixelType = PFD_TYPE_RGBA;
104104
pfd.iLayerType = PFD_MAIN_PLANE;
105105
pfd.cColorBits = 32;
106106

107107
pf = ChoosePixelFormat(dc, &pfd);
108108
if (!pf) {
109109
ALLEGRO_ERROR("Unable to chose a temporary pixel format. %s\n",
110-
_al_win_last_error());
110+
_al_win_last_error());
111111
return NULL;
112112
}
113113

114114
memset(&pfd, 0, sizeof(pfd));
115115
if (!SetPixelFormat(dc, pf, &pfd)) {
116116
ALLEGRO_ERROR("Unable to set a temporary pixel format. %s\n",
117-
_al_win_last_error());
117+
_al_win_last_error());
118118
return NULL;
119119
}
120120

121121
glrc = wglCreateContext(dc);
122122
if (!glrc) {
123123
ALLEGRO_ERROR("Unable to create a render context. %s\n",
124-
_al_win_last_error());
124+
_al_win_last_error());
125125
return NULL;
126126
}
127127

128128
if (!wglMakeCurrent(dc, glrc)) {
129129
ALLEGRO_ERROR("Unable to set the render context as current. %s\n",
130-
_al_win_last_error());
130+
_al_win_last_error());
131131
wglDeleteContext(glrc);
132132
return NULL;
133133
}

src/win/wjoydxnu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,8 @@ static void fill_joystick_info_using_caps_and_names(ALLEGRO_JOYSTICK_DIRECTX *jo
575575

576576
#define N_STICK (info->num_sticks)
577577
#define N_AXIS (info->stick[N_STICK].num_axes)
578-
#define ADD_STRING(A, dfl) (add_string(joy->all_names, (A), &pos, \
578+
#define ADD_STRING(A, dfl) \
579+
(add_string(joy->all_names, (A), &pos, \
579580
sizeof(joy->all_names), (dfl)))
580581

581582
/* the X, Y, Z axes make up the first stick */
@@ -700,7 +701,6 @@ static void fill_joystick_info_using_caps_and_names(ALLEGRO_JOYSTICK_DIRECTX *jo
700701
#undef N_AXIS
701702
#undef N_STICK
702703
#undef ADD_STRING
703-
#undef ADD_STRING
704704
}
705705

706706

0 commit comments

Comments
 (0)