wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Stefan Dösinger : d3d9/tests: Test user memory and getdc interaction.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 03fe6f3e0781b09073541ca65b9ffcc0bb2f5cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fe6f3e0781b09073541ca65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 22:30:43 2013 +0100 d3d9/tests: Test user memory and getdc interaction. --- dlls/d3d9/tests/Makefile.in | 2 +- dlls/d3d9/tests/d3d9ex.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/Makefile.in b/dlls/d3d9/tests/Makefile.in index 380d105..7b205be 100644 --- a/dlls/d3d9/tests/Makefile.in +++ b/dlls/d3d9/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d9.dll -IMPORTS = user32 +IMPORTS = user32 gdi32 C_SRCS = \ d3d9ex.c \ diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 7f39d70..7ac8bb3 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1151,6 +1151,50 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirect3DDevice9Ex *device; + HWND window; + HRESULT hr; + ULONG ref; + IDirect3DSurface9 *surface; + DWORD *data; + HDC dc; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * 16 * 16); + memset(data, 0xaa, sizeof(*data) * 16 * 16); + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface(device, 16, 16, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &surface, (HANDLE *)&data); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirect3DSurface9_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get dc, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirect3DSurface9_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release dc, hr %#x.\n", hr); + + ok(data[0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0]); + ok(data[8 * 16] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[8 * 16]); + + IDirect3DSurface9_Release(surface); + HeapFree(GetProcessHeap(), 0, data); + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + DestroyWindow(window); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -1180,4 +1224,5 @@ START_TEST(d3d9ex) test_reset(); test_reset_resources(); test_vidmem_accounting(); + test_user_memory_getdc(); }

1 0

Frédéric Delanoy : wined3d: Use BOOL type where appropriate.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: cc6f9c36cd58cf28b56db7726052ebd382027f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6f9c36cd58cf28b56db7726… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 20:05:34 2013 +0100 wined3d: Use BOOL type where appropriate. --- dlls/wined3d/arb_program_shader.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0821fc2..23ca809 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1506,17 +1506,16 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in const struct wined3d_shader_src_param *src, unsigned int tmpreg, char *outregstr) { /* Generate a line that does the input modifier computation and return the input register to use */ - BOOL is_color = FALSE; + BOOL is_color = FALSE, insert_line; char regstr[256]; char swzstr[20]; - int insert_line; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; const char *one = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ONE); const char *two = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_TWO); /* Assume a new line will be added */ - insert_line = 1; + insert_line = TRUE; /* Get register name */ shader_arb_get_register_name(ins, &src->reg, regstr, &is_color); @@ -1526,11 +1525,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in { case WINED3DSPSM_NONE: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_NEG: sprintf(outregstr, "-%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; break; case WINED3DSPSM_BIAS: shader_addline(buffer, "ADD T%c, %s, -coefdiv.x;\n", 'A' + tmpreg, regstr); @@ -1564,7 +1563,7 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in case WINED3DSPSM_ABS: if(ctx->target_version >= NV2) { sprintf(outregstr, "|%s%s|", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } else { shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); } @@ -1576,11 +1575,11 @@ static void shader_arb_get_src_param(const struct wined3d_shader_instruction *in shader_addline(buffer, "ABS T%c, %s;\n", 'A' + tmpreg, regstr); sprintf(outregstr, "-T%c%s", 'A' + tmpreg, swzstr); } - insert_line = 0; + insert_line = FALSE; break; default: sprintf(outregstr, "%s%s", regstr, swzstr); - insert_line = 0; + insert_line = FALSE; } /* Return modified or original register, with swizzle */

1 0

Alexandre Bique : cmd: Update the string of the ver command.
by Alexandre Julliard 12 Dec '13

12 Dec '13

1 0

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 8a10493e6bd91df632ec145dcc797b7661ad60c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a10493e6bd91df632ec145dc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 20:57:15 2013 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/dosexe.h | 2 +- dlls/krnl386.exe16/int16.c | 6 ++-- dlls/krnl386.exe16/int21.c | 51 ++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 0b813e1..f9df172 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -404,7 +404,7 @@ extern void WINAPI DOSVM_Int15Handler(CONTEXT*); /* int16.c */ extern void WINAPI DOSVM_Int16Handler(CONTEXT*); extern BOOL DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT * ); -extern int DOSVM_Int16AddChar(BYTE ascii,BYTE scan); +extern BOOL DOSVM_Int16AddChar(BYTE ascii, BYTE scan); /* int21.c */ extern void WINAPI DOSVM_Int21Handler(CONTEXT*); diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c index 5d84a0b..c731472 100644 --- a/dlls/krnl386.exe16/int16.c +++ b/dlls/krnl386.exe16/int16.c @@ -195,7 +195,7 @@ BOOL DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx) return TRUE; } -int DOSVM_Int16AddChar(BYTE ascii,BYTE scan) +BOOL DOSVM_Int16AddChar(BYTE ascii,BYTE scan) { BIOSDATA *data = DOSVM_BiosData(); WORD CurOfs = data->FirstKbdCharPtr; @@ -204,12 +204,12 @@ int DOSVM_Int16AddChar(BYTE ascii,BYTE scan) TRACE("(%02x,%02x)\n",ascii,scan); if (NextOfs >= data->KbdBufferEnd) NextOfs = data->KbdBufferStart; /* check if buffer is full */ - if (NextOfs == data->NextKbdCharPtr) return 0; + if (NextOfs == data->NextKbdCharPtr) return FALSE; /* okay, insert character in ring buffer */ ((BYTE*)data)[CurOfs] = ascii; ((BYTE*)data)[CurOfs+1] = scan; data->FirstKbdCharPtr = NextOfs; - return 1; + return TRUE; } diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 3652054..53b6537 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -3437,7 +3437,7 @@ static int INT21_GetDiskSerialNumber( CONTEXT *context ) * INT21_SetDiskSerialNumber * */ -static int INT21_SetDiskSerialNumber( CONTEXT *context ) +static BOOL INT21_SetDiskSerialNumber( CONTEXT *context ) { #if 0 BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); @@ -3446,15 +3446,15 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context ) if (!is_valid_drive(drive)) { SetLastError( ERROR_INVALID_DRIVE ); - return 0; + return FALSE; } DRIVE_SetSerialNumber( drive, *(DWORD *)(dataptr + 2) ); - return 1; + return TRUE; #else FIXME("Setting drive serial number is no longer supported\n"); SetLastError( ERROR_NOT_SUPPORTED ); - return 0; + return FALSE; #endif } @@ -3463,7 +3463,7 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context ) * INT21_GetFreeDiskSpace * */ -static int INT21_GetFreeDiskSpace( CONTEXT *context ) +static BOOL INT21_GetFreeDiskSpace( CONTEXT *context ) { DWORD cluster_sectors, sector_bytes, free_clusters, total_clusters; WCHAR root[] = {'A',':','\\',0}; @@ -3473,7 +3473,8 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context ) root[0] += INT21_MapDrive(DL_reg(context)); if (!GetDiskFreeSpaceW( root, &cluster_sectors, &sector_bytes, - &free_clusters, &total_clusters )) return 0; + &free_clusters, &total_clusters )) + return FALSE; /* Some old win31 apps (Lotus SmartSuite 5.1) crap out if there's too * much disk space, so Windows XP seems to apply the following limits: @@ -3530,19 +3531,19 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context ) SET_BX( context, free_clusters ); SET_CX( context, sector_bytes ); SET_DX( context, total_clusters ); - return 1; + return TRUE; } /****************************************************************** * INT21_GetDriveAllocInfo * */ -static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) +static BOOL INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) { INT21_DPB *dpb; drive = INT21_MapDrive( drive ); - if (!INT21_FillDrivePB( drive )) return 0; + if (!INT21_FillDrivePB( drive )) return FALSE; dpb = &(INT21_GetHeapPointer()->misc_dpb_list[drive]); SET_AL( context, dpb->cluster_sectors + 1 ); SET_CX( context, dpb->sector_bytes ); @@ -3550,7 +3551,7 @@ static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive ) context->SegDs = INT21_GetHeapSelector( context ); SET_BX( context, offsetof( INT21_HEAP, misc_dpb_list[drive].media_ID ) ); - return 1; + return TRUE; } /*********************************************************************** @@ -3800,7 +3801,7 @@ static const WCHAR *INT21_FindPath; /* will point to current dta->fullPath searc /****************************************************************** * INT21_FindFirst */ -static int INT21_FindFirst( CONTEXT *context ) +static BOOL INT21_FindFirst( CONTEXT *context ) { WCHAR *p, *q; const char *path; @@ -3829,7 +3830,7 @@ static int INT21_FindFirst( CONTEXT *context ) SetLastError( ERROR_FILE_NOT_FOUND ); SET_AX( context, ERROR_FILE_NOT_FOUND ); SET_CFLAG(context); - return 0; + return FALSE; } WideCharToMultiByte(CP_OEMCP, 0, maskW, 12, dta->mask, sizeof(dta->mask), NULL, NULL); @@ -3842,7 +3843,7 @@ static int INT21_FindFirst( CONTEXT *context ) dta->drive = toupperW(dta->fullPath[0]) - 'A'; dta->count = 0; dta->search_attr = CL_reg(context); - return 1; + return TRUE; } /****************************************************************** @@ -3930,14 +3931,14 @@ static unsigned INT21_FindHelper(LPCWSTR fullPath, unsigned drive, unsigned coun /****************************************************************** * INT21_FindNext */ -static int INT21_FindNext( CONTEXT *context ) +static BOOL INT21_FindNext( CONTEXT *context ) { FINDFILE_DTA *dta = (FINDFILE_DTA *)INT21_GetCurrentDTA(context); DWORD attr = dta->search_attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY; WIN32_FIND_DATAW entry; int n; - if (!dta->fullPath) return 0; + if (!dta->fullPath) return FALSE; n = INT21_FindHelper(dta->fullPath, dta->drive, dta->count, dta->mask, attr, &entry); @@ -3962,11 +3963,11 @@ static int INT21_FindNext( CONTEXT *context ) INT21_FindPath = dta->fullPath = NULL; } dta->count = n; - return 1; + return TRUE; } HeapFree( GetProcessHeap(), 0, dta->fullPath ); INT21_FindPath = dta->fullPath = NULL; - return 0; + return FALSE; } /* microsoft's programmers should be shot for using CP/M style int21 @@ -3976,7 +3977,7 @@ static int INT21_FindNext( CONTEXT *context ) * INT21_FindFirstFCB * */ -static int INT21_FindFirstFCB( CONTEXT *context ) +static BOOL INT21_FindFirstFCB( CONTEXT *context ) { BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; @@ -3986,21 +3987,21 @@ static int INT21_FindFirstFCB( CONTEXT *context ) if (*fcb == 0xff) pFCB = (FINDFILE_FCB *)(fcb + 7); else pFCB = (FINDFILE_FCB *)fcb; drive = INT21_MapDrive( pFCB->drive ); - if (drive == MAX_DOS_DRIVES) return 0; + if (drive == MAX_DOS_DRIVES) return FALSE; p[0] = 'A' + drive; pFCB->fullPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!pFCB->fullPath) return 0; + if (!pFCB->fullPath) return FALSE; GetLongPathNameW(p, pFCB->fullPath, MAX_PATH); pFCB->count = 0; - return 1; + return TRUE; } /****************************************************************** * INT21_FindNextFCB * */ -static int INT21_FindNextFCB( CONTEXT *context ) +static BOOL INT21_FindNextFCB( CONTEXT *context ) { BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; @@ -4022,14 +4023,14 @@ static int INT21_FindNextFCB( CONTEXT *context ) pFCB = (FINDFILE_FCB *)fcb; } - if (!pFCB->fullPath) return 0; + if (!pFCB->fullPath) return FALSE; n = INT21_FindHelper(pFCB->fullPath, INT21_MapDrive( pFCB->drive ), pFCB->count, pFCB->filename, attr, &entry); if (!n) { HeapFree( GetProcessHeap(), 0, pFCB->fullPath ); INT21_FindPath = pFCB->fullPath = NULL; - return 0; + return FALSE; } pFCB->count += n; @@ -4055,7 +4056,7 @@ static int INT21_FindNextFCB( CONTEXT *context ) else INT21_ToDosFCBFormat( entry.cFileName, nameW ); WideCharToMultiByte(CP_OEMCP, 0, nameW, 11, ddl->filename, 11, NULL, NULL); - return 1; + return TRUE; }

1 0

Alexandre Julliard : makefiles: Add separate clean targets even in the non-recursive case.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: e0d5010f404da77b881c552ac5618b9aa62f79bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d5010f404da77b881c552ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 17:25:51 2013 +0100 makefiles: Add separate clean targets even in the non-recursive case. --- aclocal.m4 | 8 ++++++-- configure | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f186ce1..e09045f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -315,7 +315,9 @@ $ac_dir/clean: $ac_dir/Makefile \$(RM) $ac_dir/Makefile" else wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" fi } @@ -325,7 +327,9 @@ wine_fn_disabled_rules () ac_clean=$[@] wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" } diff --git a/configure b/configure index 95058cf..1b160db 100755 --- a/configure +++ b/configure @@ -16312,7 +16312,9 @@ $ac_dir/clean: $ac_dir/Makefile \$(RM) $ac_dir/Makefile" else wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" fi } @@ -16322,7 +16324,9 @@ wine_fn_disabled_rules () ac_clean=$@ wine_fn_append_rule \ -"clean:: +"__clean__: $ac_dir/clean +.PHONY: $ac_dir/clean +$ac_dir/clean: dummy \$(RM) \$(CLEAN_FILES:%=$ac_dir/%) $ac_clean $ac_dir/Makefile" }

1 0

Alexandre Julliard : makefiles: Explicitly specify source directory in font dependencies.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 7a8d1838b032ce8c10d26222ed6575b8f9fb405f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8d1838b032ce8c10d26222e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 13:25:14 2013 +0100 makefiles: Explicitly specify source directory in font dependencies. --- fonts/Makefile.in | 108 ++++++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 55 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 07177ca..43ad860 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -59,170 +59,168 @@ TRUETYPE_FONTS = \ tahomabd.ttf \ wingding.ttf -FONTS = $(BITMAP_FONTS) $(TRUETYPE_FONTS) - -all: $(FONTS) +all: $(BITMAP_FONTS) @MAKE_RULES@ -coure.fon: courier.ttf +coure.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1252,8 -couree.fon: courier.ttf +couree.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1250,8 -courer.fon: courier.ttf +courer.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1251,8 -coureg.fon: courier.ttf +coureg.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1253,8 -couret.fon: courier.ttf +couret.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1254,8 -coue1255.fon: courier.ttf +coue1255.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1255,8 -coue1256.fon: courier.ttf +coue1256.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1256,8 -coue1257.fon: courier.ttf +coue1257.fon: $(srcdir)/courier.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1257,8 -vgafix.fon: fixedsys.ttf +vgafix.fon: $(srcdir)/fixedsys.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8 -jvgafix.fon: fixedsys_jp.ttf +jvgafix.fon: $(srcdir)/fixedsys_jp.ttf $(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8 -sserife.fon: ms_sans_serif.ttf +sserife.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8 -sseriff.fon: ms_sans_serif.ttf +sseriff.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1252,7 20,1252,8 -sserifee.fon: ms_sans_serif.ttf +sserifee.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7 -sseriffe.fon: ms_sans_serif.ttf +sseriffe.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1250,7 -sserifer.fon: ms_sans_serif.ttf +sserifer.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8 -sseriffr.fon: ms_sans_serif.ttf +sseriffr.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1251,7 20,1251,8 -sserifeg.fon: ms_sans_serif.ttf +sserifeg.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8 -sseriffg.fon: ms_sans_serif.ttf +sseriffg.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1253,7 20,1253,8 -sserifet.fon: ms_sans_serif.ttf +sserifet.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8 -sserifft.fon: ms_sans_serif.ttf +sserifft.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1254,7 20,1254,8 -ssee1255.fon: ms_sans_serif.ttf +ssee1255.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8 -ssef1255.fon: ms_sans_serif.ttf +ssef1255.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1255,7 20,1255,8 -ssee1256.fon: ms_sans_serif.ttf +ssee1256.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8 -ssef1256.fon: ms_sans_serif.ttf +ssef1256.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1256,7 20,1256,8 -ssee1257.fon: ms_sans_serif.ttf +ssee1257.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8 -ssef1257.fon: ms_sans_serif.ttf +ssef1257.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1257,7 20,1257,8 -ssee874.fon: ms_sans_serif.ttf +ssee874.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8 -ssef874.fon: ms_sans_serif.ttf +ssef874.fon: $(srcdir)/ms_sans_serif.ttf $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,874,7 20,874,8 -smalle.fon: small_fonts.ttf +smalle.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5 -smallee.fon: small_fonts.ttf +smallee.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1250,5 -smaller.fon: small_fonts.ttf +smaller.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1251,5 -smalleg.fon: small_fonts.ttf +smalleg.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1253,5 -smallet.fon: small_fonts.ttf +smallet.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1254,5 -smae1255.fon: small_fonts.ttf +smae1255.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1255,5 -smae1256.fon: small_fonts.ttf +smae1256.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1256,5 -smae1257.fon: small_fonts.ttf +smae1257.fon: $(srcdir)/small_fonts.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1257,5 -jsmalle.fon: small_fonts_jp.ttf +jsmalle.fon: $(srcdir)/small_fonts_jp.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts_jp.ttf 11,932,7 -vgasys.fon: system.ttf +vgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1252,7 -vgasyse.fon: system.ttf +vgasyse.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1250,7 -vgasysr.fon: system.ttf +vgasysr.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1251,7 -vgasysg.fon: system.ttf +vgasysg.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1253,7 -vgasyst.fon: system.ttf +vgasyst.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1254,7 -vgas1255.fon: system.ttf +vgas1255.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1255,7 -vgas1256.fon: system.ttf +vgas1256.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1256,7 -vgas1257.fon: system.ttf +vgas1257.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1257,7 -vgas874.fon: system.ttf +vgas874.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,874,7 -jvgasys.fon: system.ttf +jvgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 18,932,8 -svgasys.fon: system.ttf +svgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,936,7 16,1252,7 -hvgasys.fon: system.ttf +hvgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,949,7 -cvgasys.fon: system.ttf +cvgasys.fon: $(srcdir)/system.ttf $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,950,7 16,1252,7 $(BITMAP_FONTS): $(SFNT2FNT) -install install-lib:: $(FONTS) $(INSTALLDIRS) +install install-lib:: $(BITMAP_FONTS) $(INSTALLDIRS) for i in $(BITMAP_FONTS); do $(INSTALL_DATA) $$i $(DESTDIR)$(fontdir)/$$i || exit 1; done for i in $(TRUETYPE_FONTS); do $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(fontdir)/$$i || exit 1; done uninstall:: - -cd $(DESTDIR)$(fontdir) && $(RM) $(FONTS) + -cd $(DESTDIR)$(fontdir) && $(RM) $(BITMAP_FONTS) $(TRUETYPE_FONTS) -rmdir $(DESTDIR)$(fontdir) clean::

1 0

Alexandre Julliard : makefiles: Explicitly specify source directory in spec file dependencies.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: 180bc4b878c4151a6dba8706f6a213a0120c1089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180bc4b878c4151a6dba8706f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 13:23:57 2013 +0100 makefiles: Explicitly specify source directory in spec file dependencies. --- Make.rules.in | 4 ++-- aclocal.m4 | 8 ++++---- configure | 12 ++++++------ configure.ac | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index dff13b8..6b9a996 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -69,10 +69,10 @@ $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_SRCS:.c=.o) $(RANLIB) $@ $(IMPORTLIB:%=lib%.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) - $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.o) + $(WINEBUILD) $(TARGETFLAGS) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.o) $(IMPORTLIB:%=lib%.cross.a): $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) - $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(srcdir)/$(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) + $(WINEBUILD) $(CROSSTARGET:%=-b %) -w --implib -o $@ --export $(MAINSPEC) $(IMPLIB_SRCS:.c=.cross.o) # Rules for dependencies diff --git a/aclocal.m4 b/aclocal.m4 index 6231772..f186ce1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -432,7 +432,7 @@ $ac_dir/uninstall:: wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @@ -465,9 +465,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec .PHONY: $ac_dir/install-dev $ac_dir/uninstall $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) @@ -480,7 +480,7 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec" fi diff --git a/configure b/configure index 9953777..95058cf 100755 --- a/configure +++ b/configure @@ -16137,9 +16137,9 @@ fi MAKE_DLL_RULES=" DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(MODULE:%.dll=%).spec +MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) +MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) all: $deps @@ -16439,7 +16439,7 @@ fi wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: $ac_dir/Makefile dummy @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT @@ -16472,9 +16472,9 @@ $ac_file.cross.a: $ac_dir/Makefile dummy then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.def: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.def: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec .PHONY: $ac_dir/install-dev $ac_dir/uninstall $ac_dir/install-dev:: $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir) @@ -16487,7 +16487,7 @@ __uninstall__: $ac_dir/uninstall" then wine_fn_append_rule \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: $ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) +$ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec $ac_dir/Makefile \$(WINEBUILD) \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export $srcdir/$ac_dir/$ac_name.spec" fi diff --git a/configure.ac b/configure.ac index aa17064..c2c7460 100644 --- a/configure.ac +++ b/configure.ac @@ -2610,9 +2610,9 @@ fi AC_SUBST(MAKE_DLL_RULES," DLLFLAGS = $DLLFLAGS -MAINSPEC = \$(MODULE:%.dll=%).spec +MAINSPEC = \$(srcdir)/\$(MODULE:%.dll=%).spec IDL_TLB_RES = \$(IDL_TLB_SRCS:.idl=_t.res) -MODULEFLAGS = -shared \$(srcdir)/\$(MAINSPEC) \$(EXTRADLLFLAGS) +MODULEFLAGS = -shared \$(MAINSPEC) \$(EXTRADLLFLAGS) all: $deps

1 0

Alexandre Julliard : makefiles: Explicitly specify source directory in Makefile dependencies.
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: be2c66d50493d8661ab4a7549850a70e794bb53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2c66d50493d8661ab4a7549… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 13:15:34 2013 +0100 makefiles: Explicitly specify source directory in Makefile dependencies. --- Makefile.in | 4 ++-- aclocal.m4 | 11 +++++++---- configure | 13 ++++++++----- configure.ac | 2 +- tools/makedep.c | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index eb4d0da..c2bb1ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,11 +32,11 @@ all: wine # Rules for re-running configure -config.status: configure +config.status: $(srcdir)/configure @./config.status --recheck include/config.h: include/stamp-h -include/stamp-h: include/config.h.in config.status +include/stamp-h: $(srcdir)/include/config.h.in config.status @./config.status include/config.h include/stamp-h # Rules for cleaning diff --git a/aclocal.m4 b/aclocal.m4 index d6f5790..6231772 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -219,12 +219,15 @@ wine_fn_depend_rules () ac_makedep="\$(MAKEDEP)" ac_input=Make.vars.in:$ac_dir/Makefile.in case $[1] in - *.in) ac_input=$ac_input:$[1] ;; - *) ac_makedep="$[1] $ac_makedep" ;; + *.in) + ac_input=$ac_input:$[1] + test "$srcdir" = . || ac_alldeps="$srcdir/$ac_alldeps" ;; + *) + ac_makedep="$[1] $ac_makedep" ;; esac wine_fn_append_rule \ -"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps \$(MAKEDEP) +"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status $ac_alldeps \$(MAKEDEP) @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/depend .PHONY: $ac_dir/depend @@ -628,7 +631,7 @@ wine_fn_config_makerules () ac_rules=$[1] ac_deps=$[2] wine_fn_append_rule \ -"$ac_rules: $ac_rules.in $ac_deps config.status +"$ac_rules: $srcdir/$ac_rules.in $ac_deps config.status @./config.status $ac_rules distclean:: \$(RM) $ac_rules" diff --git a/configure b/configure index 81a474f..9953777 100755 --- a/configure +++ b/configure @@ -16216,12 +16216,15 @@ wine_fn_depend_rules () ac_makedep="\$(MAKEDEP)" ac_input=Make.vars.in:$ac_dir/Makefile.in case $1 in - *.in) ac_input=$ac_input:$1 ;; - *) ac_makedep="$1 $ac_makedep" ;; + *.in) + ac_input=$ac_input:$1 + test "$srcdir" = . || ac_alldeps="$srcdir/$ac_alldeps" ;; + *) + ac_makedep="$1 $ac_makedep" ;; esac wine_fn_append_rule \ -"$ac_dir/Makefile: $ac_dir/Makefile.in Make.vars.in config.status $ac_alldeps \$(MAKEDEP) +"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status $ac_alldeps \$(MAKEDEP) @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend depend: $ac_dir/depend .PHONY: $ac_dir/depend @@ -16641,7 +16644,7 @@ wine_fn_config_makerules () ac_rules=$1 ac_deps=$2 wine_fn_append_rule \ -"$ac_rules: $ac_rules.in $ac_deps config.status +"$ac_rules: $srcdir/$ac_rules.in $ac_deps config.status @./config.status $ac_rules distclean:: \$(RM) $ac_rules" @@ -16677,7 +16680,7 @@ wine_fn_append_rule " .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: Makefile.in Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile" if test "x$enable_fonts" != xno; then diff --git a/configure.ac b/configure.ac index 0124652..aa17064 100644 --- a/configure.ac +++ b/configure.ac @@ -2667,7 +2667,7 @@ WINE_APPEND_RULE([ .INIT: Makefile .MAKEFILEDEPS: all: Makefile -Makefile: Makefile.in Make.vars.in Make.rules config.status +Makefile: $srcdir/Makefile.in $srcdir/Make.vars.in Make.rules config.status @./config.status Make.tmp Makefile]) WINE_CONFIG_SYMLINK(fonts,fonts,[marlett.ttf,symbol.ttf,tahoma.ttf,tahomabd.ttf],enable_fonts) diff --git a/tools/makedep.c b/tools/makedep.c index f8415c6..32383f4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1363,7 +1363,7 @@ static void output_sources(void) if (find_src_file( "dlldata.o" )) { - output( "dlldata.c: $(WIDL) Makefile.in\n" ); + output( "dlldata.c: $(WIDL) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); column = output( "\t$(WIDL) --dlldata-only -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (source->flags & FLAG_IDL_PROXY) output_filename( source->filename, &column ); @@ -1373,7 +1373,7 @@ static void output_sources(void) if (is_test) { - output( "testlist.c: $(MAKECTESTS) Makefile.in\n" ); + output( "testlist.c: $(MAKECTESTS) %s\n", src_dir ? strmake("%s/Makefile.in", src_dir ) : "Makefile.in" ); column = output( "\t$(MAKECTESTS) -o $@" ); LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) if (strendswith( source->name, ".c" ) && !is_generated_idl( source ))

1 0

Dmitry Timoshkov : crypt32: Add support for decoding serial number property in the certificate attributes .
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: ba1b572da28e5bb0059446043f474960d510ea90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1b572da28e5bb0059446043… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:16:15 2013 +0900 crypt32: Add support for decoding serial number property in the certificate attributes. --- dlls/crypt32/oid.c | 2 ++ dlls/crypt32/str.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 4c3f95f..d5c2953 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1107,6 +1107,7 @@ static const WCHAR SpcFinancialCriteria[] = { 'S','p','c','F','i','n','a','n','c static const WCHAR SpcMinimalCriteria[] = { 'S','p','c','M','i','n','i','m','a','l','C','r','i','t','e','r','i','a',0 }; static const WCHAR Email[] = { 'E','m','a','i','l',0 }; static const WCHAR GN[] = { 'G','N',0 }; +static const WCHAR SERIALNUMBER[] = { 'S','E','R','I','A','L','N','U','M','B','E','R',0 }; static const DWORD noNullFlag = CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG; static const DWORD mosaicFlags = CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG | @@ -1226,6 +1227,7 @@ static const struct OIDInfoConstructor { { 5, szOID_TELEPHONE_NUMBER, 0, Phone, &printableStringBlob }, { 5, szOID_X21_ADDRESS, 0, X21Address, &numericStringBlob }, { 5, szOID_DN_QUALIFIER, 0, dnQualifier, NULL }, + { 5, szOID_DEVICE_SERIAL_NUMBER, 0, SERIALNUMBER, NULL }, { 6, szOID_AUTHORITY_KEY_IDENTIFIER2, 0, (LPCWSTR)IDS_AUTHORITY_KEY_ID, NULL }, { 6, szOID_AUTHORITY_KEY_IDENTIFIER, 0, (LPCWSTR)IDS_AUTHORITY_KEY_ID, NULL }, diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 6d406d2..cf29c6f 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -457,7 +457,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; - char prefixBuf[10]; /* big enough for GivenName */ + char prefixBuf[13]; /* big enough for SERIALNUMBER */ LPCSTR prefix = NULL; if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR)

1 0

Henri Verbeet : ddraw: Set DDPCAPS_PRIMARYSURFACE when attaching a palette to the primary surface .
by Alexandre Julliard 12 Dec '13

12 Dec '13

Module: wine Branch: master Commit: d5863f7f407b3fb5b8f5b5e32b42daccb34dc33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5863f7f407b3fb5b8f5b5e32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 12 10:23:33 2013 +0100 ddraw: Set DDPCAPS_PRIMARYSURFACE when attaching a palette to the primary surface. --- dlls/ddraw/surface.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a29f068..09dbb9c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4708,6 +4708,17 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir wined3d_mutex_lock(); prev = surface->palette; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + if (prev) + prev->flags &= ~DDPCAPS_PRIMARYSURFACE; + if (palette_impl) + palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; + /* Update the wined3d frontbuffer if this is the primary. */ + if (surface->ddraw->wined3d_frontbuffer) + wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); + } if (palette_impl) IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); if (prev) @@ -4715,11 +4726,6 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir surface->palette = palette_impl; wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); - /* Update the wined3d frontbuffer if this is the primary. */ - if ((surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && surface->ddraw->wined3d_frontbuffer) - wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, - palette_impl ? palette_impl->wineD3DPalette : NULL); - wined3d_mutex_unlock(); return DD_OK;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2013