backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

rename some vars

Browse Source
This commit is contained in:
FunkyFr3sh 2022-10-19 03:20:31 +02:00
parent ab773f6469
commit 876160cbb6
7 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/IDirectDrawSurface.h
View File

@ -30,10 +30,10 @@ typedef struct IDirectDrawSurfaceImpl
IDirectDrawPaletteImpl* palette; IDirectDrawPaletteImpl* palette;
void* surface; void* surface;
HANDLE surface_mapping; HANDLE mapping;
DWORD l_pitch; DWORD pitch;
DWORD lx_pitch; DWORD bytes_pp;
BOOL custom_surface; BOOL custom_buf;
PBITMAPINFO bmi; PBITMAPINFO bmi;
HBITMAP bitmap; HBITMAP bitmap;

6
src/IDirectDraw/IDirectDrawSurface.c
View File

@ -85,7 +85,7 @@ ULONG __stdcall IDirectDrawSurface__Release(IDirectDrawSurfaceImpl* This)
{ {
DeleteObject(This->bitmap); DeleteObject(This->bitmap);
} }
else if (This->surface && !This->custom_surface) else if (This->surface && !This->custom_buf)
{ {
HeapFree(GetProcessHeap(), 0, This->surface); HeapFree(GetProcessHeap(), 0, This->surface);
} }
@ -96,8 +96,8 @@ ULONG __stdcall IDirectDrawSurface__Release(IDirectDrawSurfaceImpl* This)
if (This->bmi) if (This->bmi)
HeapFree(GetProcessHeap(), 0, This->bmi); HeapFree(GetProcessHeap(), 0, This->bmi);
if (This->surface_mapping) if (This->mapping)
CloseHandle(This->surface_mapping); CloseHandle(This->mapping);
if (This->backbuffer) if (This->backbuffer)
IDirectDrawSurface_Release(This->backbuffer); IDirectDrawSurface_Release(This->backbuffer);

88
src/ddsurface.c
View File

@ -201,7 +201,7 @@ HRESULT dds_Blt(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
lpDDBltFx->dwFillColor, lpDDBltFx->dwFillColor,
This->bpp); This->bpp);
} }
@ -315,11 +315,11 @@ HRESULT dds_Blt(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_surface->l_pitch, src_surface->pitch,
color_key.dwColorSpaceLowValue, color_key.dwColorSpaceLowValue,
color_key.dwColorSpaceHighValue, color_key.dwColorSpaceHighValue,
This->bpp); This->bpp);
@ -332,13 +332,13 @@ HRESULT dds_Blt(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_w, src_w,
src_h, src_h,
src_surface->l_pitch, src_surface->pitch,
color_key.dwColorSpaceLowValue, color_key.dwColorSpaceLowValue,
color_key.dwColorSpaceHighValue, color_key.dwColorSpaceHighValue,
mirror_up_down, mirror_up_down,
@ -354,13 +354,13 @@ HRESULT dds_Blt(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_w, src_w,
src_h, src_h,
src_surface->l_pitch, src_surface->pitch,
This->bpp); This->bpp);
} }
else if (This == src_surface) else if (This == src_surface)
@ -371,11 +371,11 @@ HRESULT dds_Blt(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_surface->l_pitch, src_surface->pitch,
This->bpp); This->bpp);
} }
else else
@ -386,11 +386,11 @@ HRESULT dds_Blt(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_surface->l_pitch, src_surface->pitch,
This->bpp); This->bpp);
} }
} }
@ -587,11 +587,11 @@ HRESULT dds_BltFast(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_surface->l_pitch, src_surface->pitch,
src_surface->color_key.dwColorSpaceLowValue, src_surface->color_key.dwColorSpaceLowValue,
src_surface->color_key.dwColorSpaceHighValue, src_surface->color_key.dwColorSpaceHighValue,
This->bpp); This->bpp);
@ -604,11 +604,11 @@ HRESULT dds_BltFast(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_surface->l_pitch, src_surface->pitch,
This->bpp); This->bpp);
} }
else else
@ -619,11 +619,11 @@ HRESULT dds_BltFast(
dst_y, dst_y,
dst_w, dst_w,
dst_h, dst_h,
This->l_pitch, This->pitch,
src_buf, src_buf,
src_x, src_x,
src_y, src_y,
src_surface->l_pitch, src_surface->pitch,
This->bpp); This->bpp);
} }
} }
@ -669,7 +669,7 @@ HRESULT dds_GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC lpDDSur
lpDDSurfaceDesc->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_LPSURFACE | DDSD_BACKBUFFERCOUNT; lpDDSurfaceDesc->dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_LPSURFACE | DDSD_BACKBUFFERCOUNT;
lpDDSurfaceDesc->dwWidth = This->width; lpDDSurfaceDesc->dwWidth = This->width;
lpDDSurfaceDesc->dwHeight = This->height; lpDDSurfaceDesc->dwHeight = This->height;
lpDDSurfaceDesc->lPitch = This->l_pitch; lpDDSurfaceDesc->lPitch = This->pitch;
lpDDSurfaceDesc->lpSurface = dds_GetBuffer(This); lpDDSurfaceDesc->lpSurface = dds_GetBuffer(This);
lpDDSurfaceDesc->ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); lpDDSurfaceDesc->ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT);
lpDDSurfaceDesc->ddpfPixelFormat.dwFlags = DDPF_RGB; lpDDSurfaceDesc->ddpfPixelFormat.dwFlags = DDPF_RGB;
@ -734,12 +734,12 @@ HRESULT dds_Flip(IDirectDrawSurfaceImpl* This, IDirectDrawSurfaceImpl* lpDDSurfa
void* buf = InterlockedExchangePointer(&This->surface, backbuffer->surface); void* buf = InterlockedExchangePointer(&This->surface, backbuffer->surface);
HBITMAP bitmap = (HBITMAP)InterlockedExchangePointer(&This->bitmap, backbuffer->bitmap); HBITMAP bitmap = (HBITMAP)InterlockedExchangePointer(&This->bitmap, backbuffer->bitmap);
HDC dc = (HDC)InterlockedExchangePointer(&This->hdc, backbuffer->hdc); HDC dc = (HDC)InterlockedExchangePointer(&This->hdc, backbuffer->hdc);
HANDLE map = (HANDLE)InterlockedExchangePointer(&This->surface_mapping, backbuffer->surface_mapping); HANDLE map = (HANDLE)InterlockedExchangePointer(&This->mapping, backbuffer->mapping);
InterlockedExchangePointer(&backbuffer->surface, buf); InterlockedExchangePointer(&backbuffer->surface, buf);
InterlockedExchangePointer(&backbuffer->bitmap, bitmap); InterlockedExchangePointer(&backbuffer->bitmap, bitmap);
InterlockedExchangePointer(&backbuffer->hdc, dc); InterlockedExchangePointer(&backbuffer->hdc, dc);
InterlockedExchangePointer(&backbuffer->surface_mapping, map); InterlockedExchangePointer(&backbuffer->mapping, map);
if (g_ddraw->flipclear) if (g_ddraw->flipclear)
{ {
@ -955,7 +955,7 @@ HRESULT dds_Lock(
} }
lpDDSurfaceDesc->lpSurface = lpDDSurfaceDesc->lpSurface =
(char*)dds_GetBuffer(This) + (lpDestRect->left * This->lx_pitch) + (lpDestRect->top * This->l_pitch); (char*)dds_GetBuffer(This) + (lpDestRect->left * This->bytes_pp) + (lpDestRect->top * This->pitch);
} }
return ret; return ret;
@ -1181,7 +1181,7 @@ HRESULT dds_SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD
DeleteObject(This->bitmap); DeleteObject(This->bitmap);
This->bitmap = NULL; This->bitmap = NULL;
} }
else if (This->surface && !This->custom_surface) else if (This->surface && !This->custom_buf)
{ {
HeapFree(GetProcessHeap(), 0, This->surface); HeapFree(GetProcessHeap(), 0, This->surface);
This->surface = NULL; This->surface = NULL;
@ -1199,10 +1199,10 @@ HRESULT dds_SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD
This->bmi = NULL; This->bmi = NULL;
} }
if (This->surface_mapping) if (This->mapping)
{ {
CloseHandle(This->surface_mapping); CloseHandle(This->mapping);
This->surface_mapping = NULL; This->mapping = NULL;
} }
@ -1230,10 +1230,10 @@ HRESULT dds_SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD
This->width = lpDDSD->dwWidth; This->width = lpDDSD->dwWidth;
This->height = lpDDSD->dwHeight; This->height = lpDDSD->dwHeight;
This->surface = lpDDSD->lpSurface; This->surface = lpDDSD->lpSurface;
This->l_pitch = lpDDSD->lPitch; This->pitch = lpDDSD->lPitch;
This->lx_pitch = This->bpp / 8; This->bytes_pp = This->bpp / 8;
This->size = This->l_pitch * This->height; This->size = This->pitch * This->height;
This->custom_surface = TRUE; This->custom_buf = TRUE;
return DD_OK; return DD_OK;
} }
@ -1324,21 +1324,21 @@ HRESULT dd_CreateSurface(
if ((dst_surface->flags & DDSD_LPSURFACE) && (dst_surface->flags & DDSD_PITCH)) if ((dst_surface->flags & DDSD_LPSURFACE) && (dst_surface->flags & DDSD_PITCH))
{ {
dst_surface->surface = lpDDSurfaceDesc->lpSurface; dst_surface->surface = lpDDSurfaceDesc->lpSurface;
dst_surface->l_pitch = lpDDSurfaceDesc->lPitch; dst_surface->pitch = lpDDSurfaceDesc->lPitch;
dst_surface->lx_pitch = dst_surface->bpp / 8; dst_surface->bytes_pp = dst_surface->bpp / 8;
dst_surface->size = dst_surface->l_pitch * dst_surface->height; dst_surface->size = dst_surface->pitch * dst_surface->height;
dst_surface->custom_surface = TRUE; dst_surface->custom_buf = TRUE;
} }
else if (dst_surface->width && dst_surface->height) else if (dst_surface->width && dst_surface->height)
{ {
dst_surface->lx_pitch = dst_surface->bpp / 8; dst_surface->bytes_pp = dst_surface->bpp / 8;
dst_surface->l_pitch = ((dst_surface->width * dst_surface->bpp + 31) & ~31) >> 3; dst_surface->pitch = ((dst_surface->width * dst_surface->bpp + 31) & ~31) >> 3;
dst_surface->size = dst_surface->l_pitch * dst_surface->height; dst_surface->size = dst_surface->pitch * dst_surface->height;
DWORD aligned_width = dst_surface->l_pitch / dst_surface->lx_pitch; DWORD aligned_width = dst_surface->pitch / dst_surface->bytes_pp;
DWORD bmi_size = sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256; DWORD bmi_size = sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256;
DWORD bmp_size = dst_surface->l_pitch * (dst_surface->height + g_ddraw->guard_lines); DWORD bmp_size = dst_surface->pitch * (dst_surface->height + g_ddraw->guard_lines);
dst_surface->bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmi_size); dst_surface->bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmi_size);
dst_surface->bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); dst_surface->bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
@ -1383,7 +1383,7 @@ HRESULT dd_CreateSurface(
dst_surface->hdc = CreateCompatibleDC(g_ddraw->render.hdc); dst_surface->hdc = CreateCompatibleDC(g_ddraw->render.hdc);
dst_surface->surface_mapping = dst_surface->mapping =
CreateFileMappingA( CreateFileMappingA(
INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE,
NULL, NULL,
@ -1394,9 +1394,9 @@ HRESULT dd_CreateSurface(
DWORD map_offset = 0; DWORD map_offset = 0;
if (dst_surface->surface_mapping) if (dst_surface->mapping)
{ {
LPVOID data = MapViewOfFile(dst_surface->surface_mapping, FILE_MAP_ALL_ACCESS, 0, 0, 0); LPVOID data = MapViewOfFile(dst_surface->mapping, FILE_MAP_ALL_ACCESS, 0, 0, 0);
if (data) if (data)
{ {
while (((DWORD)data + map_offset) % 128) map_offset++; while (((DWORD)data + map_offset) % 128) map_offset++;
@ -1406,8 +1406,8 @@ HRESULT dd_CreateSurface(
if (!data || (map_offset % sizeof(DWORD))) if (!data || (map_offset % sizeof(DWORD)))
{ {
map_offset = 0; map_offset = 0;
CloseHandle(dst_surface->surface_mapping); CloseHandle(dst_surface->mapping);
dst_surface->surface_mapping = NULL; dst_surface->mapping = NULL;
} }
} }
@ -1417,7 +1417,7 @@ HRESULT dd_CreateSurface(
dst_surface->bmi, dst_surface->bmi,
DIB_RGB_COLORS, DIB_RGB_COLORS,
(void**)&dst_surface->surface, (void**)&dst_surface->surface,
dst_surface->surface_mapping, dst_surface->mapping,
map_offset); map_offset);
dst_surface->bmi->bmiHeader.biHeight = -((int)dst_surface->height); dst_surface->bmi->bmiHeader.biHeight = -((int)dst_surface->height);

2
src/render_d3d9.c
View File

@ -486,7 +486,7 @@ DWORD WINAPI d3d9_render_main(void)
g_ddraw->primary->surface, g_ddraw->primary->surface,
0, 0,
0, 0,
g_ddraw->primary->l_pitch, g_ddraw->primary->pitch,
g_ddraw->primary->bpp); g_ddraw->primary->bpp);
IDirect3DTexture9_UnlockRect(g_d3d9.surface_tex[tex_index], 0); IDirect3DTexture9_UnlockRect(g_d3d9.surface_tex[tex_index], 0);

2
src/render_ogl.c
View File

@ -662,7 +662,7 @@ static void ogl_render()
glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[tex_index]); glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[tex_index]);
DWORD row_len = g_ddraw->primary->l_pitch ? g_ddraw->primary->l_pitch / g_ddraw->primary->lx_pitch : 0; DWORD row_len = g_ddraw->primary->pitch ? g_ddraw->primary->pitch / g_ddraw->primary->bytes_pp : 0;
if (row_len != g_ddraw->primary->width) if (row_len != g_ddraw->primary->width)
glPixelStorei(GL_UNPACK_ROW_LENGTH, row_len); glPixelStorei(GL_UNPACK_ROW_LENGTH, row_len);

6
src/screenshot.c
View File

@ -36,7 +36,7 @@ static BOOL ss_screenshot_8bit(char* filename, IDirectDrawSurfaceImpl* src)
&dst_buf, &dst_buf,
&dst_buf_size, &dst_buf_size,
dds_GetBuffer(src), dds_GetBuffer(src),
src->l_pitch / src->lx_pitch, /* can't specify pitch so we use bitmap real width */ src->pitch / src->bytes_pp, /* can't specify pitch so we use bitmap real width */
src->height, src->height,
&state); &state);
@ -68,7 +68,7 @@ static BOOL ss_screenshot_16bit(char* filename, IDirectDrawSurfaceImpl* src)
dds_GetBuffer(src), dds_GetBuffer(src),
0, 0,
0, 0,
src->l_pitch); src->pitch);
error = lodepng_encode32_file(filename, (unsigned char*)buf, src->width, src->height); error = lodepng_encode32_file(filename, (unsigned char*)buf, src->width, src->height);
@ -95,7 +95,7 @@ static BOOL ss_screenshot_32bit(char* filename, IDirectDrawSurfaceImpl* src)
dds_GetBuffer(src), dds_GetBuffer(src),
0, 0,
0, 0,
src->l_pitch); src->pitch);
error = lodepng_encode32_file(filename, (unsigned char*)buf, src->width, src->height); error = lodepng_encode32_file(filename, (unsigned char*)buf, src->width, src->height);

2
src/utils.c
View File

@ -479,7 +479,7 @@ BOOL CALLBACK util_enum_child_proc(HWND hwnd, LPARAM lparam)
static unsigned char util_get_pixel(int x, int y) static unsigned char util_get_pixel(int x, int y)
{ {
return ((unsigned char*)dds_GetBuffer( return ((unsigned char*)dds_GetBuffer(
g_ddraw->primary))[y * g_ddraw->primary->l_pitch + x * g_ddraw->primary->lx_pitch]; g_ddraw->primary))[y * g_ddraw->primary->pitch + x * g_ddraw->primary->bytes_pp];
} }
BOOL util_detect_low_res_screen() BOOL util_detect_low_res_screen()