- wine-devel - winehq.org

[PATCH 00/11] winecoreaudio: Complete the move of mmdevapi to the unixlib.
by Huw Davies 24 Nov '21

24 Nov '21

This completes the move of the mmdevapi bits to the unixlib. A trivial midi patch is included at the end. Huw D. M. Davies (11): winecoreaudio: Release the critical section in the no interface case. winecoreaudio: Release the correct stream on init failure. winecoreaudio: Move get_next_packet_size to the unixlib. winecoreaudio: Move get_position to the unixlib. winecoreaudio: Move get_frequency to the unixlib. winecoreaudio: Move is_started to the unixlib. winecoreaudio: Move set_volumes to the unixlib. winecoreaudio: Make the coreaudio_stream structure private to the unixlib. winecoreaudio: Store the device id as a DWORD. winecoreaudio: Remove system includes. winecoreaudio: Avoid 64-bit ptr truncation. dlls/winecoreaudio.drv/coreaudio.c | 135 ++++++++++++++++- dlls/winecoreaudio.drv/midi.c | 8 +- dlls/winecoreaudio.drv/mmdevdrv.c | 229 +++++++++-------------------- dlls/winecoreaudio.drv/unixlib.h | 67 ++++++--- 4 files changed, 244 insertions(+), 195 deletions(-) -- 2.23.0

1 0

[PATCH v2] ntdll: Properly save/restore FPU context in arm64 SIGUSR1 handler.
by Jinoh Kang 24 Nov '21

24 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51996 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: Edit commit message. dlls/ntdll/unix/signal_arm64.c | 116 +++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index a52e9bccc49..4e6a0872335 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -84,7 +84,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); # define FP_sig(context) REGn_sig(29, context) /* Frame pointer */ # define LR_sig(context) REGn_sig(30, context) /* Link Register */ -static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, unsigned int magic ) +static struct _aarch64_ctx *get_extended_sigcontext( const ucontext_t *sigcontext, unsigned int magic ) { struct _aarch64_ctx *ctx = (struct _aarch64_ctx *)sigcontext->uc_mcontext.__reserved; while ((char *)ctx < (char *)(&sigcontext->uc_mcontext + 1) && ctx->magic && ctx->size) @@ -95,7 +95,7 @@ static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, uns return NULL; } -static struct fpsimd_context *get_fpsimd_context( ucontext_t *sigcontext ) +static struct fpsimd_context *get_fpsimd_context( const ucontext_t *sigcontext ) { return (struct fpsimd_context *)get_extended_sigcontext( sigcontext, FPSIMD_MAGIC ); } @@ -324,50 +324,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON } -/*********************************************************************** - * save_context - * - * Set the register values from a sigcontext. - */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) -{ - DWORD i; - - context->ContextFlags = (CONTEXT_FULL & ~CONTEXT_FLOATING_POINT) | - CONTEXT_ARM64; - context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ - context->u.s.Lr = LR_sig(sigcontext); /* Link register */ - context->Sp = SP_sig(sigcontext); /* Stack pointer */ - context->Pc = PC_sig(sigcontext); /* Program Counter */ - context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ - for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); -} - - -/*********************************************************************** - * restore_context - * - * Build a sigcontext from the register values. - */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) -{ - DWORD i; - - FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ - LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ - SP_sig(sigcontext) = context->Sp; /* Stack pointer */ - PC_sig(sigcontext) = context->Pc; /* Program Counter */ - PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ - for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; -} - - /*********************************************************************** * save_fpu * * Set the FPU context from a sigcontext. */ -static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) +static void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); @@ -391,23 +353,62 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static void restore_fpu( struct syscall_frame *frame, ucontext_t *sigcontext ) +static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; - fp->fpcr = frame->fpcr; - fp->fpsr = frame->fpsr; - memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + fp->fpcr = context->Fpcr; + fp->fpsr = context->Fpsr; + memcpy( fp->vregs, context->V, sizeof(fp->vregs) ); #elif defined(__APPLE__) - sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; - sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); + sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->v) ); #endif } +/*********************************************************************** + * save_context + * + * Set the register values from a sigcontext. + */ +static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +{ + DWORD i; + + context->ContextFlags = CONTEXT_FULL | CONTEXT_ARM64; + context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ + context->u.s.Lr = LR_sig(sigcontext); /* Link register */ + context->Sp = SP_sig(sigcontext); /* Stack pointer */ + context->Pc = PC_sig(sigcontext); /* Program Counter */ + context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ + for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); + save_fpu( context, sigcontext ); +} + + +/*********************************************************************** + * restore_context + * + * Build a sigcontext from the register values. + */ +static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +{ + DWORD i; + + FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ + LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ + SP_sig(sigcontext) = context->Sp; /* Stack pointer */ + PC_sig(sigcontext) = context->Pc; /* Program Counter */ + PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ + for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; + restore_fpu( context, sigcontext ); +} + + /*********************************************************************** * signal_set_full_context */ @@ -632,7 +633,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - save_fpu( &context, sigcontext ); status = send_debug_event( rec, &context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) @@ -1047,6 +1047,9 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct syscall_frame *frame = arm64_thread_data()->syscall_frame; ucontext_t *context = sigcontext; DWORD i; +#ifdef linux + struct fpsimd_context *fp; +#endif if (!is_inside_syscall( sigcontext )) return; @@ -1056,7 +1059,20 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) PC_sig(context) = frame->pc; PSTATE_sig(context) = frame->cpsr; for (i = 0; i <= 28; i++) REGn_sig( i, context ) = frame->x[i]; - restore_fpu( frame, context ); + +#ifdef linux + fp = get_fpsimd_context( sigcontext ); + if (fp) + { + fp->fpcr = frame->fpcr; + fp->fpsr = frame->fpsr; + memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + } +#elif defined(__APPLE__) + sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); +#endif } -- 2.33.1

1 0

[PATCH] ntdll: Properly save/restore FPU context in arm64 SUGUSR1 handler.
by Jinoh Kang 24 Nov '21

24 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51996 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm64.c | 116 +++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index a52e9bccc49..4e6a0872335 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -84,7 +84,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); # define FP_sig(context) REGn_sig(29, context) /* Frame pointer */ # define LR_sig(context) REGn_sig(30, context) /* Link Register */ -static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, unsigned int magic ) +static struct _aarch64_ctx *get_extended_sigcontext( const ucontext_t *sigcontext, unsigned int magic ) { struct _aarch64_ctx *ctx = (struct _aarch64_ctx *)sigcontext->uc_mcontext.__reserved; while ((char *)ctx < (char *)(&sigcontext->uc_mcontext + 1) && ctx->magic && ctx->size) @@ -95,7 +95,7 @@ static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, uns return NULL; } -static struct fpsimd_context *get_fpsimd_context( ucontext_t *sigcontext ) +static struct fpsimd_context *get_fpsimd_context( const ucontext_t *sigcontext ) { return (struct fpsimd_context *)get_extended_sigcontext( sigcontext, FPSIMD_MAGIC ); } @@ -324,50 +324,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON } -/*********************************************************************** - * save_context - * - * Set the register values from a sigcontext. - */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) -{ - DWORD i; - - context->ContextFlags = (CONTEXT_FULL & ~CONTEXT_FLOATING_POINT) | - CONTEXT_ARM64; - context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ - context->u.s.Lr = LR_sig(sigcontext); /* Link register */ - context->Sp = SP_sig(sigcontext); /* Stack pointer */ - context->Pc = PC_sig(sigcontext); /* Program Counter */ - context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ - for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); -} - - -/*********************************************************************** - * restore_context - * - * Build a sigcontext from the register values. - */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) -{ - DWORD i; - - FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ - LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ - SP_sig(sigcontext) = context->Sp; /* Stack pointer */ - PC_sig(sigcontext) = context->Pc; /* Program Counter */ - PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ - for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; -} - - /*********************************************************************** * save_fpu * * Set the FPU context from a sigcontext. */ -static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) +static void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); @@ -391,23 +353,62 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static void restore_fpu( struct syscall_frame *frame, ucontext_t *sigcontext ) +static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; - fp->fpcr = frame->fpcr; - fp->fpsr = frame->fpsr; - memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + fp->fpcr = context->Fpcr; + fp->fpsr = context->Fpsr; + memcpy( fp->vregs, context->V, sizeof(fp->vregs) ); #elif defined(__APPLE__) - sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; - sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); + sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->v) ); #endif } +/*********************************************************************** + * save_context + * + * Set the register values from a sigcontext. + */ +static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +{ + DWORD i; + + context->ContextFlags = CONTEXT_FULL | CONTEXT_ARM64; + context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ + context->u.s.Lr = LR_sig(sigcontext); /* Link register */ + context->Sp = SP_sig(sigcontext); /* Stack pointer */ + context->Pc = PC_sig(sigcontext); /* Program Counter */ + context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ + for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); + save_fpu( context, sigcontext ); +} + + +/*********************************************************************** + * restore_context + * + * Build a sigcontext from the register values. + */ +static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +{ + DWORD i; + + FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ + LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ + SP_sig(sigcontext) = context->Sp; /* Stack pointer */ + PC_sig(sigcontext) = context->Pc; /* Program Counter */ + PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ + for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; + restore_fpu( context, sigcontext ); +} + + /*********************************************************************** * signal_set_full_context */ @@ -632,7 +633,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - save_fpu( &context, sigcontext ); status = send_debug_event( rec, &context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) @@ -1047,6 +1047,9 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) struct syscall_frame *frame = arm64_thread_data()->syscall_frame; ucontext_t *context = sigcontext; DWORD i; +#ifdef linux + struct fpsimd_context *fp; +#endif if (!is_inside_syscall( sigcontext )) return; @@ -1056,7 +1059,20 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) PC_sig(context) = frame->pc; PSTATE_sig(context) = frame->cpsr; for (i = 0; i <= 28; i++) REGn_sig( i, context ) = frame->x[i]; - restore_fpu( frame, context ); + +#ifdef linux + fp = get_fpsimd_context( sigcontext ); + if (fp) + { + fp->fpcr = frame->fpcr; + fp->fpsr = frame->fpsr; + memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + } +#elif defined(__APPLE__) + sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); +#endif } -- 2.33.1

1 0

[PATCH v2 resend 1/2] user32/tests: Add more tests of SetClipboardData().
by Jactry Zeng 24 Nov '21

24 Nov '21

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 79 ++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index b673fc1add5..91ad5dc7ebc 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1897,10 +1897,14 @@ static void test_data_handles(void) { BOOL r; char *ptr; - HANDLE h, text; + HANDLE h, text, metafile; HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); BITMAPINFO bmi; void *bits; + PALETTEENTRY entry; + BYTE buffer[1024]; + HENHMETAFILE emf; + int result; ok( hwnd != 0, "window creation failed\n" ); format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); @@ -2013,6 +2017,79 @@ static void test_data_handles(void) r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + r = open_clipboard( hwnd ); + ok( r, "Open clipboard failed: %#x.\n", GetLastError() ); + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_BITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_BITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + result = GetDIBits( GetDC( 0 ), h, 0, 0, NULL, &bmi, 0 ); + todo_wine ok( !!result && result != ERROR_INVALID_PARAMETER, "GetDIBits failed: %#x.\n", GetLastError() ); + + bitmap = CreateBitmap( 10, 10, 1, 1, NULL ); + h = SetClipboardData( CF_DSPBITMAP, bitmap ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + ok( !!DeleteObject( bitmap ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_DSPBITMAP ); + ok( h == bitmap, "Expected bitmap %p, got %p.\n", bitmap, h ); + memset( &bmi, 0, sizeof(bmi) ); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ok( !GetDIBits( GetDC( 0 ), h, 0, 0, 0, &bmi, 0 ), "GetDIBits returned unexpected value.\n" ); + + palette = CreatePalette( &logpalette ); + h = SetClipboardData( CF_PALETTE, palette ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + ok( !!DeleteObject( palette ), "DeleteObject failed.\n" ); + h = GetClipboardData( CF_PALETTE ); + ok( h == palette, "Expected palette %p, got %p.\n", palette, h ); + todo_wine ok( !!GetPaletteEntries( h, 0, 1, &entry ), "GetPaletteEntries %p failed.\n", h ); + todo_wine ok( entry.peRed == 0x12 && entry.peGreen == 0x34 && entry.peBlue == 0x56, + "Got wrong color (%02x, %02x, %02x).\n", entry.peRed, entry.peGreen, entry.peBlue ); + + emf = create_emf(); + h = SetClipboardData( CF_ENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_ENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", palette, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + emf = create_emf(); + h = SetClipboardData( CF_DSPENHMETAFILE, emf ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !!DeleteEnhMetaFile( emf ), "DeleteEnhMetaFile failed.\n" ); + h = GetClipboardData( CF_DSPENHMETAFILE ); + ok( h == emf, "Expected enhmetafile %p, got %p.\n", emf, h ); + ok( !GetEnhMetaFileBits( h, sizeof(buffer), buffer ), "GetEnhMetaFileBits returned unexpected value.\n" ); + + metafile = create_metafile(); + h = SetClipboardData( CF_METAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_METAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + metafile = create_metafile(); + h = SetClipboardData( CF_DSPMETAFILEPICT, metafile ); + ok( h == metafile, "Expected metafilepict %p, got %p.\n", metafile, h ); + ok( !GlobalFree( metafile ), "GlobalFree failed.\n" ); + h = GetClipboardData( CF_DSPMETAFILEPICT ); + ok( h == metafile, "Expected metafile %p, got %p.\n", metafile, h ); + ok( is_freed( h ), "Expected freed mem %p.\n", h ); + + r = EmptyClipboard(); + ok( r, "EmptyClipboard failed: %#x.\n", GetLastError() ); + r = CloseClipboard(); + ok( r, "CloseClipboard failed: %#x.\n", GetLastError() ); + DestroyWindow( hwnd ); } -- 2.33.0

1 1

[PATCH 1/4] riched20: draw OLE object in richedit with OleDraw
by Dongwan Kim 24 Nov '21

24 Nov '21

When OLE object provides IViewObject::Draw, Richedit can draw it even though the OLE object does not support CF_BITMAP nor CF_ENHMETAFILE. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/riched20/richole.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 03572511ff7..1a62f0b9f36 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5653,6 +5653,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) STGMEDIUM stgm; DIBSECTION dibsect; ENHMETAHEADER emh; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5691,8 +5692,13 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("unsupported format\n"); - pSize->cx = pSize->cy = 0; + if( IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, pSize) != S_OK){ + FIXME("unsupported format\n"); + pSize->cx = pSize->cy = 0; + } + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + pSize->cx = MulDiv(pSize->cx, pixs , 2540); + pSize->cy = MulDiv(pSize->cy, pixs , 2540); IDataObject_Release(ido); return; } @@ -5735,6 +5741,8 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) BOOL has_size; HBITMAP old_bm; RECT rc; + HRESULT hr; + int pixs; assert(run->nFlags & MERF_GRAPHICS); assert(run->reobj); @@ -5755,7 +5763,17 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) fmt.tymed = TYMED_ENHMF; if (IDataObject_GetData(ido, &fmt, &stgm) != S_OK) { - FIXME("Couldn't get storage medium\n"); + IOleObject_GetExtent(run->reobj->obj.poleobj, DVASPECT_CONTENT, &sz); + pixs = GetDeviceCaps(c->hDC, LOGPIXELSX); + rc.left = x; + rc.top = y - MulDiv(sz.cy, pixs, 2540); + rc.right = x + MulDiv(sz.cx, pixs, 2540); + rc.bottom = y ; + hr = OleDraw(run->reobj->obj.poleobj, DVASPECT_CONTENT, c->hDC, &rc); + if (FAILED(hr)) + { + FIXME("Couldn't draw ole object\n"); + } IDataObject_Release(ido); return; } -- 2.30.2

1 3

[PATCH] comctl32/tests: Fix DC handle leak.
by Thomas Faber 24 Nov '21

24 Nov '21

1 0

[PATCH v3 1/2] oleaut32: Implement LPSAFEARRAY user marshal interface marshaling.
by Connor McAdams 24 Nov '21

24 Nov '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleaut32/usrmarshal.c | 112 ++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 5eeafb8e378..623bd679485 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -268,7 +268,7 @@ static unsigned int get_type_alignment(ULONG *pFlags, VARTYPE vt) } /* WdtpInterfacePointer_UserSize takes care of 2 additional DWORDs to store marshalling buffer size */ -static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *punk) +static unsigned interface_user_size(ULONG *pFlags, ULONG Start, REFIID riid, IUnknown *punk) { ULONG size = 0; @@ -283,7 +283,7 @@ static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *pun } size += sizeof(ULONG); TRACE("wire-size extra of interface variant is %d\n", size); - return size; + return Start + size; } static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) @@ -304,13 +304,13 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) case VT_VARIANT | VT_BYREF: return VARIANT_UserSize(pFlags, Start, V_VARIANTREF(pvar)); case VT_UNKNOWN: - return Start + interface_variant_size(pFlags, &IID_IUnknown, V_UNKNOWN(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, V_UNKNOWN(pvar)); case VT_UNKNOWN | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, *V_UNKNOWNREF(pvar)); case VT_DISPATCH: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); case VT_DISPATCH | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); case VT_RECORD: FIXME("wire-size record\n"); return Start; @@ -324,7 +324,7 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) } /* helper: called for VT_DISPATCH variants to marshal the IDispatch* into the buffer */ -static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char* interface_user_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown *punk) { TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk); @@ -345,7 +345,7 @@ static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Bu } /* helper: called for VT_DISPATCH / VT_UNKNOWN variants to unmarshal the buffer */ -static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown **ppunk) { DWORD ptr; @@ -459,16 +459,16 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, Pos = VARIANT_UserMarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -590,16 +590,16 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe Pos = VARIANT_UserUnmarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -733,22 +733,40 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_BSTR: + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: return sizeof(DWORD); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(variant_wire_t) - sizeof(DWORD); - else + + default: return lpsa->cbElements; + } } static DWORD elem_mem_size(wireSAFEARRAY wiresa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: + return sizeof(void *); + + case SF_BSTR: return sizeof(BSTR); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(VARIANT); - else + + default: return wiresa->cbElements; + } } ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) @@ -795,8 +813,22 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("size interfaces\n"); + { + IUnknown **lpUnk; + GUID guid; + + if (sftype == SF_HAVEIID) + SafeArrayGetIID(psa, &guid); + else if (sftype == SF_UNKNOWN) + memcpy(&guid, &IID_IUnknown, sizeof(guid)); + else + memcpy(&guid, &IID_IDispatch, sizeof(guid)); + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + size = interface_user_size(pFlags, size, &guid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -870,7 +902,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); - if (FAILED(hr)) vt = 0; + if ((psa->fFeatures & FADF_HAVEIID) || FAILED(hr)) vt = 0; *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); Buffer += sizeof(ULONG); @@ -916,8 +948,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + Buffer = interface_user_marshal(pFlags, Buffer, iid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -1093,8 +1139,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = (*ppsa)->pvData; cell_count; cell_count--, lpUnk++) + Buffer = interface_user_unmarshal(pFlags, Buffer, iid, lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; -- 2.25.1

1 1

[PATCH v6 01/12] jscript: Treat prototype refs as non-existent when deleting.
by Gabriel Ivăncescu 24 Nov '21

24 Nov '21

Delete only affects own properties. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 5 +++++ dlls/mshtml/tests/documentmode.js | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..df81e1a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1621,6 +1621,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { + if(prop->type == PROP_PROTREF) { + *ret = TRUE; + return S_OK; + } + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d5f33dd..041025c 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1192,7 +1192,6 @@ sync_test("__proto__", function() { ok(obj.__proto__ === ctor.prototype, "obj.__proto__ !== ctor.prototype"); r = (delete x.__proto__); - todo_wine. ok(r, "delete x.__proto__ returned " + r); ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype after delete"); r = Object.getPrototypeOf(x); -- 2.31.1

3 24

[PATCH v2 2/2] scrrun: Implement folder_CreateTextFile.
by Robert Wilhelm 23 Nov '21

23 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51971 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 16 ++++++- dlls/scrrun/tests/filesystem.c | 81 ++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e55615eb4da..c42a3155c4f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2522,9 +2522,21 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, VARIANT_BOOL unicode, ITextStream **stream) { + DWORD disposition; + BSTR path; + HRESULT hres; + struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s %x %x %p): stub\n", This, debugstr_w(filename), overwrite, unicode, stream); - return E_NOTIMPL; + + TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); + + hres = build_path(This->path, filename, &path); + if (FAILED(hres)) return hres; + + disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; + hres = create_textstream(path, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); + SysFreeString(path); + return hres; } static const IFolderVtbl foldervtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5c55965ce88..bdd5de77775 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1535,6 +1535,86 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +/* shameless copy of test_CreateTextFile(void) */ +static void test_FolderCreateTextFile(void) +{ + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + IFolder *folder; + HRESULT hr; + BOOL ret; + + get_temp_filepath(testfileW, pathW, dirW); + nameW = SysAllocString(L"foo.txt"); + lstrcpyW(pathW, dirW); + lstrcatW(pathW, nameW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + str = SysAllocString(dirW); + hr = IFileSystem3_GetFolder(fs3, str, &folder); + ok(ret, "got %d, %d\n", ret, GetLastError()); + SysFreeString(str); + + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* overwrite in Unicode mode, check for BOM */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + + hr = IFileSystem3_OpenTextFile(fs3, pathW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + SysFreeString(str); + ITextStream_Release(stream); + + DeleteFileW(pathW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; @@ -2516,6 +2596,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_FolderCreateTextFile(); test_WriteLine(); test_ReadAll(); test_Read(); -- 2.31.1

2 1

[PATCH v2 1/2] scrrun: Extract code to new helper function build_path.
by Robert Wilhelm 23 Nov '21

23 Nov '21

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 109 +++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 68ef1786af9..e55615eb4da 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,6 +223,63 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) return SysAllocString(buffW); } +static HRESULT WINAPI build_path( BSTR Path, BSTR Name, BSTR *Result) +{ + BSTR ret; + + TRACE("%s %s %p\n", debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + ret[path_len] = 0; + lstrcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + lstrcpyW(ret, Path); + if (Path[path_len-1] != ':') + wcscat(ret, L"\\"); + lstrcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + lstrcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -3034,59 +3091,9 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, BSTR Name, BSTR *Result) { - BSTR ret; - TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); - if (!Result) return E_POINTER; - - if (Path && Name) - { - int path_len = SysStringLen(Path), name_len = SysStringLen(Name); - - /* if both parts have backslashes strip one from Path */ - if (Path[path_len-1] == '\\' && Name[0] == '\\') - { - path_len -= 1; - - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - ret[path_len] = 0; - lstrcatW(ret, Name); - } - } - else if (Path[path_len-1] != '\\' && Name[0] != '\\') - { - ret = SysAllocStringLen(NULL, path_len + name_len + 1); - if (ret) - { - lstrcpyW(ret, Path); - if (Path[path_len-1] != ':') - wcscat(ret, L"\\"); - lstrcatW(ret, Name); - } - } - else - { - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - lstrcatW(ret, Name); - } - } - } - else if (Path || Name) - ret = SysAllocString(Path ? Path : Name); - else - ret = SysAllocStringLen(NULL, 0); - - if (!ret) return E_OUTOFMEMORY; - *Result = ret; - - return S_OK; + return build_path(Path, Name, Result); } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) -- 2.31.1

1 0

[PATCH 2/2] scrrun: Implement folder_CreateTextFile.
by Robert Wilhelm 23 Nov '21

23 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51971 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 16 ++++++- dlls/scrrun/tests/filesystem.c | 79 ++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e55615eb4da..c42a3155c4f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2522,9 +2522,21 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite, VARIANT_BOOL unicode, ITextStream **stream) { + DWORD disposition; + BSTR path; + HRESULT hres; + struct folder *This = impl_from_IFolder(iface); - FIXME("(%p)->(%s %x %x %p): stub\n", This, debugstr_w(filename), overwrite, unicode, stream); - return E_NOTIMPL; + + TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); + + hres = build_path(This->path, filename, &path); + if (FAILED(hres)) return hres; + + disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; + hres = create_textstream(path, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); + SysFreeString(path); + return hres; } static const IFolderVtbl foldervtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 5c55965ce88..352e986944a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1535,6 +1535,84 @@ static void test_CreateTextFile(void) SysFreeString(nameW); } +/* shameless copy of test_CreateTextFile(void) */ +static void test_FolderCreateTextFile(void) +{ + WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; + ITextStream *stream; + BSTR nameW, str; + HANDLE file; + IFolder *folder; + HRESULT hr; + BOOL ret; + + get_temp_filepath(testfileW, pathW, dirW); + nameW = SysAllocString(L"foo.txt"); + lstrcpyW(pathW, dirW); + lstrcatW(pathW, nameW); + + ret = CreateDirectoryW(dirW, NULL); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + hr = IFileSystem3_GetFolder(fs3, dirW, &folder); + ok(ret, "got %d, %d\n", ret, GetLastError()); + + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + /* check it's created */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + CloseHandle(file); + + /* try to create again with no-overwrite mode */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); + + /* now overwrite */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* overwrite in Unicode mode, check for BOM */ + hr = IFolder_CreateTextFile(folder, nameW, VARIANT_TRUE, VARIANT_TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + ITextStream_Release(stream); + + /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode + treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ + buffW[0] = 0; + MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + + hr = IFileSystem3_OpenTextFile(fs3, pathW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextStream_ReadAll(stream, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + SysFreeString(str); + ITextStream_Release(stream); + + DeleteFileW(pathW); + RemoveDirectoryW(dirW); + SysFreeString(nameW); +} + static void test_WriteLine(void) { WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; @@ -2516,6 +2594,7 @@ START_TEST(filesystem) test_FileCollection(); test_DriveCollection(); test_CreateTextFile(); + test_FolderCreateTextFile(); test_WriteLine(); test_ReadAll(); test_Read(); -- 2.31.1

2 1

[PATCH 1/2] scrrun: Extract code to new helper function build_path.
by Robert Wilhelm 23 Nov '21

23 Nov '21

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 109 +++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 68ef1786af9..e55615eb4da 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -223,6 +223,63 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) return SysAllocString(buffW); } +static HRESULT WINAPI build_path( BSTR Path, BSTR Name, BSTR *Result) +{ + BSTR ret; + + TRACE("%s %s %p\n", debugstr_w(Path), debugstr_w(Name), Result); + + if (!Result) return E_POINTER; + + if (Path && Name) + { + int path_len = SysStringLen(Path), name_len = SysStringLen(Name); + + /* if both parts have backslashes strip one from Path */ + if (Path[path_len-1] == '\\' && Name[0] == '\\') + { + path_len -= 1; + + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + ret[path_len] = 0; + lstrcatW(ret, Name); + } + } + else if (Path[path_len-1] != '\\' && Name[0] != '\\') + { + ret = SysAllocStringLen(NULL, path_len + name_len + 1); + if (ret) + { + lstrcpyW(ret, Path); + if (Path[path_len-1] != ':') + wcscat(ret, L"\\"); + lstrcatW(ret, Name); + } + } + else + { + ret = SysAllocStringLen(NULL, path_len + name_len); + if (ret) + { + lstrcpyW(ret, Path); + lstrcatW(ret, Name); + } + } + } + else if (Path || Name) + ret = SysAllocString(Path ? Path : Name); + else + ret = SysAllocStringLen(NULL, 0); + + if (!ret) return E_OUTOFMEMORY; + *Result = ret; + + return S_OK; +} + static BOOL textstream_check_iomode(struct textstream *This, enum iotype type) { if (type == IORead) @@ -3034,59 +3091,9 @@ static HRESULT WINAPI filesys_get_Drives(IFileSystem3 *iface, IDriveCollection * static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, BSTR Name, BSTR *Result) { - BSTR ret; - TRACE("%p %s %s %p\n", iface, debugstr_w(Path), debugstr_w(Name), Result); - if (!Result) return E_POINTER; - - if (Path && Name) - { - int path_len = SysStringLen(Path), name_len = SysStringLen(Name); - - /* if both parts have backslashes strip one from Path */ - if (Path[path_len-1] == '\\' && Name[0] == '\\') - { - path_len -= 1; - - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - ret[path_len] = 0; - lstrcatW(ret, Name); - } - } - else if (Path[path_len-1] != '\\' && Name[0] != '\\') - { - ret = SysAllocStringLen(NULL, path_len + name_len + 1); - if (ret) - { - lstrcpyW(ret, Path); - if (Path[path_len-1] != ':') - wcscat(ret, L"\\"); - lstrcatW(ret, Name); - } - } - else - { - ret = SysAllocStringLen(NULL, path_len + name_len); - if (ret) - { - lstrcpyW(ret, Path); - lstrcatW(ret, Name); - } - } - } - else if (Path || Name) - ret = SysAllocString(Path ? Path : Name); - else - ret = SysAllocStringLen(NULL, 0); - - if (!ret) return E_OUTOFMEMORY; - *Result = ret; - - return S_OK; + return build_path(Path, Name, Result); } static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) -- 2.31.1

1 0

[PATCH v2 1/2] oleaut32: Implement LPSAFEARRAY user marshal interface marshaling.
by Connor McAdams 23 Nov '21

23 Nov '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleaut32/usrmarshal.c | 112 ++++++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 5eeafb8e378..623bd679485 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -268,7 +268,7 @@ static unsigned int get_type_alignment(ULONG *pFlags, VARTYPE vt) } /* WdtpInterfacePointer_UserSize takes care of 2 additional DWORDs to store marshalling buffer size */ -static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *punk) +static unsigned interface_user_size(ULONG *pFlags, ULONG Start, REFIID riid, IUnknown *punk) { ULONG size = 0; @@ -283,7 +283,7 @@ static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *pun } size += sizeof(ULONG); TRACE("wire-size extra of interface variant is %d\n", size); - return size; + return Start + size; } static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) @@ -304,13 +304,13 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) case VT_VARIANT | VT_BYREF: return VARIANT_UserSize(pFlags, Start, V_VARIANTREF(pvar)); case VT_UNKNOWN: - return Start + interface_variant_size(pFlags, &IID_IUnknown, V_UNKNOWN(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, V_UNKNOWN(pvar)); case VT_UNKNOWN | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, *V_UNKNOWNREF(pvar)); case VT_DISPATCH: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); case VT_DISPATCH | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); case VT_RECORD: FIXME("wire-size record\n"); return Start; @@ -324,7 +324,7 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) } /* helper: called for VT_DISPATCH variants to marshal the IDispatch* into the buffer */ -static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char* interface_user_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown *punk) { TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk); @@ -345,7 +345,7 @@ static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Bu } /* helper: called for VT_DISPATCH / VT_UNKNOWN variants to unmarshal the buffer */ -static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown **ppunk) { DWORD ptr; @@ -459,16 +459,16 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, Pos = VARIANT_UserMarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -590,16 +590,16 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe Pos = VARIANT_UserUnmarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -733,22 +733,40 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_BSTR: + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: return sizeof(DWORD); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(variant_wire_t) - sizeof(DWORD); - else + + default: return lpsa->cbElements; + } } static DWORD elem_mem_size(wireSAFEARRAY wiresa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: + return sizeof(void *); + + case SF_BSTR: return sizeof(BSTR); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(VARIANT); - else + + default: return wiresa->cbElements; + } } ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) @@ -795,8 +813,22 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("size interfaces\n"); + { + IUnknown **lpUnk; + GUID guid; + + if (sftype == SF_HAVEIID) + SafeArrayGetIID(psa, &guid); + else if (sftype == SF_UNKNOWN) + memcpy(&guid, &IID_IUnknown, sizeof(guid)); + else + memcpy(&guid, &IID_IDispatch, sizeof(guid)); + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + size = interface_user_size(pFlags, size, &guid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -870,7 +902,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); - if (FAILED(hr)) vt = 0; + if ((psa->fFeatures & FADF_HAVEIID) || FAILED(hr)) vt = 0; *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); Buffer += sizeof(ULONG); @@ -916,8 +948,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + Buffer = interface_user_marshal(pFlags, Buffer, iid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -1093,8 +1139,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = (*ppsa)->pvData; cell_count; cell_count--, lpUnk++) + Buffer = interface_user_unmarshal(pFlags, Buffer, iid, lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; -- 2.25.1

1 1

[PATCH] configure: Diagnose if NetAPI is not present
by Gerald Pfeifer 23 Nov '21

23 Nov '21

For most other configure options we are warning when some dependency is not present, in particular when it's been explicitly requested. Also do this for Samba NetAPI now. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 1c716b4ec00..535eb5d8793 100644 --- a/configure.ac +++ b/configure.ac @@ -1722,6 +1722,10 @@ then WINE_PACKAGE_FLAGS(NETAPI,[netapi],,,, [WINE_CHECK_SONAME(netapi,libnetapi_init,,[AC_DEFINE_UNQUOTED(SONAME_LIBNETAPI,["libnetapi.$LIBEXT"])],[$NETAPI_LIBS])]) fi +WINE_NOTICE_WITH(netapi,[test "x$ac_cv_lib_netapi" != xyes], + [libnetapi not found, Samba NetAPI won't be supported.], + [enable_netapi]) + dnl **** Check for any sound system **** if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \ -- 2.32.0

1 0

[PATCH 1/2] oleaut32: Implement LPSAFEARRAY user marshal interface marshaling.
by Connor McAdams 23 Nov '21

23 Nov '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleaut32/usrmarshal.c | 84 ++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 5eeafb8e378..69c7c1cfdda 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -286,6 +286,12 @@ static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *pun return size; } +static ULONG interface_safearray_size(ULONG *pFlags, ULONG Start, REFIID riid, IUnknown *punk) +{ + TRACE("(%x,%d,%p)\n", *pFlags, Start, punk); + return Start + interface_variant_size(pFlags, riid, punk); +} + static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) { if (V_ISARRAY(pvar)) @@ -733,22 +739,40 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_BSTR: + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: return sizeof(DWORD); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(variant_wire_t) - sizeof(DWORD); - else + + default: return lpsa->cbElements; + } } static DWORD elem_mem_size(wireSAFEARRAY wiresa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: + return sizeof(void *); + + case SF_BSTR: return sizeof(BSTR); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(VARIANT); - else + + default: return wiresa->cbElements; + } } ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) @@ -795,6 +819,22 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: + { + IUnknown **lpUnk; + GUID guid; + + if (sftype == SF_HAVEIID) + SafeArrayGetIID(psa, &guid); + else if (sftype == SF_UNKNOWN) + memcpy(&guid, &IID_IUnknown, sizeof(guid)); + else + memcpy(&guid, &IID_IDispatch, sizeof(guid)); + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + size = interface_safearray_size(pFlags, size, &guid, *lpUnk); + + break; + } FIXME("size interfaces\n"); break; case SF_VARIANT: @@ -870,7 +910,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); - if (FAILED(hr)) vt = 0; + if ((psa->fFeatures & FADF_HAVEIID) || FAILED(hr)) vt = 0; *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); Buffer += sizeof(ULONG); @@ -916,8 +956,21 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + { + if (sftype == SF_HAVEIID) + Buffer = interface_variant_marshal(pFlags, Buffer, &guid, *lpUnk); + else if (sftype == SF_UNKNOWN) + Buffer = interface_variant_marshal(pFlags, Buffer, &IID_IUnknown, *lpUnk); + else + Buffer = interface_variant_marshal(pFlags, Buffer, &IID_IDispatch, *lpUnk); + } + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -1093,8 +1146,21 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + + for (lpUnk = (*ppsa)->pvData; cell_count; cell_count--, lpUnk++) + { + if (sftype == SF_HAVEIID) + Buffer = interface_variant_unmarshal(pFlags, Buffer, &guid, lpUnk); + else if (sftype == SF_UNKNOWN) + Buffer = interface_variant_unmarshal(pFlags, Buffer, &IID_IUnknown, lpUnk); + else + Buffer = interface_variant_unmarshal(pFlags, Buffer, &IID_IDispatch, lpUnk); + } + break; + } case SF_VARIANT: { VARIANT* lpVariant; -- 2.25.1

2 2

[PATCH] gdiplus: Mark a Windows behavior as broken.
by Esme Povirk 23 Nov '21

23 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51989 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/gdiplus/tests/graphics.c | 4 ++-- dlls/gdiplus/tests/graphicspath.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 572aa88cb79..d0454edb4a4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4140,7 +4140,7 @@ static void test_pen_thickness(void) size = max-min+1; - ok(size == td[i].cx, "%u: expected %d, got %d\n", i, td[i].cx, size); + ok(size == td[i].cx || broken (i == 1 && size == 1), "%u: expected %d, got %d\n", i, td[i].cx, size); min = -1; max = -2; @@ -4165,7 +4165,7 @@ static void test_pen_thickness(void) size = max-min+1; - ok(size == td[i].cy, "%u: expected %d, got %d\n", i, td[i].cy, size); + ok(size == td[i].cy || broken (i == 1 && size == 1), "%u: expected %d, got %d\n", i, td[i].cy, size); status = GdipBitmapUnlockBits(u.bitmap, &bd); expect(Ok, status); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index a987cd165dc..07e6dd166ad 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1447,7 +1447,7 @@ static void test_widen(void) status = GdipGetPointCount(path, &count); expect(Ok, status); - expect(0, count); + ok(count == 0 || broken(count == 4), "expected 0, got %i\n", count); /* pen width = 0 pixels, UnitWorld - result is a path 1 unit wide */ GdipDeletePen(pen); @@ -1711,6 +1711,21 @@ static void test_widen_cap(void) status = GdipWidenPath(path, pen, NULL, FlatnessDefault); expect(Ok, status); + + if (i == 9) + { + INT size; + status = GdipGetPointCount(path, &size); + expect(Ok, status); + ok(size == caps[i].expected_size || broken(size == 12), "unexpected path size %i\n", size); + + if (size == 12) + { + GdipDeletePen(pen); + continue; + } + } + ok_path_fudge(path, caps[i].expected, caps[i].expected_size, caps[i].todo_size, 0.000005); GdipDeletePen(pen); -- 2.30.2

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.200.
by Georg Lehmann 23 Nov '21

23 Nov '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 92dc71ab9d8..e5f8d1a46c6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.199" +VK_XML_VERSION = "1.2.200" WINE_VK_VERSION = (1, 2) # Filenames to create. @@ -119,6 +119,9 @@ UNSUPPORTED_EXTENSIONS = [ # Deprecated extensions "VK_NV_external_memory_capabilities", "VK_NV_external_memory_win32", + + # Broken extensions + "VK_ARM_rasterization_order_attachment_access", # https://github.com/KhronosGroup/Vulkan-Docs/issues/1703 ] # Either internal extensions which aren't present on the win32 platform which -- 2.34.0

1 0

[PATCH 1/2] loader: always ensure that WINELOADER is defined
by Eric Pouech 23 Nov '21

23 Nov '21

when: - Wine is installed in a (configure:d) directory - running wine directly from <confdir>/bin/wine(64) (without setting any WINE specific env variables) - dbghelp cannot find back the loader/wine(64) file consequences: - dbghelp cannot get back to the ELF information, hence (on a live target) doesn't report the already loaded ELF modules (only the PE ones are listed) dbghelp searches: - WINELOADER env var (but it isn't set in that case) - LD_LIBRARY_PATH (isn't changed, and even if it would, it would point to <confdir>/lib directory) - WINEDLLDIR<NN>, but again could point to <confdir>/lib directory, not the bin one wine-staging has a solution by forcing dbghelp to search @bindir@ as well this patch proposes an alternate approach: the wine loader sets WINELOADER if it isn't already set by the calling environment Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- loader/main.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/loader/main.c b/loader/main.c index 242ff15accd..c5e0fdf68b2 100644 --- a/loader/main.c +++ b/loader/main.c @@ -41,18 +41,12 @@ extern char **environ; /* the preloader will set this variable */ const struct wine_preload_info *wine_main_preload_info = NULL; -/* canonicalize path and return its directory name */ -static char *realpath_dirname( const char *name ) +/* remove filename from an (absolute) path */ +static void remove_filename( char *fullpath ) { - char *p, *fullpath = realpath( name, NULL ); - - if (fullpath) - { - p = strrchr( fullpath, '/' ); - if (p == fullpath) p++; - if (p) *p = 0; - } - return fullpath; + char *p = strrchr( fullpath, '/' ); + if (p == fullpath) p++; + if (p) *p = 0; } /* if string ends with tail, remove it */ @@ -141,8 +135,10 @@ static void *load_ntdll( char *argv0 ) char *path, *p; void *handle = NULL; - if (self && ((path = realpath_dirname( self )))) + if (self && (path = realpath( self, NULL ))) { + setenv( "WINELOADER", path, 0 ); + remove_filename( path ); if ((p = remove_tail( path, "/loader" ))) { handle = try_dlopen( p, "dlls/ntdll/ntdll.so" );

1 1

[PATCH 3/3 optional] kernel32/tests: Add GetQueuedCompletionPort race condition test
by Andrew Eikum 23 Nov '21

23 Nov '21

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- This patch is optional. It demonstrates the race condition described in the first patch. Without the fixes applied, Wine always fails in fewer than 50 runs on my machine. Windows never fails. Since it's a race condition, it's always going to be flaky, so I'm not sure whether it's useful to add these tests (and the added test runtime). dlls/kernel32/tests/process.c | 80 ++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0d1a2f1a31d..cdcc564d006 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2776,12 +2776,43 @@ static void test_QueryInformationJobObject(void) CloseHandle(job); } +static struct completion_port_test_data { + HANDLE port; + HANDLE wait_evt; + BOOL quit; +} completion_port_test_data; + +static DWORD WINAPI completion_port_test_threadproc(void *user) +{ + while (!completion_port_test_data.quit) + { + WaitForSingleObject(completion_port_test_data.wait_evt, INFINITE); + if (completion_port_test_data.quit) + { + CloseHandle(completion_port_test_data.port); + break; + } + + Sleep(10); /* allow main thread to settle into GetQueued() */ + + PostQueuedCompletionStatus(completion_port_test_data.port, 1, 0, (OVERLAPPED*)&completion_port_test_data); + CloseHandle(completion_port_test_data.port); + + SetEvent(completion_port_test_data.wait_evt); + } + return 0; +} + static void test_CompletionPort(void) { JOBOBJECT_ASSOCIATE_COMPLETION_PORT port_info; PROCESS_INFORMATION pi, pi2; - HANDLE job, port; - BOOL ret; + HANDLE job, port, thread; + BOOL ret, failed; + int tries; + DWORD bytes_transferred; + ULONG_PTR key; + OVERLAPPED *overlapped; job = pCreateJobObjectW(NULL, NULL); ok(job != NULL, "CreateJobObject error %u\n", GetLastError()); @@ -2822,6 +2853,50 @@ static void test_CompletionPort(void) CloseHandle(pi.hThread); CloseHandle(job); CloseHandle(port); + + /* no race condition between blocked GetQueuedCompletionStatus and CloseHandle(port) */ + completion_port_test_data.quit = FALSE; + completion_port_test_data.wait_evt = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, &completion_port_test_threadproc, NULL, 0, NULL); + + failed = FALSE; + tries = 0; + while (tries < 100 && !failed) + { + completion_port_test_data.port = pCreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); + ok(completion_port_test_data.port != NULL, "%u: CreateIoCompletionPort error %u\n", tries, GetLastError()); + + SetEvent(completion_port_test_data.wait_evt); + + bytes_transferred = 0xdeadbeef; + key = 0xdeadbeee; + overlapped = (OVERLAPPED*)0xdeadbeed; + + ret = GetQueuedCompletionStatus(completion_port_test_data.port, &bytes_transferred, &key, + &overlapped, INFINITE); + ok(ret == TRUE, "%u: GetQueuedCompletionStatus failed: %u\n", tries, GetLastError()); + if (ret == TRUE) + { + ok(bytes_transferred == 1, "%u: got bt: 0x%x\n", tries, bytes_transferred); + ok(key == 0, "%u: got key: 0x%x\n", tries, key); + ok(overlapped == (OVERLAPPED*)&completion_port_test_data, "%u: got overlapped: %p\n", tries, overlapped); + } + else + failed = TRUE; + + ++tries; + + /* wait for other thread to be ready for next test */ + WaitForSingleObject(completion_port_test_data.wait_evt, INFINITE); + } + + completion_port_test_data.quit = TRUE; + SetEvent(completion_port_test_data.wait_evt); + + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread); + CloseHandle(completion_port_test_data.wait_evt); } static void test_KillOnJobClose(void) @@ -5055,6 +5130,7 @@ START_TEST(process) } else win_skip("PROCESS_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); + test_process_info(GetCurrentProcess()); test_TerminateProcess(); test_Startup(); -- 2.34.0

1 0

[PATCH 2/3] ntdll: Skip needless wait for pending completion port if timeout is zero
by Andrew Eikum 23 Nov '21

23 Nov '21

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7fad8250e43..c392eb172b2 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1824,7 +1824,7 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * SERVER_START_REQ( remove_completion ) { req->handle = wine_server_obj_handle( wait_handle ); - req->alloc_wait_handle = wait_handle == handle; + req->alloc_wait_handle = wait_handle == handle && (!timeout || timeout->QuadPart != 0); if (!(status = wine_server_call( req ))) { *key = reply->ckey; @@ -1839,7 +1839,10 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * } SERVER_END_REQ; if (status != STATUS_PENDING) goto exit; - status = NtWaitForSingleObject( wait_handle, FALSE, timeout ); + if (wait_handle != handle) + status = NtWaitForSingleObject( wait_handle, FALSE, timeout ); + else + status = STATUS_TIMEOUT; if (status != WAIT_OBJECT_0) goto exit; } @@ -1870,7 +1873,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM SERVER_START_REQ( remove_completion ) { req->handle = wine_server_obj_handle( wait_handle ); - req->alloc_wait_handle = wait_handle == handle; + req->alloc_wait_handle = wait_handle == handle && (!timeout || timeout->QuadPart != 0); if (!(status = wine_server_call( req ))) { info[i].CompletionKey = reply->ckey; @@ -1892,7 +1895,12 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM if (status == STATUS_PENDING) status = STATUS_SUCCESS; break; } - status = NtWaitForSingleObject( wait_handle, alertable, timeout ); + if (wait_handle != handle) + status = NtWaitForSingleObject( wait_handle, alertable, timeout ); + else if (alertable) + status = NtDelayExecution( TRUE, timeout ); /* query for APC */ + else + status = STATUS_TIMEOUT; if (status != WAIT_OBJECT_0) break; } *written = i ? i : 1; -- 2.34.0

1 0

[PATCH 1/3] ntdll: Use a separate wait handle for pending completion ports
by Andrew Eikum 23 Nov '21

23 Nov '21

The problematic call sequence is: Thread A: GetQueuedCompletionPortStatus(port); -> blocks Thread B: PostQueuedCompletionPortStatus(port); CloseHandle(port); Thread A: unblocks -> INVALID_HANDLE_VALUE Tests on Windows show that the queued status is always returned to thread A in this scenario. In Wine, it would sometimes fail due to the CloseHandle being called before the queued status unblocked the thread, causing sporadic failures in Mount & Blade: Bannerlord. This patch works around this by returning a new handle in the would-block case, which allows the blocked thread to read the last queued status before destroying the object. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 32 ++++++++++++++++++++++++++------ server/completion.c | 7 +++++++ server/protocol.def | 2 ++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index d5d92145503..7fad8250e43 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1815,6 +1815,7 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * IO_STATUS_BLOCK *io, LARGE_INTEGER *timeout ) { NTSTATUS status; + HANDLE wait_handle = handle; TRACE( "(%p, %p, %p, %p, %p)\n", handle, key, value, io, timeout ); @@ -1822,7 +1823,8 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * { SERVER_START_REQ( remove_completion ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( wait_handle ); + req->alloc_wait_handle = wait_handle == handle; if (!(status = wine_server_call( req ))) { *key = reply->ckey; @@ -1830,12 +1832,22 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * io->Information = reply->information; io->u.Status = reply->status; } + else if (status == STATUS_PENDING) + { + wait_handle = wine_server_ptr_handle( reply->wait_handle ); + } } SERVER_END_REQ; - if (status != STATUS_PENDING) return status; - status = NtWaitForSingleObject( handle, FALSE, timeout ); - if (status != WAIT_OBJECT_0) return status; + if (status != STATUS_PENDING) goto exit; + status = NtWaitForSingleObject( wait_handle, FALSE, timeout ); + if (status != WAIT_OBJECT_0) goto exit; } + +exit: + if (wait_handle != handle) + NtClose( wait_handle ); + + return status; } @@ -1847,6 +1859,7 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM { NTSTATUS status; ULONG i = 0; + HANDLE wait_handle = handle; TRACE( "%p %p %u %p %p %u\n", handle, info, count, written, timeout, alertable ); @@ -1856,7 +1869,8 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM { SERVER_START_REQ( remove_completion ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( wait_handle ); + req->alloc_wait_handle = wait_handle == handle; if (!(status = wine_server_call( req ))) { info[i].CompletionKey = reply->ckey; @@ -1864,6 +1878,10 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM info[i].IoStatusBlock.Information = reply->information; info[i].IoStatusBlock.u.Status = reply->status; } + else if (status == STATUS_PENDING) + { + wait_handle = wine_server_ptr_handle( reply->wait_handle ); + } } SERVER_END_REQ; if (status != STATUS_SUCCESS) break; @@ -1874,10 +1892,12 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM if (status == STATUS_PENDING) status = STATUS_SUCCESS; break; } - status = NtWaitForSingleObject( handle, alertable, timeout ); + status = NtWaitForSingleObject( wait_handle, alertable, timeout ); if (status != WAIT_OBJECT_0) break; } *written = i ? i : 1; + if (wait_handle != handle) + NtClose( wait_handle ); return status; } diff --git a/server/completion.c b/server/completion.c index 6933195e72d..6e8a224e3fa 100644 --- a/server/completion.c +++ b/server/completion.c @@ -220,7 +220,14 @@ DECL_HANDLER(remove_completion) entry = list_head( &completion->queue ); if (!entry) + { + if (req->alloc_wait_handle) + reply->wait_handle = duplicate_handle( current->process, + req->handle, current->process, 0, 0, DUPLICATE_SAME_ACCESS ); + else + reply->wait_handle = req->handle; set_error( STATUS_PENDING ); + } else { list_remove( entry ); diff --git a/server/protocol.def b/server/protocol.def index ad6d2bb58d0..051a5dbe848 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3494,11 +3494,13 @@ struct handle_info /* get completion from completion port queue */ @REQ(remove_completion) obj_handle_t handle; /* port handle */ + unsigned int alloc_wait_handle; /* whether to duplicate handle on PENDING result */ @REPLY apc_param_t ckey; /* completion key */ apc_param_t cvalue; /* completion value */ apc_param_t information; /* IO_STATUS_BLOCK Information */ unsigned int status; /* completion result */ + obj_handle_t wait_handle; /* if alloc_wait_handle was non-zero, duplicate handle on PENDING result */ @END -- 2.34.0

1 0

[PATCH 2/2] kernelbase: Handle UNC path in UrlApplySchemeW.
by Daniel Lehman 23 Nov '21

23 Nov '21

fixes loading xml from a unc path

1 0

[PATCH 1/2] shlwapi/tests: Add some UrlApplyScheme tests.
by Daniel Lehman 23 Nov '21

23 Nov '21

1 0

[PATCH v7 0/7] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang 23 Nov '21

23 Nov '21

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. v4 -> v5: - Fix pointer variable declaration style. - Synchronize to prior modified patches. - Split out XML escaping in a separate patch - Don't realloc/free when emptying - Drop reply_buffer_resize(), merge into reply_buffer_grow() - Remove "more" variables for now - Don't empty the reply buffer twice - Use two sscanf for alternative patterns - Don't always zero-initialise qxfer_object_annex - Use strcpy (I just did what I was told to do) - Use strcmp (I just did what I was told to do) v5 -> v6: - Remove a gratuitous blank line - Edit commit messages v6 -> v7: - Change type of reply_buffer::base from void* to unsigned char* - s/reply_buffer_empty/reply_buffer_clear/g - Remove unused function reply_buffer_append_str - Add function reply_buffer_append_str here - packet_reply_xfer: Change type of `off` and `len` parameters to size_t - packet_reply_xfer: Remove data and datalen parameters Jinoh Kang (7): winedbg: Refactor gdb_context::out_{buf*,len} into reply_buffer. winedbg: Use exponential growth in gdbproxy reply_buffer_grow. winedbg: Buffer output of GDB qXfer commands for proper slicing. winedbg: Escape XML special characters in qXfer reply. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 604 ++++++++++++++++++++++++------------ 1 file changed, 406 insertions(+), 198 deletions(-) -- 2.31.1

2 14

[PATCH 0/8] Setting dwarf4 as Wine default debug format
by Eric Pouech 23 Nov '21

23 Nov '21

This series: + fixes all the bugs I'm aware of in all the recent dbghelp changes (dwarf4, but others too). + and let dwarf4 replace dwarf2 as default debug format (it's been almost 15 years <g>) full wine recompilation required to get all debug info upgraded in Wine libraries, DLLs... A+ --- Eric Pouech (8): dbghelp: fix potential crash when loading a builtin a PE module embedded in an ELF image dbghelp: protect against missing compiland when adding global function... dbghelp/dwarf: don't unmap twice the fmap of a DWZ module dbghelp: remove incorrect FIXME in SymEnumerateLoadedModules dbghelp: in SymEnumerateLoadedModules, don't limit the number of modules dbghelp: fix allocation error in image_load_debugaltlink dbghelp: simplify code for searching alternate debug info files configure.ac: let dwarf4 be Wine's default debug format configure.ac | 6 +-- dlls/dbghelp/dwarf.c | 1 - dlls/dbghelp/module.c | 87 +++++++++++++++++++++---------------------- dlls/dbghelp/symbol.c | 7 +++- 4 files changed, 49 insertions(+), 52 deletions(-)

2 9

[PATCH v6 0/6] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang 23 Nov '21

23 Nov '21

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. v4 -> v5: - Fix pointer variable declaration style. - Synchronize to prior modified patches. - Split out XML escaping in a separate patch - Don't realloc/free when emptying - Drop reply_buffer_resize(), merge into reply_buffer_grow() - Remove "more" variables for now - Don't empty the reply buffer twice - Use two sscanf for alternative patterns - Don't always zero-initialise qxfer_object_annex - Use strcpy (I just did what I was told to do) - Use strcmp (I just did what I was told to do) v5 -> v6: - Remove a gratuitous blank line - Edit commit messages Jinoh Kang (6): winedbg: Refactor gdb_context::out_{buf*,len} into reply_buffer. winedbg: Buffer output of GDB qXfer commands for proper slicing. winedbg: Escape XML special characters in qXfer reply. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 602 ++++++++++++++++++++++++------------ 1 file changed, 404 insertions(+), 198 deletions(-) -- 2.31.1

2 11

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 23 Nov '21

23 Nov '21

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 1425 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 752 insertions(+), 673 deletions(-) diff --git a/po/ko.po b/po/ko.po index a710bac179c..fb56ecbe66c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,11 +1,12 @@ # Korean translations for Wine +# Byeongsik Jeon <bsjeon(a)hanmail.net>, 2021. # msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-02-04 15:08+0900\n" +"PO-Revision-Date: 2021-11-24 00:22+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -19,26 +20,23 @@ msgid "Security" msgstr "보안" #: dlls/aclui/aclui.rc:32 -#, fuzzy #| msgid "&User name:" msgid "&Group or user names:" -msgstr "사용자 이름(&U):" +msgstr "그룹 또는 사용자 이름(&G):" #: dlls/aclui/aclui.rc:38 -#, fuzzy #| msgid "Yellow" msgid "Allow" -msgstr "노랑" +msgstr "허용" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "거부" #: dlls/aclui/aclui.rc:47 -#, fuzzy #| msgid "Permission denied" msgid "Permissions for %1" -msgstr "허가가 거부되었습니다" +msgstr "%1에 대한 사용권한" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -63,7 +61,7 @@ msgid "" "Remove." msgstr "" "다음 소프트웨어는 자동으로 제거됩니다. 프로그램을 제거하거나 설치된 구성요소" -"를 수정하려면, 목록에서 선택한 후 [수정/제거]를 클릭하세요." +"를 수정하려면, 목록에서 선택한 후 [수정] 또는 [제거]를 클릭하세요." #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -3693,37 +3691,34 @@ msgstr "조이스틱" #: dlls/joy.cpl/joy.rc:40 programs/winecfg/winecfg.rc:212 msgid "&Disable" -msgstr "사용하지 않음(&D)" +msgstr "사용 중지(&D)" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy #| msgid "Reset" msgid "&Reset" -msgstr "재설정" +msgstr "초기화(&R)" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" -msgstr "가능(&E)" +msgstr "사용(&E)" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy #| msgid "Edit Override" msgid "&Override" -msgstr "재정의 편집" +msgstr "재정의(&O)" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "연결됨" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy #| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "음성 입력 장치:" +msgstr "연결됨 (XINPUT 장치)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" -msgstr "불가능" +msgstr "사용 중지됨" #: dlls/joy.cpl/joy.rc:50 msgid "" @@ -3966,7 +3961,7 @@ msgstr "" #: dlls/jscript/jscript.rc:74 msgid "Cannot define property '|': object is not extensible" -msgstr "" +msgstr "속성 '|'을(를) 정의할 수 없습니다. 개체가 확장 가능하지 않습니다." #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" @@ -3977,10 +3972,9 @@ msgid "Cannot modify non-writable property '|'" msgstr "쓰기 가능하지 않은 속성 '|'을(를) 수정할 수 없습니다" #: dlls/jscript/jscript.rc:77 -#, fuzzy #| msgid "'[object]' is not a date object" msgid "'this' is not a Map object" -msgstr "'[object]'은(는) 날짜 개체가 아닙니다" +msgstr "'this'는 Map 개체가 아닙니다" #: dlls/jscript/jscript.rc:78 msgid "Property cannot have both accessors and a value" @@ -5045,7 +5039,7 @@ msgstr "미디어를 적재 해제 불가능.\n" #: dlls/kernel32/winerror.mc:1348 msgid "Media changed.\n" -msgstr "미디어가 바뀌었습니다.\n" +msgstr "미디어가 변경되었습니다.\n" #: dlls/kernel32/winerror.mc:1353 msgid "I/O bus reset.\n" @@ -6137,7 +6131,7 @@ msgstr "이벤트 로그 파일이 가득 참.\n" #: dlls/kernel32/winerror.mc:2723 msgid "Event log file changed.\n" -msgstr "이벤트 로그 파일이 바뀌었습니다.\n" +msgstr "이벤트 로그 파일이 변경되었습니다.\n" #: dlls/kernel32/winerror.mc:2728 msgid "Installer service failed.\n" @@ -6976,10 +6970,9 @@ msgid "Resource is not currently available.\n" msgstr "현재 리소스를 사용할 수 없습니다.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy #| msgid "Class Name:" msgid "Classic Blue" -msgstr "클래스 이름:" +msgstr "클래식 파랑" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73 @@ -6987,569 +6980,525 @@ msgid "Normal" msgstr "보통" #: dlls/localspl/localspl.rc:37 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter" -msgstr "문자" +msgstr "레터" #: dlls/localspl/localspl.rc:38 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter Small" -msgstr "문자" +msgstr "레터 소형" #: dlls/localspl/localspl.rc:39 -#, fuzzy #| msgid "&Table" msgid "Tabloid" -msgstr "표(&T)" +msgstr "타블로이드" #: dlls/localspl/localspl.rc:40 msgid "Ledger" -msgstr "" +msgstr "회계 원장" #: dlls/localspl/localspl.rc:41 msgid "Legal" -msgstr "" +msgstr "리갈" #: dlls/localspl/localspl.rc:42 -#, fuzzy #| msgid "State" msgid "Statement" -msgstr "상태" +msgstr "Statement" #: dlls/localspl/localspl.rc:43 -#, fuzzy #| msgid "&Execute..." msgid "Executive" -msgstr "실행(&E)..." +msgstr "Executive" #: dlls/localspl/localspl.rc:44 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy #| msgid "Small" msgid "A4 Small" -msgstr "작게" +msgstr "A4 소형" #: dlls/localspl/localspl.rc:47 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" -msgstr "" +msgstr "Folio" #: dlls/localspl/localspl.rc:51 msgid "Quarto" -msgstr "" +msgstr "Quarto" #: dlls/localspl/localspl.rc:52 msgid "10x14" -msgstr "" +msgstr "10x14" #: dlls/localspl/localspl.rc:53 msgid "11x17" -msgstr "" +msgstr "11x17" #: dlls/localspl/localspl.rc:54 -#, fuzzy #| msgid "Notepad" msgid "Note" -msgstr "메모장" +msgstr "노트" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" -msgstr "" +msgstr "봉투 #9" #: dlls/localspl/localspl.rc:56 msgid "Envelope #10" -msgstr "" +msgstr "봉투 #10" #: dlls/localspl/localspl.rc:57 msgid "Envelope #11" -msgstr "" +msgstr "봉투 #11" #: dlls/localspl/localspl.rc:58 msgid "Envelope #12" -msgstr "" +msgstr "봉투 #12" #: dlls/localspl/localspl.rc:59 msgid "Envelope #14" -msgstr "" +msgstr "봉투 #14" #: dlls/localspl/localspl.rc:60 msgid "C size sheet" -msgstr "" +msgstr "C 크기 용지" #: dlls/localspl/localspl.rc:61 msgid "D size sheet" -msgstr "" +msgstr "D 크기 용지" #: dlls/localspl/localspl.rc:62 msgid "E size sheet" -msgstr "" +msgstr "E 크기 용지" #: dlls/localspl/localspl.rc:63 msgid "Envelope DL" -msgstr "" +msgstr "봉투 DL" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "봉투 C5" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "봉투 C3" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "봉투 C4" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "봉투 C6" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "봉투 C65" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "봉투 B4" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "봉투 B5" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "봉투 B6" #: dlls/localspl/localspl.rc:72 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "포장된 PKCS 7" +msgstr "봉투" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "봉투 Monarch" #: dlls/localspl/localspl.rc:74 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "포장된 PKCS 7" +msgstr "6 3/4 봉투" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" -msgstr "" +msgstr "미국 표준 팬폴드" #: dlls/localspl/localspl.rc:76 msgid "German Std Fanfold" -msgstr "" +msgstr "독일 표준 팬폴드" #: dlls/localspl/localspl.rc:77 msgid "German Legal Fanfold" -msgstr "" +msgstr "독일 리갈 팬폴드" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy #| msgid "Japanese" msgid "Japanese Postcard" -msgstr "일본" +msgstr "일본 엽서" #: dlls/localspl/localspl.rc:80 msgid "9x11" -msgstr "" +msgstr "9x11" #: dlls/localspl/localspl.rc:81 msgid "10x11" -msgstr "" +msgstr "10x11" #: dlls/localspl/localspl.rc:82 msgid "15x11" -msgstr "" +msgstr "15x11" #: dlls/localspl/localspl.rc:83 msgid "Envelope Invite" -msgstr "" +msgstr "봉투 초대장" #: dlls/localspl/localspl.rc:84 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter Extra" -msgstr "문자" +msgstr "레터 엑스트라" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" -msgstr "" +msgstr "리갈 엑스트라" #: dlls/localspl/localspl.rc:86 msgid "Tabloid Extra" -msgstr "" +msgstr "타블로이드 엑스트라" #: dlls/localspl/localspl.rc:87 -#, fuzzy #| msgid "E&xtras" msgid "A4 Extra" -msgstr "추가(&X)" +msgstr "A4 엑스트라" #: dlls/localspl/localspl.rc:88 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "Letter Transverse" -msgstr "방문됨" +msgstr "레터 가로" #: dlls/localspl/localspl.rc:89 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "A4 Transverse" -msgstr "방문됨" +msgstr "A4 가로" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" -msgstr "" +msgstr "레터 엑스트라 가로" #: dlls/localspl/localspl.rc:91 msgid "Super A" -msgstr "" +msgstr "슈퍼 A" #: dlls/localspl/localspl.rc:92 msgid "Super B" -msgstr "" +msgstr "슈퍼 B" #: dlls/localspl/localspl.rc:93 -#, fuzzy #| msgctxt "Drive letter" #| msgid "Letter" msgid "Letter Plus" -msgstr "문자" +msgstr "레터 플러스" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" -msgstr "" +msgstr "A4 플러스" #: dlls/localspl/localspl.rc:95 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "A5 Transverse" -msgstr "방문됨" +msgstr "A5 가로" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" -msgstr "" +msgstr "B5 (JIS) 가로" #: dlls/localspl/localspl.rc:97 -#, fuzzy #| msgid "E&xtras" msgid "A3 Extra" -msgstr "추가(&X)" +msgstr "A3 엑스트라" #: dlls/localspl/localspl.rc:98 -#, fuzzy #| msgid "E&xtras" msgid "A5 Extra" -msgstr "추가(&X)" +msgstr "A5 엑스트라" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" -msgstr "" +msgstr "B5 (ISO) 엑스트라" #: dlls/localspl/localspl.rc:100 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy #| msgctxt "object state" #| msgid "traversed" msgid "A3 Transverse" -msgstr "방문됨" +msgstr "A3 가로" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" -msgstr "" +msgstr "A3 엑스트라 가로" #: dlls/localspl/localspl.rc:103 msgid "Japanese Double Postcard" -msgstr "" +msgstr "일본 이중 엽서" #: dlls/localspl/localspl.rc:104 -#, fuzzy #| msgctxt "All key" #| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" -msgstr "" +msgstr "일본 봉투 Kaku #2" #: dlls/localspl/localspl.rc:106 msgid "Japanese Envelope Kaku #3" -msgstr "" +msgstr "일본 봉투 Kaku #3" #: dlls/localspl/localspl.rc:107 msgid "Japanese Envelope Chou #3" -msgstr "" +msgstr "일본 봉투 Chou #3" #: dlls/localspl/localspl.rc:108 msgid "Japanese Envelope Chou #4" -msgstr "" +msgstr "일본 봉투 Chou #4" #: dlls/localspl/localspl.rc:109 msgid "Letter Rotated" -msgstr "" +msgstr "레터 회전" #: dlls/localspl/localspl.rc:110 msgid "A3 Rotated" -msgstr "" +msgstr "A3 회전" #: dlls/localspl/localspl.rc:111 msgid "A4 Rotated" -msgstr "" +msgstr "A4 회전" #: dlls/localspl/localspl.rc:112 msgid "A5 Rotated" -msgstr "" +msgstr "A5 회전" #: dlls/localspl/localspl.rc:113 msgid "B4 (JIS) Rotated" -msgstr "" +msgstr "B4 (JIS) 회전" #: dlls/localspl/localspl.rc:114 msgid "B5 (JIS) Rotated" -msgstr "" +msgstr "B5 (JIS) 회전" #: dlls/localspl/localspl.rc:115 msgid "Japanese Postcard Rotated" -msgstr "" +msgstr "일본 엽서 회전" #: dlls/localspl/localspl.rc:116 msgid "Double Japan Postcard Rotated" -msgstr "" +msgstr "이중 일본 엽서 회전" #: dlls/localspl/localspl.rc:117 msgid "A6 Rotated" -msgstr "" +msgstr "A6 회전" #: dlls/localspl/localspl.rc:118 msgid "Japan Envelope Kaku #2 Rotated" -msgstr "" +msgstr "일본 봉투 Kaku #2 회전" #: dlls/localspl/localspl.rc:119 msgid "Japan Envelope Kaku #3 Rotated" -msgstr "" +msgstr "일본 봉투 Kaku #3 회전" #: dlls/localspl/localspl.rc:120 msgid "Japan Envelope Chou #3 Rotated" -msgstr "" +msgstr "일본 봉투 Chou #3 회전" #: dlls/localspl/localspl.rc:121 msgid "Japan Envelope Chou #4 Rotated" -msgstr "" +msgstr "일본 봉투 Chou #4 회전" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" -msgstr "" +msgstr "B6 (JIS) 회전" #: dlls/localspl/localspl.rc:124 msgid "12x11" -msgstr "" +msgstr "12x11" #: dlls/localspl/localspl.rc:125 msgid "Japan Envelope You #4" -msgstr "" +msgstr "일본 봉투 You #4" #: dlls/localspl/localspl.rc:126 msgid "Japan Envelope You #4 Rotated" -msgstr "" +msgstr "일본 봉투 You #4 회전" #: dlls/localspl/localspl.rc:127 msgid "PRC 16K" -msgstr "" +msgstr "PRC 16K" #: dlls/localspl/localspl.rc:128 msgid "PRC 32K" -msgstr "" +msgstr "PRC 32K" #: dlls/localspl/localspl.rc:129 msgid "PRC 32K(Big)" -msgstr "" +msgstr "PRC 32K(대)" #: dlls/localspl/localspl.rc:130 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #1" #: dlls/localspl/localspl.rc:131 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #2" #: dlls/localspl/localspl.rc:132 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #3" #: dlls/localspl/localspl.rc:133 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #4" #: dlls/localspl/localspl.rc:134 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #5" #: dlls/localspl/localspl.rc:135 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #6" #: dlls/localspl/localspl.rc:136 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #7" #: dlls/localspl/localspl.rc:137 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #8" #: dlls/localspl/localspl.rc:138 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #9" #: dlls/localspl/localspl.rc:139 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #10" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" -msgstr "" +msgstr "PRC 16K 회전" #: dlls/localspl/localspl.rc:141 msgid "PRC 32K Rotated" -msgstr "" +msgstr "PRC 32K 회전" #: dlls/localspl/localspl.rc:142 msgid "PRC 32K(Big) Rotated" -msgstr "" +msgstr "PRC 32K(대) 회전" #: dlls/localspl/localspl.rc:143 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #1 회전" #: dlls/localspl/localspl.rc:144 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #2 회전" #: dlls/localspl/localspl.rc:145 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #3 회전" #: dlls/localspl/localspl.rc:146 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #4 회전" #: dlls/localspl/localspl.rc:147 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #5 회전" #: dlls/localspl/localspl.rc:148 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #6 회전" #: dlls/localspl/localspl.rc:149 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #7 회전" #: dlls/localspl/localspl.rc:150 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #8 회전" #: dlls/localspl/localspl.rc:151 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #9 회전" #: dlls/localspl/localspl.rc:152 -#, fuzzy #| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "포장된 PKCS 7" +msgstr "PRC 봉투 #10 회전" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -10403,1703 +10352,1663 @@ msgstr "원본 선택" #: dlls/tzres/tzres.rc:126 msgid "China Standard Time" -msgstr "중국 표준 시간" +msgstr "중국 표준시" #: dlls/tzres/tzres.rc:127 msgid "China Daylight Time" -msgstr "중국 일광 절약 시간" +msgstr "중국 일광 절약시" #: dlls/tzres/tzres.rc:128 msgid "(UTC+08:00) Beijing, Chongqing, Hong Kong, Urumqi" -msgstr "" +msgstr "(UTC+08:00) 베이징, 충칭, 홍콩 특별 행정구, 우루무치" #: dlls/tzres/tzres.rc:267 msgid "North Asia Standard Time" -msgstr "북아시아 표준 시간" +msgstr "북아시아 표준시" #: dlls/tzres/tzres.rc:268 msgid "North Asia Daylight Time" -msgstr "북아시아 일광 절약 시간" +msgstr "북아시아 일광 절약시" #: dlls/tzres/tzres.rc:269 msgid "(UTC+07:00) Krasnoyarsk" -msgstr "" +msgstr "(UTC+07:00) 크라스노야르스크" #: dlls/tzres/tzres.rc:168 msgid "Georgian Standard Time" -msgstr "그루지아 표준 시간" +msgstr "그루지아 표준시" #: dlls/tzres/tzres.rc:169 msgid "Georgian Daylight Time" -msgstr "그루지아 일광 절약 시간" +msgstr "그루지아 일광 절약시" #: dlls/tzres/tzres.rc:170 msgid "(UTC+04:00) Tbilisi" -msgstr "" +msgstr "(UTC+04:00) 트빌리시" #: dlls/tzres/tzres.rc:390 dlls/tzres/tzres.rc:391 msgid "UTC+12" -msgstr "" +msgstr "UTC+12" #: dlls/tzres/tzres.rc:392 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC+12:00) Coordinated Universal Time+12" -msgstr "협정 세계시" +msgstr "(UTC+12:00) 협정 세계시+12" #: dlls/tzres/tzres.rc:252 msgid "Nepal Standard Time" -msgstr "네팔 표준 시간" +msgstr "네팔 표준시" #: dlls/tzres/tzres.rc:253 msgid "Nepal Daylight Time" -msgstr "네팔 일광 절약 시간" +msgstr "네팔 일광 절약시" #: dlls/tzres/tzres.rc:254 msgid "(UTC+05:45) Kathmandu" -msgstr "" +msgstr "(UTC+05:45) 카트만두" #: dlls/tzres/tzres.rc:90 msgid "Cape Verde Standard Time" -msgstr "카보베르데 표준 시간" +msgstr "카보베르데 표준시" #: dlls/tzres/tzres.rc:91 msgid "Cape Verde Daylight Time" -msgstr "카보베르데 일광 절약 시간" +msgstr "카보베르데 일광 절약시" #: dlls/tzres/tzres.rc:92 msgid "(UTC-01:00) Cabo Verde Is." -msgstr "" +msgstr "(UTC-01:00) 카보베르데 제도" #: dlls/tzres/tzres.rc:183 msgid "Haiti Standard Time" -msgstr "아이티 표준 시간" +msgstr "아이티 표준시" #: dlls/tzres/tzres.rc:184 msgid "Haiti Daylight Time" -msgstr "아이티 일광 절약 시간" +msgstr "아이티 일광 절약시" #: dlls/tzres/tzres.rc:185 msgid "(UTC-05:00) Haiti" -msgstr "" +msgstr "(UTC-05:00) 아이티" #: dlls/tzres/tzres.rc:111 msgid "Central European Standard Time" -msgstr "중앙 유럽 표준 시간" +msgstr "중앙 유럽 표준시" #: dlls/tzres/tzres.rc:112 msgid "Central European Daylight Time" -msgstr "중앙 유럽 일관 절약 시간" +msgstr "중앙 유럽 일관 절약시" #: dlls/tzres/tzres.rc:113 msgid "(UTC+01:00) Sarajevo, Skopje, Warsaw, Zagreb" -msgstr "" +msgstr "(UTC+01:00) 사라예보, 스코페, 바르샤바, 자그레브" #: dlls/tzres/tzres.rc:234 msgid "Morocco Standard Time" -msgstr "모로코 표준 시간" +msgstr "모로코 표준시" #: dlls/tzres/tzres.rc:235 msgid "Morocco Daylight Time" -msgstr "모로코 일광 절약 시간" +msgstr "모로코 일광 절약시" #: dlls/tzres/tzres.rc:236 msgid "(UTC+01:00) Casablanca" -msgstr "" +msgstr "(UTC+01:00) 카사블랑카" #: dlls/tzres/tzres.rc:399 dlls/tzres/tzres.rc:400 msgid "UTC-08" -msgstr "" +msgstr "UTC-08" #: dlls/tzres/tzres.rc:401 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-08:00) Coordinated Universal Time-08" -msgstr "협정 세계시" +msgstr "" +"협정 세계시\n" +"(UTC-08:00) 협정 세계시-08" #: dlls/tzres/tzres.rc:39 -#, fuzzy #| msgid "Atlantic Standard Time" msgid "Altai Standard Time" -msgstr "대서양 표준 시간" +msgstr "알타이 표준시" #: dlls/tzres/tzres.rc:40 -#, fuzzy #| msgid "Atlantic Daylight Time" msgid "Altai Daylight Time" -msgstr "대서양 일광 절약 시간" +msgstr "알타이 일광 절약시" #: dlls/tzres/tzres.rc:41 msgid "(UTC+07:00) Barnaul, Gorno-Altaysk" -msgstr "" +msgstr "(UTC+07:00) 바르나울, 고르노알타이스크" #: dlls/tzres/tzres.rc:108 msgid "Central Europe Standard Time" -msgstr "중앙 유럽 표준 시간" +msgstr "중앙 유럽 표준시" #: dlls/tzres/tzres.rc:109 msgid "Central Europe Daylight Time" -msgstr "중앙 유럽 일광 절약 시간" +msgstr "중앙 유럽 일광 절약시" #: dlls/tzres/tzres.rc:110 msgid "(UTC+01:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague" -msgstr "" +msgstr "(UTC+01:00) 베오그라드, 브라티슬라바, 부다페스트, 류블랴나, 프라하" #: dlls/tzres/tzres.rc:192 msgid "Iran Standard Time" -msgstr "이란 표준 시간" +msgstr "이란 표준시" #: dlls/tzres/tzres.rc:193 msgid "Iran Daylight Time" -msgstr "이란 일광 절약 시간" +msgstr "이란 일광 절약시" #: dlls/tzres/tzres.rc:194 msgid "(UTC+03:30) Tehran" -msgstr "" +msgstr "(UTC+03:30) 테헤란" #: dlls/tzres/tzres.rc:318 msgid "Saint Pierre Standard Time" -msgstr "생피에르 표준 시간" +msgstr "생피에르 표준시" #: dlls/tzres/tzres.rc:319 msgid "Saint Pierre Daylight Time" -msgstr "생피에르 일광 절약 시간" +msgstr "생피에르 일광 절약시" #: dlls/tzres/tzres.rc:320 -#, fuzzy #| msgid "Saint Pierre Standard Time" msgid "(UTC-03:00) Saint Pierre and Miquelon" -msgstr "생피에르 표준 시간" +msgstr "(UTC-03:00) 세인트 피에르 미켈론" #: dlls/tzres/tzres.rc:327 -#, fuzzy #| msgid "Samoa Standard Time" msgid "Sao Tome Standard Time" -msgstr "사모아 표준 시간" +msgstr "상투메 표준시" #: dlls/tzres/tzres.rc:328 -#, fuzzy #| msgid "Samoa Daylight Time" msgid "Sao Tome Daylight Time" -msgstr "사모아 일광 절약 시간" +msgstr "상투메 일광 절약시" #: dlls/tzres/tzres.rc:329 msgid "(UTC+00:00) Sao Tome" -msgstr "" +msgstr "(UTC+00:00) 상투메" #: dlls/tzres/tzres.rc:249 msgid "Namibia Standard Time" -msgstr "나미비아 표준 시간" +msgstr "나미비아 표준시" #: dlls/tzres/tzres.rc:250 msgid "Namibia Daylight Time" -msgstr "나미비아 일광 절약 시간" +msgstr "나미비아 일광 절약시" #: dlls/tzres/tzres.rc:251 msgid "(UTC+02:00) Windhoek" -msgstr "" +msgstr "(UTC+02:00) 빈트후크" #: dlls/tzres/tzres.rc:366 msgid "Tonga Standard Time" -msgstr "통가 표준 시간" +msgstr "통가 표준시" #: dlls/tzres/tzres.rc:367 msgid "Tonga Daylight Time" -msgstr "통가 일괄 절약 시간" +msgstr "통가 일괄 절약시" #: dlls/tzres/tzres.rc:368 msgid "(UTC+13:00) Nuku'alofa" -msgstr "" +msgstr "(UTC+13:00) 누쿠알로파" #: dlls/tzres/tzres.rc:240 msgid "Mountain Standard Time (Mexico)" -msgstr "산지 표준 시간 (멕시코)" +msgstr "산지 표준시 (멕시코)" #: dlls/tzres/tzres.rc:241 msgid "Mountain Daylight Time (Mexico)" -msgstr "산지 일광 절약 시간 (멕시코)" +msgstr "산지 일광 절약시 (멕시코)" #: dlls/tzres/tzres.rc:242 msgid "(UTC-07:00) Chihuahua, La Paz, Mazatlan" -msgstr "" +msgstr "(UTC-07:00) 치와와, 라파스, 마사틀란" #: dlls/tzres/tzres.rc:171 msgid "GMT Standard Time" -msgstr "GMT 표준 시간" +msgstr "GMT 표준시" #: dlls/tzres/tzres.rc:172 msgid "GMT Daylight Time" -msgstr "GMT 일광 절약 시간" +msgstr "GMT 일광 절약시" #: dlls/tzres/tzres.rc:173 msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" -msgstr "" +msgstr "(UTC+00:00) 더블린, 에든버러, 리스본, 런던" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" -msgstr "중앙 아시아 표준 시간" +msgstr "중앙 아시아 표준시" #: dlls/tzres/tzres.rc:103 msgid "Central Asia Daylight Time" -msgstr "중앙 아시아 일광 절약 시간" +msgstr "중앙 아시아 일광 절약시" #: dlls/tzres/tzres.rc:104 msgid "(UTC+06:00) Astana" -msgstr "" +msgstr "(UTC+06:00) 아스타나" #: dlls/tzres/tzres.rc:213 msgid "Lord Howe Standard Time" -msgstr "로드하우 표준 시간" +msgstr "로드하우 표준시" #: dlls/tzres/tzres.rc:214 msgid "Lord Howe Daylight Time" -msgstr "로드하우 일광 절약 시간" +msgstr "로드하우 일광 절약시" #: dlls/tzres/tzres.rc:215 msgid "(UTC+10:30) Lord Howe Island" -msgstr "" +msgstr "(UTC+10:30) 로드하우 섬" #: dlls/tzres/tzres.rc:48 msgid "Arabic Standard Time" -msgstr "아랍 표준 시간" +msgstr "아랍 표준시" #: dlls/tzres/tzres.rc:49 msgid "Arabic Daylight Time" -msgstr "아랍 일광 절약 시간" +msgstr "아랍 일광 절약시" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" -msgstr "" +msgstr "(UTC+03:00) 바그다드" #: dlls/tzres/tzres.rc:393 dlls/tzres/tzres.rc:394 msgid "UTC+13" -msgstr "" +msgstr "UTC+13" #: dlls/tzres/tzres.rc:395 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC+13:00) Coordinated Universal Time+13" -msgstr "협정 세계시" +msgstr "(UTC+13:00) 협정 세계시+13" #: dlls/tzres/tzres.rc:216 msgid "Magadan Standard Time" -msgstr "마가단 표준 시간" +msgstr "마가단 표준시" #: dlls/tzres/tzres.rc:217 msgid "Magadan Daylight Time" -msgstr "마가단 일광 절약 시간" +msgstr "마가단 일광 절약시" #: dlls/tzres/tzres.rc:218 msgid "(UTC+11:00) Magadan" -msgstr "" +msgstr "(UTC+11:00) 마가단" #: dlls/tzres/tzres.rc:258 msgid "Newfoundland Standard Time" -msgstr "뉴펀들랜드 표준 시간" +msgstr "뉴펀들랜드 표준시" #: dlls/tzres/tzres.rc:259 msgid "Newfoundland Daylight Time" -msgstr "뉴펀들랜드 일광 절약 시간" +msgstr "뉴펀들랜드 일광 절약시" #: dlls/tzres/tzres.rc:260 msgid "(UTC-03:30) Newfoundland" -msgstr "" +msgstr "(UTC-03:30) 뉴펀들랜드" #: dlls/tzres/tzres.rc:345 -#, fuzzy #| msgid "Jordan Standard Time" msgid "Sudan Standard Time" -msgstr "요르단 표준 시간" +msgstr "수단 표준시" #: dlls/tzres/tzres.rc:346 -#, fuzzy #| msgid "Jordan Daylight Time" msgid "Sudan Daylight Time" -msgstr "요르단 일광 절약 시간" +msgstr "수단 일광 절약시" #: dlls/tzres/tzres.rc:347 msgid "(UTC+02:00) Khartoum" -msgstr "" +msgstr "(UTC+02:00) 하르툼" #: dlls/tzres/tzres.rc:435 msgid "West Pacific Standard Time" -msgstr "서태평양 표준 시간" +msgstr "서태평양 표준시" #: dlls/tzres/tzres.rc:436 msgid "West Pacific Daylight Time" -msgstr "서태평양 일광 절약 시간" +msgstr "서태평양 일광 절약시" #: dlls/tzres/tzres.rc:437 msgid "(UTC+10:00) Guam, Port Moresby" -msgstr "" +msgstr "(UTC+10:00) 괌, 포트모르즈비" #: dlls/tzres/tzres.rc:279 msgid "Pacific Standard Time" -msgstr "태평양 표준 시간" +msgstr "태평양 표준시" #: dlls/tzres/tzres.rc:280 msgid "Pacific Daylight Time" -msgstr "태평양 일광 절약 시간" +msgstr "태평양 일광 절약시" #: dlls/tzres/tzres.rc:281 msgid "(UTC-08:00) Pacific Time (US & Canada)" -msgstr "" +msgstr "(UTC-08:00) 태평양 표준시(미국과 캐나다)" #: dlls/tzres/tzres.rc:69 msgid "Azerbaijan Standard Time" -msgstr "아제르바이잔 표준 시간" +msgstr "아제르바이잔 표준시" #: dlls/tzres/tzres.rc:70 msgid "Azerbaijan Daylight Time" -msgstr "아제르바이잔 일광 절약 시간" +msgstr "아제르바이잔 일광 절약시" #: dlls/tzres/tzres.rc:71 msgid "(UTC+04:00) Baku" -msgstr "" +msgstr "(UTC+04:00) 바쿠" #: dlls/tzres/tzres.rc:219 msgid "Magallanes Standard Time" -msgstr "마갈란스 표준 시간" +msgstr "마갈란스 표준시" #: dlls/tzres/tzres.rc:220 msgid "Magallanes Daylight Time" -msgstr "마갈란스 일광 절약 시간" +msgstr "마갈란스 일광 절약시" #: dlls/tzres/tzres.rc:221 msgid "(UTC-03:00) Punta Arenas" -msgstr "" +msgstr "(UTC-03:00) 푼타 아레나스" #: dlls/tzres/tzres.rc:324 msgid "Samoa Standard Time" -msgstr "사모아 표준 시간" +msgstr "사모아 표준시" #: dlls/tzres/tzres.rc:325 msgid "Samoa Daylight Time" -msgstr "사모아 일광 절약 시간" +msgstr "사모아 일광 절약시" #: dlls/tzres/tzres.rc:326 msgid "(UTC+13:00) Samoa" -msgstr "" +msgstr "(UTC+13:00) 사모아" #: dlls/tzres/tzres.rc:201 msgid "Kaliningrad Standard Time" -msgstr "칼리닌그라드 표준 시간" +msgstr "칼리닌그라드 표준시" #: dlls/tzres/tzres.rc:202 msgid "Kaliningrad Daylight Time" -msgstr "칼리닌그라드 일광 절약 시간" +msgstr "칼리닌그라드 일광 절약시" #: dlls/tzres/tzres.rc:203 msgid "(UTC+02:00) Kaliningrad" -msgstr "" +msgstr "(UTC+02:00) 칼리닌그라드" #: dlls/tzres/tzres.rc:282 msgid "Pacific Standard Time (Mexico)" -msgstr "태평양 표준 시간 (멕시코)" +msgstr "태평양 표준시 (멕시코)" #: dlls/tzres/tzres.rc:283 msgid "Pacific Daylight Time (Mexico)" -msgstr "태평양 일광 절약 시간 (멕시코)" +msgstr "태평양 일광 절약시 (멕시코)" #: dlls/tzres/tzres.rc:284 msgid "(UTC-08:00) Baja California" -msgstr "" +msgstr "(UTC-08:00) 바하 캘리포니아" #: dlls/tzres/tzres.rc:228 msgid "Middle East Standard Time" -msgstr "중동 표준 시간" +msgstr "중동 표준시" #: dlls/tzres/tzres.rc:229 msgid "Middle East Daylight Time" -msgstr "중동 일광 절약 시간" +msgstr "중동 일광 절약시" #: dlls/tzres/tzres.rc:230 msgid "(UTC+02:00) Beirut" -msgstr "" +msgstr "(UTC+02:00) 베이루트" #: dlls/tzres/tzres.rc:360 msgid "Tokyo Standard Time" -msgstr "도쿄 표준 시간" +msgstr "도쿄 표준시" #: dlls/tzres/tzres.rc:361 msgid "Tokyo Daylight Time" -msgstr "도쿄 일광 절약 시간" +msgstr "도쿄 일광 절약시" #: dlls/tzres/tzres.rc:362 msgid "(UTC+09:00) Osaka, Sapporo, Tokyo" -msgstr "" +msgstr "(UTC+09:00) 오사카, 삿포로, 도쿄" #: dlls/tzres/tzres.rc:210 msgid "Line Islands Standard Time" -msgstr "라인 제도 표준 시간" +msgstr "라인 제도 표준시" #: dlls/tzres/tzres.rc:211 msgid "Line Islands Daylight Time" -msgstr "라인 제도 일광 절약 시간" +msgstr "라인 제도 일광 절약시" #: dlls/tzres/tzres.rc:212 msgid "(UTC+14:00) Kiritimati Island" -msgstr "" +msgstr "(UTC+14:00) 키리티마티 섬" #: dlls/tzres/tzres.rc:129 msgid "Cuba Standard Time" -msgstr "쿠바 표준 시간" +msgstr "쿠바 표준시" #: dlls/tzres/tzres.rc:130 msgid "Cuba Daylight Time" -msgstr "쿠바 일광 절약 시간" +msgstr "쿠바 일광 절약시" #: dlls/tzres/tzres.rc:131 msgid "(UTC-05:00) Havana" -msgstr "" +msgstr "(UTC-05:00) 하바나" #: dlls/tzres/tzres.rc:198 msgid "Jordan Standard Time" -msgstr "요르단 표준 시간" +msgstr "요르단 표준시" #: dlls/tzres/tzres.rc:199 msgid "Jordan Daylight Time" -msgstr "요르단 일광 절약 시간" +msgstr "요르단 일광 절약시" #: dlls/tzres/tzres.rc:200 msgid "(UTC+02:00) Amman" -msgstr "" +msgstr "(UTC+02:00) 암만" #: dlls/tzres/tzres.rc:117 msgid "Central Standard Time" -msgstr "중부 표준 시간" +msgstr "중부 표준시" #: dlls/tzres/tzres.rc:118 msgid "Central Daylight Time" -msgstr "중부 일광 절약 시간" +msgstr "중부 일광 절약시" #: dlls/tzres/tzres.rc:119 msgid "(UTC-06:00) Central Time (US & Canada)" -msgstr "" +msgstr "(UTC-06:00) 중부 표준시 (미국과 캐나다)" #: dlls/tzres/tzres.rc:303 dlls/tzres/tzres.rc:304 msgid "Russia Time Zone 3" -msgstr "" +msgstr "러시아 표준 시간대 3" #: dlls/tzres/tzres.rc:305 msgid "(UTC+04:00) Izhevsk, Samara" -msgstr "" +msgstr "(UTC+04:00) 이젭스크, 사마라" #: dlls/tzres/tzres.rc:414 -#, fuzzy #| msgid "Tonga Standard Time" msgid "Volgograd Standard Time" -msgstr "통가 표준 시간" +msgstr "볼고그라드 표준시" #: dlls/tzres/tzres.rc:415 -#, fuzzy #| msgid "Tonga Daylight Time" msgid "Volgograd Daylight Time" -msgstr "통가 일괄 절약 시간" +msgstr "볼고그라드 일광 절약시" #: dlls/tzres/tzres.rc:416 msgid "(UTC+04:00) Volgograd" -msgstr "" +msgstr "(UTC+04:00) 볼고그라드" #: dlls/tzres/tzres.rc:72 msgid "Azores Standard Time" -msgstr "아조레스 표준 시간" +msgstr "아조레스 표준시" #: dlls/tzres/tzres.rc:73 msgid "Azores Daylight Time" -msgstr "아조레스 일광 절약 시간" +msgstr "아조레스 일광 절약시" #: dlls/tzres/tzres.rc:74 msgid "(UTC-01:00) Azores" -msgstr "" +msgstr "(UTC-01:00) 아조레스" #: dlls/tzres/tzres.rc:264 msgid "North Asia East Standard Time" -msgstr "북아시아 동부 표준 시간" +msgstr "북아시아 동부 표준시" #: dlls/tzres/tzres.rc:265 msgid "North Asia East Daylight Time" -msgstr "북아시아 동부 일광 절약 시간" +msgstr "북아시아 동부 일광 절약시" #: dlls/tzres/tzres.rc:266 msgid "(UTC+08:00) Irkutsk" -msgstr "" +msgstr "(UTC+08:00) 이르쿠츠크" #: dlls/tzres/tzres.rc:405 dlls/tzres/tzres.rc:406 msgid "UTC-11" -msgstr "" +msgstr "UTC-11" #: dlls/tzres/tzres.rc:407 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-11:00) Coordinated Universal Time-11" -msgstr "협정 세계시" +msgstr "(UTC-11:00) 협정 세계시-11" #: dlls/tzres/tzres.rc:51 msgid "Argentina Standard Time" -msgstr "아르헨티나 표준 시간" +msgstr "아르헨티나 표준시" #: dlls/tzres/tzres.rc:52 msgid "Argentina Daylight Time" -msgstr "아르헨티나 일광 절약 시간" +msgstr "아르헨티나 일광 절약시" #: dlls/tzres/tzres.rc:53 msgid "(UTC-03:00) City of Buenos Aires" -msgstr "" +msgstr "(UTC-03:00) 부에노스아이레스" #: dlls/tzres/tzres.rc:375 -#, fuzzy #| msgid "Turkey Standard Time" msgid "Turks And Caicos Standard Time" -msgstr "터키 표준 시간" +msgstr "터크스 케이커스 표준시" #: dlls/tzres/tzres.rc:376 -#, fuzzy #| msgid "Turkey Daylight Time" msgid "Turks And Caicos Daylight Time" -msgstr "터키 일광 절약 시간" +msgstr "터크스 케이커스 일광 절약시" #: dlls/tzres/tzres.rc:377 msgid "(UTC-05:00) Turks and Caicos" -msgstr "" +msgstr "(UTC-05:00) 터크스 케이커스" #: dlls/tzres/tzres.rc:222 msgid "Marquesas Standard Time" -msgstr "마키저스 표준 시간" +msgstr "마키저스 표준시" #: dlls/tzres/tzres.rc:223 msgid "Marquesas Daylight Time" -msgstr "마키저스 일광 절약 시간" +msgstr "마키저스 일광 절약시" #: dlls/tzres/tzres.rc:224 msgid "(UTC-09:30) Marquesas Islands" -msgstr "" +msgstr "(UTC-09:30) 마키저스 제도" #: dlls/tzres/tzres.rc:243 msgid "Myanmar Standard Time" -msgstr "미얀마 표준 시간" +msgstr "미얀마 표준시" #: dlls/tzres/tzres.rc:244 msgid "Myanmar Daylight Time" -msgstr "미얀마 일광 절약 시간" +msgstr "미얀마 일광 절약시" #: dlls/tzres/tzres.rc:245 msgid "(UTC+06:30) Yangon (Rangoon)" -msgstr "" +msgstr "(UTC+06:30) 양곤 (랑군)" #: dlls/tzres/tzres.rc:387 dlls/tzres/tzres.rc:388 msgid "Coordinated Universal Time" msgstr "협정 세계시" #: dlls/tzres/tzres.rc:389 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC) Coordinated Universal Time" -msgstr "협정 세계시" +msgstr "(UTC) 협정 세계시" #: dlls/tzres/tzres.rc:189 msgid "India Standard Time" -msgstr "인도 표준 시간" +msgstr "인도 표준시" #: dlls/tzres/tzres.rc:190 msgid "India Daylight Time" -msgstr "인도 일광 절약 시간" +msgstr "인도 일광 절약시" #: dlls/tzres/tzres.rc:191 msgid "(UTC+05:30) Chennai, Kolkata, Mumbai, New Delhi" -msgstr "" +msgstr "(UTC+05:30) 첸나이, 콜카타, 뭄바이, 뉴델리" #: dlls/tzres/tzres.rc:180 msgid "GTB Standard Time" -msgstr "GTB 표준 시간" +msgstr "GTB 표준시" #: dlls/tzres/tzres.rc:181 msgid "GTB Daylight Time" -msgstr "GTB 일광 절약 시간" +msgstr "GTB 일광 절약시" #: dlls/tzres/tzres.rc:182 msgid "(UTC+02:00) Athens, Bucharest" -msgstr "" +msgstr "(UTC+02:00) 아테네, 부카레스트" #: dlls/tzres/tzres.rc:372 msgid "Turkey Standard Time" -msgstr "터키 표준 시간" +msgstr "터키 표준시" #: dlls/tzres/tzres.rc:373 msgid "Turkey Daylight Time" -msgstr "터키 일광 절약 시간" +msgstr "터키 일광 절약시" #: dlls/tzres/tzres.rc:374 msgid "(UTC+03:00) Istanbul" -msgstr "" +msgstr "(UTC+03:00) 이스탄불" #: dlls/tzres/tzres.rc:54 -#, fuzzy #| msgid "Arabian Standard Time" msgid "Astrakhan Standard Time" -msgstr "아라비아 표준 시간" +msgstr "아스트라한 표준시" #: dlls/tzres/tzres.rc:55 -#, fuzzy #| msgid "Arabian Daylight Time" msgid "Astrakhan Daylight Time" -msgstr "아라비아 일광 절약 시간" +msgstr "아스트라한 일광 절약시" #: dlls/tzres/tzres.rc:56 msgid "(UTC+04:00) Astrakhan, Ulyanovsk" -msgstr "" +msgstr "(UTC+04:00) 아스트라한, 울랴노브스크" #: dlls/tzres/tzres.rc:162 msgid "Fiji Standard Time" -msgstr "피지 표준 시간" +msgstr "피지 표준시" #: dlls/tzres/tzres.rc:163 msgid "Fiji Daylight Time" -msgstr "피지 일광 절약 시간" +msgstr "피지 일광 절약시" #: dlls/tzres/tzres.rc:164 msgid "(UTC+12:00) Fiji" -msgstr "" +msgstr "(UTC+12:00) 피지" #: dlls/tzres/tzres.rc:87 msgid "Canada Central Standard Time" -msgstr "캐나다 중부 표준 시간" +msgstr "캐나다 중부 표준시" #: dlls/tzres/tzres.rc:88 msgid "Canada Central Daylight Time" -msgstr "캐나다 중부 일광 절약 시간" +msgstr "캐나다 중부 일광 절약시" #: dlls/tzres/tzres.rc:89 msgid "(UTC-06:00) Saskatchewan" -msgstr "" +msgstr "(UTC-06:00) 서스캐처원" #: dlls/tzres/tzres.rc:441 -#, fuzzy #| msgid "Yakutsk Standard Time" msgid "Yukon Standard Time" -msgstr "야쿠츠크 표준 시간" +msgstr "유콘 표준시" #: dlls/tzres/tzres.rc:442 -#, fuzzy #| msgid "Yakutsk Daylight Time" msgid "Yukon Daylight Time" -msgstr "야쿠츠크 일광 절약 시간" +msgstr "유콘 일광 절약시" #: dlls/tzres/tzres.rc:443 msgid "(UTC-07:00) Yukon" -msgstr "" +msgstr "(UTC-07:00) 유콘" #: dlls/tzres/tzres.rc:351 msgid "Taipei Standard Time" -msgstr "타이베이 표준 시간" +msgstr "타이페이 표준시" #: dlls/tzres/tzres.rc:352 msgid "Taipei Daylight Time" -msgstr "타이베이 일광 절약 시간" +msgstr "타이페이 일광 절약시" #: dlls/tzres/tzres.rc:353 msgid "(UTC+08:00) Taipei" -msgstr "" +msgstr "(UTC+08:00) 타이페이" #: dlls/tzres/tzres.rc:423 msgid "W. Europe Standard Time" -msgstr "서유럽 표준 시간" +msgstr "서유럽 표준시" #: dlls/tzres/tzres.rc:424 msgid "W. Europe Daylight Time" -msgstr "서유럽 일광 절약 시간" +msgstr "서유럽 일광 절약시" #: dlls/tzres/tzres.rc:425 msgid "(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna" -msgstr "" +msgstr "(UTC+01:00) 암스테르담, 베를린, 베른, 로마, 스톡홀름, 빈" #: dlls/tzres/tzres.rc:231 msgid "Montevideo Standard Time" -msgstr "몬데비데오 표준 시간" +msgstr "몬테비데오 표준시" #: dlls/tzres/tzres.rc:232 msgid "Montevideo Daylight Time" -msgstr "몬데비데오 일광 절약 시간" +msgstr "몬테비데오 일광 절약시" #: dlls/tzres/tzres.rc:233 msgid "(UTC-03:00) Montevideo" -msgstr "" +msgstr "(UTC-03:00) 몬테비데오" #: dlls/tzres/tzres.rc:285 msgid "Pakistan Standard Time" -msgstr "파키스탄 표준 시간" +msgstr "파키스탄 표준시" #: dlls/tzres/tzres.rc:286 msgid "Pakistan Daylight Time" -msgstr "파키스탄 일광 절약 시간" +msgstr "파키스탄 일광 절약시" #: dlls/tzres/tzres.rc:287 msgid "(UTC+05:00) Islamabad, Karachi" -msgstr "" +msgstr "(UTC+05:00) 이슬라마바드, 카라치, 타슈켄트" #: dlls/tzres/tzres.rc:363 -#, fuzzy #| msgid "Tokyo Standard Time" msgid "Tomsk Standard Time" -msgstr "도쿄 표준 시간" +msgstr "톰스크 표준시" #: dlls/tzres/tzres.rc:364 -#, fuzzy #| msgid "Tokyo Daylight Time" msgid "Tomsk Daylight Time" -msgstr "도쿄 일광 절약 시간" +msgstr "톰스크 일광 절약시" #: dlls/tzres/tzres.rc:365 msgid "(UTC+07:00) Tomsk" -msgstr "" +msgstr "(UTC+07:00) 톰스크" #: dlls/tzres/tzres.rc:93 msgid "Caucasus Standard Time" -msgstr "코코서스 표준 시간" +msgstr "코카서스 표준시" #: dlls/tzres/tzres.rc:94 msgid "Caucasus Daylight Time" -msgstr "코코서스 일광 절약 시간" +msgstr "코카서스 일광 절약시" #: dlls/tzres/tzres.rc:95 msgid "(UTC+04:00) Yerevan" -msgstr "" +msgstr "(UTC+04:00) 예레반" #: dlls/tzres/tzres.rc:66 msgid "AUS Eastern Standard Time" -msgstr "오스트레일리아 동부 표준 시간" +msgstr "오스트레일리아 동부 표준시" #: dlls/tzres/tzres.rc:67 msgid "AUS Eastern Daylight Time" -msgstr "오스트레일리아 동부 일광 절약 시간" +msgstr "오스트레일리아 동부 일광 절약시" #: dlls/tzres/tzres.rc:68 msgid "(UTC+10:00) Canberra, Melbourne, Sydney" -msgstr "" +msgstr "(UTC+10:00) 캔버라, 멜버른, 시드니" #: dlls/tzres/tzres.rc:246 msgid "N. Central Asia Standard Time" -msgstr "중앙 아시아 북부 표준 시간" +msgstr "중앙 아시아 북부 표준시" #: dlls/tzres/tzres.rc:247 msgid "N. Central Asia Daylight Time" -msgstr "중앙 아시아 북부 일광 절약 시간" +msgstr "중앙 아시아 북부 일광 절약시" #: dlls/tzres/tzres.rc:248 msgid "(UTC+07:00) Novosibirsk" -msgstr "" +msgstr "(UTC+07:00) 노보시비르스크" #: dlls/tzres/tzres.rc:150 msgid "Eastern Standard Time" -msgstr "동부 표준 시간" +msgstr "동부 표준시" #: dlls/tzres/tzres.rc:151 msgid "Eastern Daylight Time" -msgstr "동부 일광 절약 시간" +msgstr "동부 일광 절약시" #: dlls/tzres/tzres.rc:152 msgid "(UTC-05:00) Eastern Time (US & Canada)" -msgstr "" +msgstr "(UTC-05:00) 동부 표준시 (미국과 캐나다)" #: dlls/tzres/tzres.rc:369 -#, fuzzy #| msgid "Tasmania Standard Time" msgid "Transbaikal Standard Time" -msgstr "태즈매이니아 표준 시간" +msgstr "트란스바이칼 표준시" #: dlls/tzres/tzres.rc:370 -#, fuzzy #| msgid "Tasmania Daylight Time" msgid "Transbaikal Daylight Time" -msgstr "태즈매이니아 일광 절약 시간" +msgstr "트란스바이칼 일광 절약시" #: dlls/tzres/tzres.rc:371 msgid "(UTC+09:00) Chita" -msgstr "" +msgstr "(UTC+09:00) 치타" #: dlls/tzres/tzres.rc:141 -#, fuzzy #| msgid "W. Europe Standard Time" msgid "E. Europe Standard Time" -msgstr "서유럽 표준 시간" +msgstr "동유럽 표준시" #: dlls/tzres/tzres.rc:142 -#, fuzzy #| msgid "W. Europe Daylight Time" msgid "E. Europe Daylight Time" -msgstr "서유럽 일광 절약 시간" +msgstr "동유럽 일광 절약시" #: dlls/tzres/tzres.rc:143 msgid "(UTC+02:00) Chisinau" -msgstr "" +msgstr "(UTC+02:00) 키시네프" #: dlls/tzres/tzres.rc:120 msgid "Central Standard Time (Mexico)" -msgstr "중부 표준 시간 (멕시코)" +msgstr "중부 표준시 (멕시코)" #: dlls/tzres/tzres.rc:121 msgid "Central Daylight Time (Mexico)" -msgstr "중부 일광 절약 시간 (멕시코)" +msgstr "중부 일광 절약시 (멕시코)" #: dlls/tzres/tzres.rc:122 msgid "(UTC-06:00) Guadalajara, Mexico City, Monterrey" -msgstr "" +msgstr "(UTC-06:00) 과달라하라, 멕시코시티, 몬테레이" #: dlls/tzres/tzres.rc:330 -#, fuzzy #| msgid "Samoa Standard Time" msgid "Saratov Standard Time" -msgstr "사모아 표준 시간" +msgstr "사라토브 표준시" #: dlls/tzres/tzres.rc:331 -#, fuzzy #| msgid "Samoa Daylight Time" msgid "Saratov Daylight Time" -msgstr "사모아 일광 절약 시간" +msgstr "사라토브 일광 절약시" #: dlls/tzres/tzres.rc:332 msgid "(UTC+04:00) Saratov" -msgstr "" +msgstr "(UTC+04:00) 사라토브" #: dlls/tzres/tzres.rc:57 msgid "Atlantic Standard Time" -msgstr "대서양 표준 시간" +msgstr "대서양 표준시" #: dlls/tzres/tzres.rc:58 msgid "Atlantic Daylight Time" -msgstr "대서양 일광 절약 시간" +msgstr "대서양 일광 절약시" #: dlls/tzres/tzres.rc:59 msgid "(UTC-04:00) Atlantic Time (Canada)" -msgstr "" +msgstr "(UTC-04:00) 대서양 표준시 (캐나다)" #: dlls/tzres/tzres.rc:237 msgid "Mountain Standard Time" -msgstr "산지 표준 시간" +msgstr "산지 표준시" #: dlls/tzres/tzres.rc:238 msgid "Mountain Daylight Time" -msgstr "산지 일광 절약 시간" +msgstr "산지 일광 절약시" #: dlls/tzres/tzres.rc:239 msgid "(UTC-07:00) Mountain Time (US & Canada)" -msgstr "" +msgstr "(UTC-07:00) 산지 표준시 (미국과 캐나다)" #: dlls/tzres/tzres.rc:381 msgid "US Eastern Standard Time" -msgstr "미국 동부 표준 시간" +msgstr "미국 동부 표준시" #: dlls/tzres/tzres.rc:382 msgid "US Eastern Daylight Time" -msgstr "미국 동부 일광 절약 시간" +msgstr "미국 동부 일광 절약시" #: dlls/tzres/tzres.rc:383 msgid "(UTC-05:00) Indiana (East)" -msgstr "" +msgstr "(UTC-05:00) 인디애나 (동부)" #: dlls/tzres/tzres.rc:321 -#, fuzzy #| msgid "Alaskan Standard Time" msgid "Sakhalin Standard Time" -msgstr "알래스카 표준 시간" +msgstr "사할린 표준시" #: dlls/tzres/tzres.rc:322 -#, fuzzy #| msgid "Alaskan Daylight Time" msgid "Sakhalin Daylight Time" -msgstr "알래스카 일광 절약 시간" +msgstr "사할린 일광 절약시" #: dlls/tzres/tzres.rc:323 msgid "(UTC+11:00) Sakhalin" -msgstr "" +msgstr "(UTC+11:00) 사할린" #: dlls/tzres/tzres.rc:270 msgid "North Korea Standard Time" -msgstr "북한 표준 시간" +msgstr "북한 표준시" #: dlls/tzres/tzres.rc:271 msgid "North Korea Daylight Time" -msgstr "북한 일광 절약 시간" +msgstr "북한 일광 절약시" #: dlls/tzres/tzres.rc:272 msgid "(UTC+09:00) Pyongyang" -msgstr "" +msgstr "(UTC+09:00) 평양" #: dlls/tzres/tzres.rc:354 msgid "Tasmania Standard Time" -msgstr "태즈매이니아 표준 시간" +msgstr "태즈매이니아 표준시" #: dlls/tzres/tzres.rc:355 msgid "Tasmania Daylight Time" -msgstr "태즈매이니아 일광 절약 시간" +msgstr "태즈매이니아 일광 절약시" #: dlls/tzres/tzres.rc:356 msgid "(UTC+10:00) Hobart" -msgstr "" +msgstr "(UTC+10:00) 호바트" #: dlls/tzres/tzres.rc:99 msgid "Central America Standard Time" -msgstr "중앙 아메리카 표준 시간" +msgstr "중앙 아메리카 표준시" #: dlls/tzres/tzres.rc:100 msgid "Central America Daylight Time" -msgstr "중앙 아메리카 일광 절약 시간" +msgstr "중앙 아메리카 일광 절약시" #: dlls/tzres/tzres.rc:101 msgid "(UTC-06:00) Central America" -msgstr "" +msgstr "(UTC-06:00) 중앙아메리카" #: dlls/tzres/tzres.rc:396 dlls/tzres/tzres.rc:397 msgid "UTC-02" -msgstr "" +msgstr "UTC-02" #: dlls/tzres/tzres.rc:398 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-02:00) Coordinated Universal Time-02" -msgstr "협정 세계시" +msgstr "(UTC-02:00) 협정 세계시-02" #: dlls/tzres/tzres.rc:384 msgid "US Mountain Standard Time" -msgstr "미국 산지 표준 시간" +msgstr "미국 산지 표준시" #: dlls/tzres/tzres.rc:385 msgid "US Mountain Daylight Time" -msgstr "미국 산지 일광 절약 시간" +msgstr "미국 산지 일광 절약시" #: dlls/tzres/tzres.rc:386 msgid "(UTC-07:00) Arizona" -msgstr "" +msgstr "(UTC-07:00) 아리조나" #: dlls/tzres/tzres.rc:339 msgid "South Africa Standard Time" -msgstr "남아프리카 표준 시간" +msgstr "남아프리카 표준시" #: dlls/tzres/tzres.rc:340 msgid "South Africa Daylight Time" -msgstr "남아프리카 일광 절약 시간" +msgstr "남아프리카 일광 절약시" #: dlls/tzres/tzres.rc:341 msgid "(UTC+02:00) Harare, Pretoria" -msgstr "" +msgstr "(UTC+02:00) 하라레, 프리토리아" #: dlls/tzres/tzres.rc:96 msgid "Cen. Australia Standard Time" -msgstr "중부 오스트레일리아 표준 시간" +msgstr "중부 오스트레일리아 표준시" #: dlls/tzres/tzres.rc:97 msgid "Cen. Australia Daylight Time" -msgstr "중부 오스트레일리아 일광 절약 시간" +msgstr "중부 오스트레일리아 일광 절약시" #: dlls/tzres/tzres.rc:98 msgid "(UTC+09:30) Adelaide" -msgstr "" +msgstr "(UTC+09:30) 애들레이드" #: dlls/tzres/tzres.rc:402 dlls/tzres/tzres.rc:403 msgid "UTC-09" -msgstr "" +msgstr "UTC-09" #: dlls/tzres/tzres.rc:404 -#, fuzzy #| msgid "Coordinated Universal Time" msgid "(UTC-09:00) Coordinated Universal Time-09" -msgstr "협정 세계시" +msgstr "(UTC-09:00) 협정 세계시-09" #: dlls/tzres/tzres.rc:342 msgid "Sri Lanka Standard Time" -msgstr "스리랑카 표준 시간" +msgstr "스리랑카 표준시" #: dlls/tzres/tzres.rc:343 msgid "Sri Lanka Daylight Time" -msgstr "스리랑카 일광 절약 시간" +msgstr "스리랑카 일광 절약시" #: dlls/tzres/tzres.rc:344 msgid "(UTC+05:30) Sri Jayawardenepura" -msgstr "" +msgstr "(UTC+05:30) 스리자야와르데네푸라" #: dlls/tzres/tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "아프가니스탄 표준 시간" +msgstr "아프가니스탄 표준시" #: dlls/tzres/tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "아프가니스탄 일광 절약 시간" +msgstr "아프가니스탄 일광 절약시" #: dlls/tzres/tzres.rc:32 msgid "(UTC+04:30) Kabul" -msgstr "" +msgstr "(UTC+04:30) 카불" #: dlls/tzres/tzres.rc:438 msgid "Yakutsk Standard Time" -msgstr "야쿠츠크 표준 시간" +msgstr "야쿠츠크 표준시" #: dlls/tzres/tzres.rc:439 msgid "Yakutsk Daylight Time" -msgstr "야쿠츠크 일광 절약 시간" +msgstr "야쿠츠크 일광 절약시" #: dlls/tzres/tzres.rc:440 msgid "(UTC+09:00) Yakutsk" -msgstr "" +msgstr "(UTC+09:00) 야쿠츠크" #: dlls/tzres/tzres.rc:309 msgid "SA Eastern Standard Time" -msgstr "SA 동부 표준 시간" +msgstr "SA 동부 표준시" #: dlls/tzres/tzres.rc:310 msgid "SA Eastern Daylight Time" -msgstr "SA 동부 일광 절약 시간" +msgstr "SA 동부 일광 절약시" #: dlls/tzres/tzres.rc:311 msgid "(UTC-03:00) Cayenne, Fortaleza" -msgstr "" +msgstr "(UTC-03:00) 카옌, 포르탈레자" #: dlls/tzres/tzres.rc:42 msgid "Arab Standard Time" -msgstr "아랍 표준 시간" +msgstr "아랍 표준시" #: dlls/tzres/tzres.rc:43 msgid "Arab Daylight Time" -msgstr "아랍 일광 절약 시간" +msgstr "아랍 일광 절약시" #: dlls/tzres/tzres.rc:44 msgid "(UTC+03:00) Kuwait, Riyadh" -msgstr "" +msgstr "(UTC+03:00) 쿠웨이트, 리야드" #: dlls/tzres/tzres.rc:45 msgid "Arabian Standard Time" -msgstr "아라비아 표준 시간" +msgstr "아라비아 표준시" #: dlls/tzres/tzres.rc:46 msgid "Arabian Daylight Time" -msgstr "아라비아 일광 절약 시간" +msgstr "아라비아 일광 절약시" #: dlls/tzres/tzres.rc:47 msgid "(UTC+04:00) Abu Dhabi, Muscat" -msgstr "" +msgstr "(UTC+04:00) 아부다비, 무스카트" #: dlls/tzres/tzres.rc:357 msgid "Tocantins Standard Time" -msgstr "토칸칭스 표준 시간" +msgstr "토칸칭스 표준시" #: dlls/tzres/tzres.rc:358 msgid "Tocantins Daylight Time" -msgstr "토칸칭스 일광 절약 시간" +msgstr "토칸칭스 일광 절약시" #: dlls/tzres/tzres.rc:359 msgid "(UTC-03:00) Araguaina" -msgstr "" +msgstr "(UTC-03:00) 아라구아이나" #: dlls/tzres/tzres.rc:306 msgid "Russian Standard Time" -msgstr "러시아 표준 시간" +msgstr "러시아 표준시" #: dlls/tzres/tzres.rc:307 msgid "Russian Daylight Time" -msgstr "러시아 일광 절약 시간" +msgstr "러시아 일광 절약시" #: dlls/tzres/tzres.rc:308 msgid "(UTC+03:00) Moscow, St. Petersburg" -msgstr "" +msgstr "(UTC+03:00) 모스크바, 상트페테르부르크" #: dlls/tzres/tzres.rc:63 msgid "Aus Central W. Standard Time" -msgstr "오스트레일리아 중부 표준 시간" +msgstr "오스트레일리아 중부 표준시" #: dlls/tzres/tzres.rc:64 msgid "Aus Central W. Daylight Time" -msgstr "오스트레일리아 중부 일광 절약 시간" +msgstr "오스트레일리아 중부 일광 절약시" #: dlls/tzres/tzres.rc:65 msgid "(UTC+08:45) Eucla" -msgstr "" +msgstr "(UTC+08:45) 유클라" #: dlls/tzres/tzres.rc:294 msgid "Romance Standard Time" -msgstr "로망스 표준 시간" +msgstr "로망스 표준시" #: dlls/tzres/tzres.rc:295 msgid "Romance Daylight Time" -msgstr "로망스 일광 절약 시간" +msgstr "로망스 일광 절약시" #: dlls/tzres/tzres.rc:296 msgid "(UTC+01:00) Brussels, Copenhagen, Madrid, Paris" -msgstr "" +msgstr "(UTC+01:00) 브뤼셀, 코펜하겐, 마드리드, 파리" #: dlls/tzres/tzres.rc:159 msgid "Ekaterinburg Standard Time" -msgstr "예카테린부르크 표준 시간" +msgstr "예카테린부르크 표준시" #: dlls/tzres/tzres.rc:160 msgid "Ekaterinburg Daylight Time" -msgstr "예카테린부르크 일광 절약 시간" +msgstr "예카테린부르크 일광 절약시" #: dlls/tzres/tzres.rc:161 msgid "(UTC+05:00) Ekaterinburg" -msgstr "" +msgstr "(UTC+05:00) 예카테린부르크" #: dlls/tzres/tzres.rc:300 dlls/tzres/tzres.rc:301 msgid "Russia Time Zone 11" -msgstr "" +msgstr "러시아 표준 시간대 11" #: dlls/tzres/tzres.rc:302 msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" -msgstr "" +msgstr "(UTC+12:00) 아나디리, 페트로파블로프스크-캄차스키" #: dlls/tzres/tzres.rc:432 -#, fuzzy #| msgid "West Asia Standard Time" msgid "West Bank Standard Time" -msgstr "서아시아 표준 시간" +msgstr "웨스트 뱅크 표준시" #: dlls/tzres/tzres.rc:433 -#, fuzzy #| msgid "West Asia Daylight Time" msgid "West Bank Daylight Time" -msgstr "서아시아 일광 절약 시간" +msgstr "웨스트 뱅크 일광 절약시" #: dlls/tzres/tzres.rc:434 msgid "(UTC+02:00) Gaza, Hebron" -msgstr "" +msgstr "(UTC+02:00) 가자, 헤브론" #: dlls/tzres/tzres.rc:348 msgid "Syria Standard Time" -msgstr "시리아 표준 시간" +msgstr "시리아 표준시" #: dlls/tzres/tzres.rc:349 msgid "Syria Daylight Time" -msgstr "시리아 일광 절약 시간" +msgstr "시리아 일광 절약시" #: dlls/tzres/tzres.rc:350 msgid "(UTC+02:00) Damascus" -msgstr "" +msgstr "(UTC+02:00) 다마스커스" #: dlls/tzres/tzres.rc:60 msgid "AUS Central Standard Time" -msgstr "오스트레일리아 중부 표준 시간" +msgstr "오스트레일리아 중부 표준시" #: dlls/tzres/tzres.rc:61 msgid "AUS Central Daylight Time" -msgstr "오스트레일리아 중부 일광 절약 시간" +msgstr "오스트레일리아 중부 일광 절약시" #: dlls/tzres/tzres.rc:62 msgid "(UTC+09:30) Darwin" -msgstr "" +msgstr "(UTC+09:30) 다윈" #: dlls/tzres/tzres.rc:177 msgid "Greenwich Standard Time" -msgstr "그리니치 표준 시간" +msgstr "그리니치 표준시" #: dlls/tzres/tzres.rc:178 msgid "Greenwich Daylight Time" -msgstr "그리니치 일광 절약 시간" +msgstr "그리니치 일광 절약시" #: dlls/tzres/tzres.rc:179 msgid "(UTC+00:00) Monrovia, Reykjavik" -msgstr "" +msgstr "(UTC+00:00) 몬로비아, 레이캬비크" #: dlls/tzres/tzres.rc:378 msgid "Ulaanbaatar Standard Time" -msgstr "울란바토르 표준 시간" +msgstr "울란바토르 표준시" #: dlls/tzres/tzres.rc:379 msgid "Ulaanbaatar Daylight Time" -msgstr "울란바토르 일광 절약 시간" +msgstr "울란바토르 일광 절약시" #: dlls/tzres/tzres.rc:380 msgid "(UTC+08:00) Ulaanbaatar" -msgstr "" +msgstr "(UTC+08:00) 울란바토르" #: dlls/tzres/tzres.rc:261 -#, fuzzy #| msgid "Morocco Standard Time" msgid "Norfolk Standard Time" -msgstr "모로코 표준 시간" +msgstr "노퍽 표준시" #: dlls/tzres/tzres.rc:262 -#, fuzzy #| msgid "Morocco Daylight Time" msgid "Norfolk Daylight Time" -msgstr "모로코 일광 절약 시간" +msgstr "노퍽 일광 절약시" #: dlls/tzres/tzres.rc:263 msgid "(UTC+11:00) Norfolk Island" -msgstr "" +msgstr "(UTC+11:00) 노퍽 섬" #: dlls/tzres/tzres.rc:195 msgid "Israel Standard Time" -msgstr "이스라엘 표준 시간" +msgstr "이스라엘 표준시" #: dlls/tzres/tzres.rc:196 msgid "Israel Daylight Time" -msgstr "이스라엘 일광 절약 시간" +msgstr "이스라엘 일광 절약시" #: dlls/tzres/tzres.rc:197 msgid "(UTC+02:00) Jerusalem" -msgstr "" +msgstr "(UTC+02:00) 예루살렘" #: dlls/tzres/tzres.rc:78 msgid "Bangladesh Standard Time" -msgstr "발글라데시 표준 시간" +msgstr "발글라데시 표준시" #: dlls/tzres/tzres.rc:79 msgid "Bangladesh Daylight Time" -msgstr "방글라데시 일광 절약 시간" +msgstr "방글라데시 일광 절약시" #: dlls/tzres/tzres.rc:80 msgid "(UTC+06:00) Dhaka" -msgstr "" +msgstr "(UTC+06:00) 다카" #: dlls/tzres/tzres.rc:312 msgid "SA Pacific Standard Time" -msgstr "SA 태평양 표준 시간" +msgstr "SA 태평양 표준시" #: dlls/tzres/tzres.rc:313 msgid "SA Pacific Daylight Time" -msgstr "SA 태평양 일광 절약 시간" +msgstr "SA 태평양 일광 절약시" #: dlls/tzres/tzres.rc:314 msgid "(UTC-05:00) Bogota, Lima, Quito, Rio Branco" -msgstr "" +msgstr "(UTC-05:00) 보고타, 리마, 키토, 리오 브랑코" #: dlls/tzres/tzres.rc:429 msgid "West Asia Standard Time" -msgstr "서아시아 표준 시간" +msgstr "서아시아 표준시" #: dlls/tzres/tzres.rc:430 msgid "West Asia Daylight Time" -msgstr "서아시아 일광 절약 시간" +msgstr "서아시아 일광 절약시" #: dlls/tzres/tzres.rc:431 msgid "(UTC+05:00) Ashgabat, Tashkent" -msgstr "" +msgstr "(UTC+05:00) 아슈하바트, 타슈켄트" #: dlls/tzres/tzres.rc:33 msgid "Alaskan Standard Time" -msgstr "알래스카 표준 시간" +msgstr "알래스카 표준시" #: dlls/tzres/tzres.rc:34 msgid "Alaskan Daylight Time" -msgstr "알래스카 일광 절약 시간" +msgstr "알래스카 일광 절약시" #: dlls/tzres/tzres.rc:35 msgid "(UTC-09:00) Alaska" -msgstr "" +msgstr "(UTC-09:00) 알래스카" #: dlls/tzres/tzres.rc:288 msgid "Paraguay Standard Time" -msgstr "파라과이 표준 시간" +msgstr "파라과이 표준시" #: dlls/tzres/tzres.rc:289 msgid "Paraguay Daylight Time" -msgstr "파라과이 일광 절약 시간" +msgstr "파라과이 일광 절약시" #: dlls/tzres/tzres.rc:290 msgid "(UTC-04:00) Asuncion" -msgstr "" +msgstr "(UTC-04:00) 아순시온" #: dlls/tzres/tzres.rc:132 msgid "Dateline Standard Time" -msgstr "날짜 변경선 표준 시간" +msgstr "날짜 변경선 표준시" #: dlls/tzres/tzres.rc:133 msgid "Dateline Daylight Time" -msgstr "날짜 변경선 일광 절약 시간" +msgstr "날짜 변경선 일광 절약시" #: dlls/tzres/tzres.rc:134 msgid "(UTC-12:00) International Date Line West" -msgstr "" +msgstr "(UTC-12:00) 날짜 변경선 서쪽" #: dlls/tzres/tzres.rc:207 msgid "Libya Standard Time" -msgstr "리비아 표준 시간" +msgstr "리비아 표준시" #: dlls/tzres/tzres.rc:208 msgid "Libya Daylight Time" -msgstr "리비아 일광 절약 시간" +msgstr "리비아 일광 절약시" #: dlls/tzres/tzres.rc:209 msgid "(UTC+02:00) Tripoli" -msgstr "" +msgstr "(UTC+02:00) 트리폴리" #: dlls/tzres/tzres.rc:75 msgid "Bahia Standard Time" -msgstr "바이아 표준 시간" +msgstr "바이아 표준시" #: dlls/tzres/tzres.rc:76 msgid "Bahia Daylight Time" -msgstr "바이아 일광 절약 시간" +msgstr "바이아 일광 절약시" #: dlls/tzres/tzres.rc:77 msgid "(UTC-03:00) Salvador" -msgstr "" +msgstr "(UTC-03:00) 살바도르" #: dlls/tzres/tzres.rc:408 msgid "Venezuela Standard Time" -msgstr "베네수엘라 표준 시간" +msgstr "베네수엘라 표준시" #: dlls/tzres/tzres.rc:409 msgid "Venezuela Daylight Time" -msgstr "베네수엘라 일광 절약 시간" +msgstr "베네수엘라 일광 절약시" #: dlls/tzres/tzres.rc:410 msgid "(UTC-04:00) Caracas" -msgstr "" +msgstr "(UTC-04:00) 카라카스" #: dlls/tzres/tzres.rc:84 msgid "Bougainville Standard Time" -msgstr "부건빌 표준 시간" +msgstr "부건빌 표준시" #: dlls/tzres/tzres.rc:85 msgid "Bougainville Daylight Time" -msgstr "부건빌 일광 절약 시간" +msgstr "부건빌 일광 절약시" #: dlls/tzres/tzres.rc:86 msgid "(UTC+11:00) Bougainville Island" -msgstr "" +msgstr "(UTC+11:00) 부건빌 섬" #: dlls/tzres/tzres.rc:186 msgid "Hawaiian Standard Time" -msgstr "하와이 표준 시간" +msgstr "하와이 표준시" #: dlls/tzres/tzres.rc:187 msgid "Hawaiian Daylight Time" -msgstr "하와이 일광 절약 시간" +msgstr "하와이 일광 절약시" #: dlls/tzres/tzres.rc:188 msgid "(UTC-10:00) Hawaii" -msgstr "" +msgstr "(UTC-10:00) 하와이" #: dlls/tzres/tzres.rc:333 msgid "SE Asia Standard Time" -msgstr "동남 아시아 표준 시간" +msgstr "동남 아시아 표준시" #: dlls/tzres/tzres.rc:334 msgid "SE Asia Daylight Time" -msgstr "동남 아시아 일광 절약 시간" +msgstr "동남 아시아 일광 절약시" #: dlls/tzres/tzres.rc:335 msgid "(UTC+07:00) Bangkok, Hanoi, Jakarta" -msgstr "" +msgstr "(UTC+07:00) 방콕, 하노이, 자카르타" #: dlls/tzres/tzres.rc:291 -#, fuzzy #| msgid "Jordan Standard Time" msgid "Qyzylorda Standard Time" -msgstr "요르단 표준 시간" +msgstr "키질로르다 표준시" #: dlls/tzres/tzres.rc:292 -#, fuzzy #| msgid "Jordan Daylight Time" msgid "Qyzylorda Daylight Time" -msgstr "요르단 일광 절약 시간" +msgstr "키질로르다 일광 절약시" #: dlls/tzres/tzres.rc:293 msgid "(UTC+05:00) Qyzylorda" -msgstr "" +msgstr "(UTC+05:00) 키질로르다" #: dlls/tzres/tzres.rc:426 -#, fuzzy #| msgid "Tonga Standard Time" msgid "W. Mongolia Standard Time" -msgstr "통가 표준 시간" +msgstr "서몽골 표준시" #: dlls/tzres/tzres.rc:427 -#, fuzzy #| msgid "Tonga Daylight Time" msgid "W. Mongolia Daylight Time" -msgstr "통가 일괄 절약 시간" +msgstr "서몽골 일광 절약시" #: dlls/tzres/tzres.rc:428 msgid "(UTC+07:00) Hovd" -msgstr "" +msgstr "(UTC+07:00) 호브드" #: dlls/tzres/tzres.rc:255 msgid "New Zealand Standard Time" -msgstr "뉴질랜드 표준 시간" +msgstr "뉴질랜드 표준시" #: dlls/tzres/tzres.rc:256 msgid "New Zealand Daylight Time" -msgstr "뉴질랜드 일광 절약 시간" +msgstr "뉴질랜드 일광 절약시" #: dlls/tzres/tzres.rc:257 msgid "(UTC+12:00) Auckland, Wellington" -msgstr "" +msgstr "(UTC+12:00) 오클랜드, 웰링턴" #: dlls/tzres/tzres.rc:36 msgid "Aleutian Standard Time" -msgstr "알류샨 표준 시간" +msgstr "알류샨 표준시" #: dlls/tzres/tzres.rc:37 msgid "Aleutian Daylight Time" -msgstr "알류샨 일광 절약 시간" +msgstr "알류샨 일광 절약시" #: dlls/tzres/tzres.rc:38 msgid "(UTC-10:00) Aleutian Islands" -msgstr "" +msgstr "(UTC-10:00) 알류샨 열도" #: dlls/tzres/tzres.rc:273 -#, fuzzy #| msgid "Yakutsk Standard Time" msgid "Omsk Standard Time" -msgstr "야쿠츠크 표준 시간" +msgstr "옴스크 표준시" #: dlls/tzres/tzres.rc:274 -#, fuzzy #| msgid "Yakutsk Daylight Time" msgid "Omsk Daylight Time" -msgstr "야쿠츠크 일광 절약 시간" +msgstr "옴스크 일광 절약시" #: dlls/tzres/tzres.rc:275 msgid "(UTC+06:00) Omsk" -msgstr "" +msgstr "(UTC+06:00) 옴스크" #: dlls/tzres/tzres.rc:105 msgid "Central Brazilian Standard Time" -msgstr "브라질 중부 표준 시간" +msgstr "브라질 중부 표준시" #: dlls/tzres/tzres.rc:106 msgid "Central Brazilian Daylight Time" -msgstr "브라질 중부 일광 절약 시간" +msgstr "브라질 중부 일광 절약시" #: dlls/tzres/tzres.rc:107 msgid "(UTC-04:00) Cuiaba" -msgstr "" +msgstr "(UTC-04:00) 쿠이아바" #: dlls/tzres/tzres.rc:81 msgid "Belarus Standard Time" -msgstr "벨로루시 표준 시간" +msgstr "벨로루시 표준시" #: dlls/tzres/tzres.rc:82 msgid "Belarus Daylight Time" -msgstr "벨로루시 표준 시간" +msgstr "벨로루시 표준시" #: dlls/tzres/tzres.rc:83 msgid "(UTC+03:00) Minsk" -msgstr "" +msgstr "(UTC+03:00) 민스크" #: dlls/tzres/tzres.rc:315 msgid "SA Western Standard Time" -msgstr "SA 서부 표준 시간" +msgstr "SA 서부 표준시" #: dlls/tzres/tzres.rc:316 msgid "SA Western Daylight Time" -msgstr "SA 서부 일광 절약 시간" +msgstr "SA 서부 일광 절약시" #: dlls/tzres/tzres.rc:317 msgid "(UTC-04:00) Georgetown, La Paz, Manaus, San Juan" -msgstr "" +msgstr "(UTC-04:00) 조지타운, 라파스, 마노스, 산후안" #: dlls/tzres/tzres.rc:174 msgid "Greenland Standard Time" -msgstr "그린란드 표준 시간" +msgstr "그린란드 표준시" #: dlls/tzres/tzres.rc:175 msgid "Greenland Daylight Time" -msgstr "그린란드 일광 절약 시간" +msgstr "그린란드 일광 절약시" #: dlls/tzres/tzres.rc:176 msgid "(UTC-03:00) Greenland" -msgstr "" +msgstr "(UTC-03:00) 그린란드" #: dlls/tzres/tzres.rc:147 msgid "Easter Island Standard Time" -msgstr "이스터 섬 표준 시간" +msgstr "이스터 섬 표준시" #: dlls/tzres/tzres.rc:148 msgid "Easter Island Daylight Time" -msgstr "이스터 섬 일광 절약 시간" +msgstr "이스터 섬 일광 절약시" #: dlls/tzres/tzres.rc:149 msgid "(UTC-06:00) Easter Island" -msgstr "" +msgstr "(UTC-06:00) 이스터 섬" #: dlls/tzres/tzres.rc:297 dlls/tzres/tzres.rc:298 msgid "Russia Time Zone 10" -msgstr "" +msgstr "러시아 표준 시간대 10" #: dlls/tzres/tzres.rc:299 msgid "(UTC+11:00) Chokurdakh" -msgstr "" +msgstr "(UTC+11:00) 초쿠르다흐" #: dlls/tzres/tzres.rc:156 msgid "Egypt Standard Time" -msgstr "이집트 표준 시간" +msgstr "이집트 표준시" #: dlls/tzres/tzres.rc:157 msgid "Egypt Daylight Time" -msgstr "이집트 일광 절약 시간" +msgstr "이집트 일광 절약시" #: dlls/tzres/tzres.rc:158 msgid "(UTC+02:00) Cairo" -msgstr "" +msgstr "(UTC+02:00) 카이로" #: dlls/tzres/tzres.rc:153 msgid "Eastern Standard Time (Mexico)" -msgstr "동부 표준 시간 (멕시코)" +msgstr "동부 표준시 (멕시코)" #: dlls/tzres/tzres.rc:154 msgid "Eastern Daylight Time (Mexico)" -msgstr "동부 일광 절약 시간 (멕시코)" +msgstr "동부 일광 절약시 (멕시코)" #: dlls/tzres/tzres.rc:155 msgid "(UTC-05:00) Chetumal" -msgstr "" +msgstr "(UTC-05:00) 체투말" #: dlls/tzres/tzres.rc:225 msgid "Mauritius Standard Time" -msgstr "모리셔스 표준 시간" +msgstr "모리셔스 표준시" #: dlls/tzres/tzres.rc:226 msgid "Mauritius Daylight Time" -msgstr "모리셔스 일광 절약 시간" +msgstr "모리셔스 일광 절약시" #: dlls/tzres/tzres.rc:227 msgid "(UTC+04:00) Port Louis" -msgstr "" +msgstr "(UTC+04:00) 포트루이스" #: dlls/tzres/tzres.rc:411 msgid "Vladivostok Standard Time" -msgstr "블라디보스토크 표준 시간" +msgstr "블라디보스토크 표준시" #: dlls/tzres/tzres.rc:412 msgid "Vladivostok Daylight Time" -msgstr "블라디보스토크 일광 절약 시간" +msgstr "블라디보스토크 일광 절약시" #: dlls/tzres/tzres.rc:413 msgid "(UTC+10:00) Vladivostok" -msgstr "" +msgstr "(UTC+10:00) 블라디보스토크" #: dlls/tzres/tzres.rc:336 msgid "Singapore Standard Time" -msgstr "싱가포르 표준 시간" +msgstr "싱가포르 표준시" #: dlls/tzres/tzres.rc:337 msgid "Singapore Daylight Time" -msgstr "싱가포르 일광 절약 시간" +msgstr "싱가포르 일광 절약시" #: dlls/tzres/tzres.rc:338 msgid "(UTC+08:00) Kuala Lumpur, Singapore" -msgstr "" +msgstr "(UTC+08:00) 콸라룸푸르, 싱가포르" #: dlls/tzres/tzres.rc:204 msgid "Korea Standard Time" -msgstr "대한민국 표준 시간" +msgstr "대한민국 표준시" #: dlls/tzres/tzres.rc:205 msgid "Korea Daylight Time" -msgstr "대한민국 일광 절약 시간" +msgstr "대한민국 일광 절약시" #: dlls/tzres/tzres.rc:206 msgid "(UTC+09:00) Seoul" -msgstr "" +msgstr "(UTC+09:00) 서울" #: dlls/tzres/tzres.rc:123 msgid "Chatham Islands Standard Time" -msgstr "채텀 섬 표준 시간" +msgstr "채텀 섬 표준시" #: dlls/tzres/tzres.rc:124 msgid "Chatham Islands Daylight Time" -msgstr "채텀 섬 일광 절약 시간" +msgstr "채텀 섬 일광 절약시" #: dlls/tzres/tzres.rc:125 msgid "(UTC+12:45) Chatham Islands" -msgstr "" +msgstr "(UTC+12:45) 채텀 제도" #: dlls/tzres/tzres.rc:135 msgid "E. Africa Standard Time" -msgstr "동아프리카 표준 시간" +msgstr "동아프리카 표준시" #: dlls/tzres/tzres.rc:136 msgid "E. Africa Daylight Time" -msgstr "동아프리카 일광 절약 시간" +msgstr "동아프리카 일광 절약시" #: dlls/tzres/tzres.rc:137 msgid "(UTC+03:00) Nairobi" -msgstr "" +msgstr "(UTC+03:00) 나이로비" #: dlls/tzres/tzres.rc:165 msgid "FLE Standard Time" -msgstr "FLE 표준 시간" +msgstr "FLE 표준시" #: dlls/tzres/tzres.rc:166 msgid "FLE Daylight Time" -msgstr "FLE 일광 절약 시간" +msgstr "FLE 일광 절약시" #: dlls/tzres/tzres.rc:167 msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" -msgstr "" +msgstr "(UTC+02:00) 헬싱키, 키예프, 리가, 소피아, 탈린, 빌뉴스" #: dlls/tzres/tzres.rc:144 msgid "E. South America Standard Time" -msgstr "남아메리카 동부 표준 시간" +msgstr "남아메리카 동부 표준시" #: dlls/tzres/tzres.rc:145 msgid "E. South America Daylight Time" -msgstr "남아메리카 동부 일광 절약 시간" +msgstr "남아메리카 동부 일광 절약시" #: dlls/tzres/tzres.rc:146 msgid "(UTC-03:00) Brasilia" -msgstr "" +msgstr "(UTC-03:00) 브라질리아" #: dlls/tzres/tzres.rc:114 msgid "Central Pacific Standard Time" -msgstr "중앙 태평양 표준 시간" +msgstr "중앙 태평양 표준시" #: dlls/tzres/tzres.rc:115 msgid "Central Pacific Daylight Time" -msgstr "중앙 태평양 일광 절약 시간" +msgstr "중앙 태평양 일광 절약시" #: dlls/tzres/tzres.rc:116 msgid "(UTC+11:00) Solomon Is., New Caledonia" -msgstr "" +msgstr "(UTC+11:00) 마가단, 솔로몬 제도, 뉴칼레도니아" #: dlls/tzres/tzres.rc:420 msgid "W. Central Africa Standard Time" -msgstr "중앙아프리카 서부 표준 시간" +msgstr "중앙아프리카 서부 표준시" #: dlls/tzres/tzres.rc:421 msgid "W. Central Africa Daylight Time" -msgstr "중앙아프리카 서부 일광 절약 시간" +msgstr "중앙아프리카 서부 일광 절약시" #: dlls/tzres/tzres.rc:422 msgid "(UTC+01:00) West Central Africa" -msgstr "" +msgstr "(UTC+01:00) 서중앙 아프리카" #: dlls/tzres/tzres.rc:276 msgid "Pacific SA Standard Time" -msgstr "태평양 SA 표준 시간" +msgstr "태평양 SA 표준시" #: dlls/tzres/tzres.rc:277 msgid "Pacific SA Daylight Time" -msgstr "태평양 SA 일광 절약 시간" +msgstr "태평양 SA 일광 절약시" #: dlls/tzres/tzres.rc:278 msgid "(UTC-04:00) Santiago" -msgstr "" +msgstr "(UTC-04:00) 산티아고" #: dlls/tzres/tzres.rc:138 msgid "E. Australia Standard Time" -msgstr "오스트레일리아 동부 표준 시간" +msgstr "오스트레일리아 동부 표준시" #: dlls/tzres/tzres.rc:139 msgid "E. Australia Daylight Time" -msgstr "오스트레일리아 동부 일광 절약 시간" +msgstr "오스트레일리아 동부 일광 절약시" #: dlls/tzres/tzres.rc:140 msgid "(UTC+10:00) Brisbane" -msgstr "" +msgstr "(UTC+10:00) 브리즈번" #: dlls/tzres/tzres.rc:417 msgid "W. Australia Standard Time" -msgstr "오스트레일리아 서부 표준 시간" +msgstr "오스트레일리아 서부 표준시" #: dlls/tzres/tzres.rc:418 msgid "W. Australia Daylight Time" -msgstr "오스트레일리아 서부 일광 절약 시간" +msgstr "오스트레일리아 서부 일광 절약시" #: dlls/tzres/tzres.rc:419 msgid "(UTC+08:00) Perth" -msgstr "" +msgstr "(UTC+08:00) 퍼스" #: dlls/urlmon/urlmon.rc:32 dlls/wininet/wininet.rc:88 msgid "Security Warning" @@ -14296,7 +14205,7 @@ msgstr "색상(&C)" #: programs/conhost/conhost.rc:92 msgid "Configuration" -msgstr "설정" +msgstr "구성" #: programs/conhost/conhost.rc:95 msgid "Buffer zone" @@ -14382,7 +14291,7 @@ msgstr "설치 - 현재 설정" #: programs/conhost/conhost.rc:45 msgid "Configuration error" -msgstr "설정 오류" +msgstr "구성 오류" #: programs/conhost/conhost.rc:46 msgid "" @@ -14487,7 +14396,7 @@ msgstr "IPv4 주소" #: programs/ipconfig/ipconfig.rc:37 msgid "Hostname" -msgstr "호스트이름" +msgstr "호스트 이름" #: programs/ipconfig/ipconfig.rc:39 msgid "Node type" @@ -14531,7 +14440,7 @@ msgstr "IPv6 주소" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "주 DNS 접미사" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -14981,7 +14890,7 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"파일 '%s'이(가) 바뀌었습니다.\n" +"파일 '%s'이(가) 변경되었습니다.\n" "\n" "변결 내용을 저장하시겠습니까?" @@ -15027,7 +14936,7 @@ msgstr "TypeLib 보기(&V)..." #: programs/oleview/oleview.rc:35 msgid "&System Configuration" -msgstr "시스템 설정(&S)" +msgstr "시스템 구성(&S)" #: programs/oleview/oleview.rc:36 msgid "&Run the Registry Editor" @@ -15578,37 +15487,32 @@ msgid "Type \"REG %1 /?\" for help.\n" msgstr "도움말을 보려면 \"REG %1 /?\"를 입력하세요.\n" #: programs/reg/reg.rc:181 -#, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" +msgstr "reg: 지정한 레지스트리 키를 액세스하거나 만들 수 없습니다\n" #: programs/reg/reg.rc:116 -#, fuzzy #| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "작업이 성공적으로 끝났습니다\n" +msgstr "reg: 작업이 성공적으로 끝났습니다\n" #: programs/reg/reg.rc:131 -#, fuzzy #| msgid "The registry operation was cancelled\n" msgid "reg: The registry operation was cancelled\n" -msgstr "레지스트리 작업이 취소되었습니다\n" +msgstr "reg: 레지스트리 작업이 취소되었습니다\n" #: programs/reg/reg.rc:174 -#, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" +msgstr "reg: 지정한 레지스트리 키를 찾을 수 없습니다\n" #: programs/reg/reg.rc:120 -#, fuzzy #| msgid "" #| "reg: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" +msgstr "reg: 지정한 레지스트리 값을 찾을 수 없습니다\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15619,7 +15523,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "도움말을 보려면 \"REG /?\"를 입력하세요.\n" #: programs/reg/reg.rc:35 -#, fuzzy #| msgid "" #| "Usage:\n" #| " REG [operation] [parameters]\n" @@ -15642,13 +15545,12 @@ msgid "" "\n" msgstr "" "구문:\n" -" REG [명령] [매개변수]\n" +" REG [작업] [매개변수]\n" "\n" -"지원하는 명령:\n" +"지원하는 작업:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -"\n" -"각 명령에 관한 도움말:\n" -" REG [명령] /?\n" +"특정 작업에 대한 도움말을 보려면 다음을 입력하십시오.\n" +" REG [작업] /?\n" "\n" #: programs/reg/reg.rc:67 @@ -15700,6 +15602,52 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" +"\n" +" 레지스트리에 키를 추가하거나 지정된 레지스트리 키에 새 값을 추가합니다.\n" +"\n" +" <key>\n" +" 추가할 레지스트리 키입니다. 또는 [v]나 [/ve]를 지정한다면,\n" +" 새 레지스트리 데이터를 추가하려는 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /v <value_name>\n" +" 추가할 레지스트리 값 이름.\n" +"\n" +" /ve\n" +" 비어 있는 레지스트리 값을 추가합니다. 이 옵션은 (기본)\n" +" 레지스트리 값을 수정합니다.\n" +"\n" +" /t <type>\n" +" 레지스트리에 추가할 데이터 유형. [/t]가 지정되면,\n" +" <type>은 다음 중 하나여야 합니다:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" [/t]가 지정되지 않은 경우 기본 데이터 유형은 REG_SZ입니다.\n" +"\n" +" /s <separator>\n" +" REG_MULTI_SZ에 대한 데이터 문자열에서 구분 기호로 사용할 문자를\n" +" 하나 지정합니다. [/s]를 생략하면 \"\\0\"이 구분 기호로 사용됩니다.\n" +"\n" +" /d <data>\n" +" 추가할 레지스트리 value_name에 할당할 데이터입니다.\n" +"\n" +" /f\n" +" 확인 절차 없이 기존 레지스트리를 수정합니다.\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15735,6 +15683,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <key1> <key2> [/s] [/f]\n" +"\n" +" 지정된 레지스트리 키의 내용을 다른 위치로 복사합니다.\n" +" 기본적으로, 이 작업은 레지스트리 값만 복사합니다. [/s]를\n" +" 사용하여 모든 하위 키와 값을 재귀적으로 복사합니다.\n" +"\n" +" <key1>, <key2>\n" +" 데이터의 소스(<key1>)와 목적지(<key2>)를 지정하는 레지스트리 키.\n" +" <key2>가 없으면 새로 만듭니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /s\n" +" <key1>의 모든 하위키와 값을 <key2>로 복사합니다.\n" +"\n" +" /f\n" +" 확인 절차 없이 <key2>의 모든 레지스트리 데이터를 덮어씁니다.\n" +" 이 옵션은 key2>에만 존재하는 하위키와 값을 수정하지 않습니다.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15774,6 +15751,42 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <key> [/v value_name | /ve | /va] [/f]\n" +"\n" +" (모든 하위키 및 값과 함께) 레지스트리 키를 삭제하거나, 지정한\n" +" 레지스트리 키에서 하나 이상의 값을 삭제합니다.\n" +"\n" +" <key>\n" +" 삭제할 레지스트리 키입니다. 또는 [v], [/ve] 또는 [va] 중 하나가 지정된다" +"면,\n" +" 하나 또는 이상의 데이터를 삭제하려는 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /v <value_name>\n" +" 삭제하려는 레지스트리 값 이름.\n" +"\n" +" /ve\n" +" 비어 있는 레지스트리 값을 삭제합니다. 이 옵션은 (기본)\n" +" 레지스트리 값 이름의 데이터를 삭제합니다.\n" +"\n" +" /va\n" +" 레지스트리 키 아래의 모든 값을 삭제하니다.\n" +"\n" +" /f\n" +" 확인 절차 없이 (모든 하위키 및 값과 함께) 레지스트리 키를\n" +" 삭제합니다.\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15805,6 +15818,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <key> <file> [/y]\n" +"\n" +" (모든 하위키와 값과 함계) 지정한 레지스트리 키를 파일로\n" +" 내보냅니다.\n" +"\n" +" <key>\n" +" 내보내려는 레지스트리 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" <file>\n" +" 레지스트리 키를 내보내려는 파일의 이름 및 경로입니다.\n" +" 이 파일의 확장자는 .reg 이어야 합니다.\n" +"\n" +" /y\n" +" 확인 절차 없이 기존 파일을 덮어씁니다.\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15816,6 +15856,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <file>\n" +"\n" +" 지정한 파일에서 키, 값 및 데이터를 레지스트리로 가져옵니다.\n" +"\n" +" <file>\n" +" 가져올 레지스트리 파일의 이름 및 경로입니다.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15851,6 +15898,38 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <key> [/v value_name | /ve] [/s]\n" +"\n" +" 지정한 레지스트리 키를 쿼리하여 키 안의 모든 하위키, 값 및 데이터를 나열합" +"니다.\n" +" [/s]를 사용하면 각각의 하위키를 재귀적으로 쿼리합니다.\n" +"\n" +" <key>\n" +" 쿼리할 레지스트리 키입니다.\n" +"\n" +" Format: ROOT\\Subkey\n" +"\n" +" ROOT: 미리 정의된 레지스트리 키입니다. 다음 중 하나여야 합니다:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 선택한 ROOT 키 아래에 있는 레지스트리 키의 전체 경로.\n" +"\n" +" /v <value_name>\n" +" 쿼리할 레지스트리 값의 이름입니다. [/v]나 [/ve]를 지정하지 않은 경우,\n" +" <key> 아래의 모든 레지스트리 값이 나열됩니다.\n" +"\n" +" /ve\n" +" 비어있는 레지스트리 값을 쿼리합니다. 이 옵션은 (기본)\n" +" 레지스트리 값을 쿼리합니다.\n" +"\n" +" /s\n" +" <key> 및 그 하위키 아래의 모든 레지스트리 항목을 나열합니다.\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15861,32 +15940,35 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 32-bit 뷰를 사용하여 레지스트리에 액세스합니다.\n" +"\n" +" /reg:64\n" +" 64-bit 뷰를 사용하여 레지스트리에 액세스합니다.\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy #| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: 키 이름이 잘못되었습니다\n" +msgstr "reg: 잘못된 레지스트리 키\n" #: programs/reg/reg.rc:119 msgid "reg: Unable to access remote machine\n" msgstr "reg: 원격 컴퓨터에 액세스할 수 없습니다\n" #: programs/reg/reg.rc:172 -#, fuzzy #| msgid "reg: Invalid system key [%1]\n" msgid "reg: Invalid system key\n" -msgstr "reg: 잘못된 시스템 키 [%1]\n" +msgstr "reg: 잘못된 시스템 키\n" #: programs/reg/reg.rc:140 msgid "reg: Invalid option [%1]. " msgstr "reg: 잘못된 옵션 [%1]. " #: programs/reg/reg.rc:122 -#, fuzzy #| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg : 옵션 [/d] 다음에 유효한 16 진수 값이 있어야 합니다\n" +msgstr "reg : 옵션 [/d] 다음에 유효한 숫자 값이 있어야 합니다\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -15914,15 +15996,14 @@ msgstr "reg: 명령줄 매개변수가 잘못되었습니다\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 원본 키와 대상 키는 같을 수 없습니다\n" #: programs/reg/reg.rc:205 -#, fuzzy #| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "'%1' 파일이 이미 존재합니다. 덮어쓰시겠습니까?" +msgstr "'%1\\%2' 값이 이미 대상 키에 존재합니다. 덮어쓰시겠습니까?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -15937,10 +16018,9 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "레지스트리 키 '%1'을 제거하시겠습니까?" #: programs/reg/reg.rc:137 -#, fuzzy #| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: 레지스트리 '%1'을(를) 지울 수 없습니다.\n" +msgstr "reg: '%1'의 모든 레지스트리 값을 지울 수 없습니다.\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" @@ -15951,10 +16031,9 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: 인식되지 않는 이스케이프 시퀀스 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy #| msgid "reg: Unable to open the registry key '%1'.\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "레지스트리 키 '%1'을(를) 열 수 없습니다.\n" +msgstr "reg: 레지스트리 키 '%1'을(를) 가져올 수 없습니다.\n" #: programs/reg/reg.rc:150 msgid "reg: The file '%1' was not found.\n" @@ -16394,7 +16473,7 @@ msgstr "regedit: 명령에 유효하지 않은 구문이 있습니다.\n" #: programs/regedit/regedit.rc:187 msgid "Quits the Registry Editor" -msgstr "레지스트리 편집기 나가기" +msgstr "레지스트리 편집기 끝내기" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" @@ -16634,7 +16713,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: '%1' 제거 성공\n" #: programs/start/start.rc:57 -#, fuzzy #| msgid "" #| "Start a program, or open a document in the program normally used for " #| "files\n" @@ -16720,6 +16798,7 @@ msgstr "" " 실행했던 프로그램의 반환 코드입니다.\n" "/unix 유닉스 파일 이름을 사용하고, Windows 탐색기처럼 파일을\n" " 시작합니다.\n" +"/exec 지정한 파일을 실행합니다 (Wine 내부 용도).\n" "/ProgIDOpen 지정한 progID를 사용해서 문서를 엽니다.\n" "/? 도움말을 보여주고 끝냅니다.\n" @@ -16801,7 +16880,7 @@ msgstr "새 작업 (실행...)(&N)" #: programs/taskmgr/taskmgr.rc:39 msgid "E&xit Task Manager" -msgstr "작업 관리자 나가기(&X)" +msgstr "작업 관리자 끝내기(&X)" #: programs/taskmgr/taskmgr.rc:45 msgid "&Minimize On Use" @@ -17575,7 +17654,7 @@ msgstr "잘못된 옵션입니다" #: programs/taskmgr/taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" -msgstr "프로세프 선호도를 설정 또는 액세스할 수 없습니다" +msgstr "프로세스 선호도를 설정 또는 액세스할 수 없습니다" #: programs/taskmgr/taskmgr.rc:322 msgid "System Idle Process" @@ -17702,7 +17781,7 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "Wine 설정(%s)을 업데이트하고 있습니다. 잠시만 기다려주세요..." +msgstr "%s의 Wine 구성을 업데이트하고 있습니다. 잠시만 기다려주세요..." # 라이선스 문구는 번역하지 않습니다. #: programs/winecfg/winecfg.rc:140 @@ -17949,7 +18028,7 @@ msgstr "MIME 형식" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "Wine이 호스트 OS의 파일 연결을 수정합니다(&A)" +msgstr "Wine 관련 파일 연결을 데스크톱에 추가합니다(&A)" #: programs/winecfg/winecfg.rc:306 msgid "Folders" @@ -17985,7 +18064,7 @@ msgstr "그래픽" #: programs/winecfg/winecfg.rc:40 msgid "Desktop Integration" -msgstr "데스크톱" +msgstr "데스크톱 통합" #: programs/winecfg/winecfg.rc:41 msgid "Audio" @@ -18322,7 +18401,7 @@ msgstr "" #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" -msgstr "자세히 보이기(^D)" +msgstr "자세히 보이기(&D)" #: programs/winedbg/winedbg.rc:67 msgid "Program Error Details" -- 2.34.0

1 0

[PATCH 12/12] winecoreaudio: Move release_capture_buffer to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 29 +++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 32 +++++------------------------- dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index ae44b562c22..d723291bb24 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1457,6 +1457,34 @@ end: return STATUS_SUCCESS; } +static NTSTATUS release_capture_buffer(void *args) +{ + struct release_capture_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(!params->done){ + stream->getbuf_last = 0; + params->result = S_OK; + }else if(!stream->getbuf_last) + params->result = AUDCLNT_E_OUT_OF_ORDER; + else if(stream->getbuf_last != params->done) + params->result = AUDCLNT_E_INVALID_SIZE; + else{ + stream->written_frames += params->done; + stream->held_frames -= params->done; + stream->lcl_offs_frames += params->done; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->getbuf_last = 0; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1468,6 +1496,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_render_buffer, release_render_buffer, get_capture_buffer, + release_capture_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 84525ac8a53..717e64b2283 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1386,36 +1386,14 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); + struct release_capture_buffer_params params; TRACE("(%p)->(%u)\n", This, done); - OSSpinLockLock(&This->stream->lock); - - if(!done){ - This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - if(!This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(This->stream->getbuf_last != done){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_INVALID_SIZE; - } - - This->stream->written_frames += done; - This->stream->held_frames -= done; - This->stream->lcl_offs_frames += done; - This->stream->lcl_offs_frames %= This->stream->bufsize_frames; - This->stream->getbuf_last = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.done = done; + UNIX_CALL(release_capture_buffer, &params); + return params.result; } static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 2211f1048a3..9bb636fd625 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -120,6 +120,13 @@ struct get_capture_buffer_params UINT64 *qpcpos; }; +struct release_capture_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 done; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -170,6 +177,7 @@ enum unix_funcs unix_get_render_buffer, unix_release_render_buffer, unix_get_capture_buffer, + unix_release_capture_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 11/12] winecoreaudio: Move get_capture_buffer to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 56 ++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 55 +++++------------------------ dlls/winecoreaudio.drv/unixlib.h | 12 +++++++ 3 files changed, 77 insertions(+), 46 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 2519a6bcfaa..ae44b562c22 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1402,6 +1402,61 @@ static NTSTATUS release_render_buffer(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_capture_buffer(void *args) +{ + struct get_capture_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + UINT32 chunk_bytes, chunk_frames; + LARGE_INTEGER stamp, freq; + + OSSpinLockLock(&stream->lock); + + if(stream->getbuf_last){ + params->result = AUDCLNT_E_OUT_OF_ORDER; + goto end; + } + + capture_resample(stream); + + *params->frames = 0; + + if(stream->held_frames < stream->period_frames){ + params->result = AUDCLNT_S_BUFFER_EMPTY; + goto end; + } + + *params->flags = 0; + chunk_frames = stream->bufsize_frames - stream->lcl_offs_frames; + if(chunk_frames < stream->period_frames){ + chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; + if(!stream->tmp_buffer){ + stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + } + *params->data = stream->tmp_buffer; + memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign, + chunk_bytes); + memcpy(*params->data + chunk_bytes, stream->local_buffer, + stream->period_frames * stream->fmt->nBlockAlign - chunk_bytes); + }else + *params->data = stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign; + + stream->getbuf_last = *params->frames = stream->period_frames; + + if(params->devpos) + *params->devpos = stream->written_frames; + if(params->qpcpos){ /* fixme: qpc of recording time */ + NtQueryPerformanceCounter(&stamp, &freq); + *params->qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + params->result = S_OK; + +end: + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1412,6 +1467,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = reset, get_render_buffer, release_render_buffer, + get_capture_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1874382304b..84525ac8a53 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1359,7 +1359,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - UINT32 chunk_bytes, chunk_frames; + struct get_capture_buffer_params params; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1372,51 +1372,14 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - capture_resample(This); - - if(This->stream->held_frames < This->stream->period_frames){ - *frames = 0; - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_S_BUFFER_EMPTY; - } - - *flags = 0; - - chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; - if(chunk_frames < This->stream->period_frames){ - chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; - if(!This->stream->tmp_buffer){ - This->stream->tmp_buffer_size = This->stream->period_frames * This->stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, - &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); - } - *data = This->stream->tmp_buffer; - memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); - memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); - }else - *data = This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - - This->stream->getbuf_last = *frames = This->stream->period_frames; - - if(devpos) - *devpos = This->stream->written_frames; - if(qpcpos){ /* fixme: qpc of recording time */ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.data = data; + params.frames = frames; + params.flags = flags; + params.devpos = devpos; + params.qpcpos = qpcpos; + UNIX_CALL(get_capture_buffer, &params); + return params.result; } static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 80f42741e34..2211f1048a3 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -109,6 +109,17 @@ struct release_render_buffer_params HRESULT result; }; +struct get_capture_buffer_params +{ + struct coreaudio_stream *stream; + HRESULT result; + BYTE **data; + UINT32 *frames; + DWORD *flags; + UINT64 *devpos; + UINT64 *qpcpos; +}; + struct get_mix_format_params { EDataFlow flow; @@ -158,6 +169,7 @@ enum unix_funcs unix_reset, unix_get_render_buffer, unix_release_render_buffer, + unix_get_capture_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 10/12] winecoreaudio: Move release_render_buffer to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 45 ++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 73 +++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 ++++ 3 files changed, 60 insertions(+), 67 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0bf21cd6c7d..2519a6bcfaa 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1358,6 +1358,50 @@ end: return STATUS_SUCCESS; } +static NTSTATUS release_render_buffer(void *args) +{ + struct release_render_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + BYTE *buffer; + + OSSpinLockLock(&stream->lock); + + if(!params->frames){ + stream->getbuf_last = 0; + params->result = S_OK; + }else if(!stream->getbuf_last) + params->result = AUDCLNT_E_OUT_OF_ORDER; + else if(params->frames > (stream->getbuf_last >= 0 ? stream->getbuf_last : -stream->getbuf_last)) + params->result = AUDCLNT_E_INVALID_SIZE; + else{ + if(stream->getbuf_last >= 0) + buffer = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + else + buffer = stream->tmp_buffer; + + if(params->flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(stream, buffer, params->frames); + + if(stream->getbuf_last < 0) + ca_wrap_buffer(stream->local_buffer, + stream->wri_offs_frames * stream->fmt->nBlockAlign, + stream->bufsize_frames * stream->fmt->nBlockAlign, + buffer, params->frames * stream->fmt->nBlockAlign); + + stream->wri_offs_frames += params->frames; + stream->wri_offs_frames %= stream->bufsize_frames; + stream->held_frames += params->frames; + stream->written_frames += params->frames; + stream->getbuf_last = 0; + + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1367,6 +1411,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = stop, reset, get_render_buffer, + release_render_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5dca497594a..1874382304b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -683,30 +683,6 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, - BYTE *src, UINT32 src_bytes) -{ - UINT32 chunk_bytes = dst_bytes - dst_offs; - - if(chunk_bytes < src_bytes){ - memcpy(dst + dst_offs, src, chunk_bytes); - memcpy(dst, src + chunk_bytes, src_bytes - chunk_bytes); - }else - memcpy(dst + dst_offs, src, src_bytes); -} - -static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; - if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * stream->fmt->nBlockAlign); - else - memset(buffer, 0, frames * stream->fmt->nBlockAlign); -} - static void capture_resample(ACImpl *This) { UNIX_CALL(capture_resample, This->stream); @@ -1322,52 +1298,15 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - BYTE *buffer; + struct release_render_buffer_params params; TRACE("(%p)->(%u, %x)\n", This, frames, flags); - OSSpinLockLock(&This->stream->lock); - - if(!frames){ - This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - if(!This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(frames > (This->stream->getbuf_last >= 0 ? This->stream->getbuf_last : -This->stream->getbuf_last)){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_INVALID_SIZE; - } - - if(This->stream->getbuf_last >= 0) - buffer = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; - else - buffer = This->stream->tmp_buffer; - - if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This->stream, buffer, frames); - - if(This->stream->getbuf_last < 0) - ca_wrap_buffer(This->stream->local_buffer, - This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, - buffer, frames * This->stream->fmt->nBlockAlign); - - - This->stream->wri_offs_frames += frames; - This->stream->wri_offs_frames %= This->stream->bufsize_frames; - This->stream->held_frames += frames; - This->stream->written_frames += frames; - This->stream->getbuf_last = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + params.flags = flags; + UNIX_CALL(release_render_buffer, &params); + return params.result; } static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e2ae457e705..80f42741e34 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -101,6 +101,14 @@ struct get_render_buffer_params BYTE **data; }; +struct release_render_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 frames; + DWORD flags; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -149,6 +157,7 @@ enum unix_funcs unix_stop, unix_reset, unix_get_render_buffer, + unix_release_render_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 09/12] winecoreaudio: Move get_render_buffer to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 60 +++++++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 75 +++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 10 +++- 3 files changed, 73 insertions(+), 72 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index ee34cd29de1..0bf21cd6c7d 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -699,6 +699,9 @@ static NTSTATUS release_stream( void *args ) if(stream->local_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, &stream->local_buffer_size, MEM_RELEASE); + if(stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); free(stream->fmt); params->result = S_OK; return STATUS_SUCCESS; @@ -1230,9 +1233,9 @@ static NTSTATUS get_current_padding(void *args) struct get_current_padding_params *params = args; struct coreaudio_stream *stream = params->stream; - if(params->lock) OSSpinLockLock(&stream->lock); + OSSpinLockLock(&stream->lock); *params->padding = get_current_padding_nolock(stream); - if(params->lock) OSSpinLockUnlock(&stream->lock); + OSSpinLockUnlock(&stream->lock); params->result = S_OK; return STATUS_SUCCESS; } @@ -1303,6 +1306,58 @@ static NTSTATUS reset(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_render_buffer(void *args) +{ + struct get_render_buffer_params *params = args; + struct coreaudio_stream *stream = params->stream; + UINT32 pad; + + OSSpinLockLock(&stream->lock); + + pad = get_current_padding_nolock(stream); + + if(stream->getbuf_last){ + params->result = AUDCLNT_E_OUT_OF_ORDER; + goto end; + } + if(!params->frames){ + params->result = S_OK; + goto end; + } + if(pad + params->frames > stream->bufsize_frames){ + params->result = AUDCLNT_E_BUFFER_TOO_LARGE; + goto end; + } + + if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ + if(stream->tmp_buffer_frames < params->frames){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, + &stream->tmp_buffer_size, MEM_RELEASE); + stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + stream->tmp_buffer_frames = 0; + params->result = E_OUTOFMEMORY; + goto end; + } + stream->tmp_buffer_frames = params->frames; + } + *params->data = stream->tmp_buffer; + stream->getbuf_last = -params->frames; + }else{ + *params->data = stream->local_buffer + stream->wri_offs_frames * stream->fmt->nBlockAlign; + stream->getbuf_last = params->frames; + } + + silence_buffer(stream, *params->data, params->frames); + params->result = S_OK; + +end: + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1311,6 +1366,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = start, stop, reset, + get_render_buffer, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cf2c23a0f40..5dca497594a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -554,9 +554,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) CloseHandle(event); } if(This->stream){ - if(This->stream->tmp_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); params.stream = This->stream; UNIX_CALL(release_stream, &params); } @@ -871,21 +868,6 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, return params.result; } -static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, - UINT32 *numpad) -{ - struct get_current_padding_params params; - - if(!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.padding = numpad; - params.lock = FALSE; - UNIX_CALL(get_current_padding, &params); - return params.result; -} - static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { @@ -902,7 +884,6 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, params.stream = This->stream; params.padding = numpad; - params.lock = TRUE; UNIX_CALL(get_current_padding, &params); return params.result; } @@ -1322,8 +1303,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 pad; - HRESULT hr; + struct get_render_buffer_params params; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1331,54 +1311,11 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_OUT_OF_ORDER; - } - - if(!frames){ - OSSpinLockUnlock(&This->stream->lock); - return S_OK; - } - - hr = AudioClient_GetCurrentPadding_nolock(This, &pad); - if(FAILED(hr)){ - OSSpinLockUnlock(&This->stream->lock); - return hr; - } - - if(pad + frames > This->stream->bufsize_frames){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_BUFFER_TOO_LARGE; - } - - if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ - if(This->stream->tmp_buffer_frames < frames){ - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); - This->stream->tmp_buffer_size = frames * This->stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, - &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ - This->stream->tmp_buffer_frames = 0; - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; - } - This->stream->tmp_buffer_frames = frames; - } - *data = This->stream->tmp_buffer; - This->stream->getbuf_last = -frames; - }else{ - *data = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; - This->stream->getbuf_last = frames; - } - - silence_buffer(This->stream, *data, frames); - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + params.data = data; + UNIX_CALL(get_render_buffer, &params); + return params.result; } static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 450293052c7..e2ae457e705 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -93,6 +93,14 @@ struct reset_params HRESULT result; }; +struct get_render_buffer_params +{ + struct coreaudio_stream *stream; + UINT32 frames; + HRESULT result; + BYTE **data; +}; + struct get_mix_format_params { EDataFlow flow; @@ -128,7 +136,6 @@ struct get_latency_params struct get_current_padding_params { struct coreaudio_stream *stream; - BOOL lock; /* temporary */ HRESULT result; UINT32 *padding; }; @@ -141,6 +148,7 @@ enum unix_funcs unix_start, unix_stop, unix_reset, + unix_get_render_buffer, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 08/12] winecoreaudio: Move reset to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 29 ++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 31 ++++-------------------------- dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5a49a786f48..ee34cd29de1 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1275,6 +1275,34 @@ static NTSTATUS stop(void *args) return STATUS_SUCCESS; } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(stream->playing) + params->result = AUDCLNT_E_NOT_STOPPED; + else if(stream->getbuf_last) + params->result = AUDCLNT_E_BUFFER_OPERATION_PENDING; + else{ + if(stream->flow == eRender) + stream->written_frames = 0; + else + stream->written_frames += stream->held_frames; + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->wri_offs_frames = 0; + stream->cap_offs_frames = 0; + stream->cap_held_frames = 0; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1282,6 +1310,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index e214a85c0d3..cf2c23a0f40 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1041,39 +1041,16 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if(This->stream->getbuf_last){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(This->dataflow == eRender){ - This->stream->written_frames = 0; - }else{ - This->stream->written_frames += This->stream->held_frames; - } - - This->stream->held_frames = 0; - This->stream->lcl_offs_frames = 0; - This->stream->wri_offs_frames = 0; - This->stream->cap_offs_frames = 0; - This->stream->cap_held_frames = 0; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + UNIX_CALL(reset, &params); + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index c3da84c2c7a..450293052c7 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -87,6 +87,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -134,6 +140,7 @@ enum unix_funcs unix_release_stream, unix_start, unix_stop, + unix_reset, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 07/12] winecoreaudio: Move stop to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 20 ++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++------------ dlls/winecoreaudio.drv/unixlib.h | 7 +++++++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 133ab3da124..5a49a786f48 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1256,12 +1256,32 @@ static NTSTATUS start(void *args) return STATUS_SUCCESS; } +static NTSTATUS stop(void *args) +{ + struct stop_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(!stream->playing) + params->result = S_FALSE; + else{ + stream->playing = FALSE; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, start, + stop, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 30858931338..e214a85c0d3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1026,24 +1026,16 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct stop_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(!This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return S_FALSE; - } - - This->stream->playing = FALSE; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + UNIX_CALL(stop, &params); + return params.result; } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index b4e9e5bf950..c3da84c2c7a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -81,6 +81,12 @@ struct start_params HRESULT result; }; +struct stop_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -127,6 +133,7 @@ enum unix_funcs unix_create_stream, unix_release_stream, unix_start, + unix_stop, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 06/12] winecoreaudio: Move start to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 20 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 39 ++++++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 7 ++++++ 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 76febf1eb91..133ab3da124 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1237,11 +1237,31 @@ static NTSTATUS get_current_padding(void *args) return STATUS_SUCCESS; } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + + if(stream->playing) + params->result = AUDCLNT_E_NOT_STOPPED; + else{ + stream->playing = TRUE; + params->result = S_OK; + } + + OSSpinLockUnlock(&stream->lock); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, + start, get_mix_format, is_format_supported, get_buffer_size, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5d140665a83..30858931338 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -996,38 +996,31 @@ void CALLBACK ca_period_cb(void *user, BOOLEAN timer) static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct start_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_STOPPED; - } - - if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ - OSSpinLockUnlock(&This->stream->lock); + if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event) return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(This->event && !This->timer) - if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ - This->timer = NULL; - OSSpinLockUnlock(&This->stream->lock); - WARN("Unable to create timer: %u\n", GetLastError()); - return E_OUTOFMEMORY; - } - - This->stream->playing = TRUE; - OSSpinLockUnlock(&This->stream->lock); + params.stream = This->stream; + UNIX_CALL(start, &params); - return S_OK; + if(SUCCEEDED(params.result)){ + if(This->event && !This->timer){ + if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, This, 0, + This->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This->timer = NULL; + IAudioClient3_Stop(iface); + WARN("Unable to create timer: %u\n", GetLastError()); + return E_OUTOFMEMORY; + } + } + } + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 072ffd233c3..b4e9e5bf950 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -75,6 +75,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + struct get_mix_format_params { EDataFlow flow; @@ -120,6 +126,7 @@ enum unix_funcs unix_get_endpoint_ids, unix_create_stream, unix_release_stream, + unix_start, unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, -- 2.23.0

2 1

[PATCH 05/12] winecoreaudio: Move get_current_padding to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 19 +++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 27 +++++++++++++-------------- dlls/winecoreaudio.drv/unixlib.h | 9 +++++++++ 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 2d5aa29555a..76febf1eb91 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1219,6 +1219,24 @@ static NTSTATUS get_latency(void *args) return STATUS_SUCCESS; } +static UINT32 get_current_padding_nolock(struct coreaudio_stream *stream) +{ + if(stream->flow == eCapture) capture_resample(stream); + return stream->held_frames; +} + +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(params->lock) OSSpinLockLock(&stream->lock); + *params->padding = get_current_padding_nolock(stream); + if(params->lock) OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1228,6 +1246,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_buffer_size, get_latency, + get_current_padding, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 63deb458f1a..5d140665a83 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -874,22 +874,23 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, UINT32 *numpad) { + struct get_current_padding_params params; + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - if(This->dataflow == eCapture) - capture_resample(This); - - *numpad = This->stream->held_frames; - - return S_OK; + params.stream = This->stream; + params.padding = numpad; + params.lock = FALSE; + UNIX_CALL(get_current_padding, &params); + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { ACImpl *This = impl_from_IAudioClient3(iface); - HRESULT hr; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, numpad); @@ -899,13 +900,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - hr = AudioClient_GetCurrentPadding_nolock(This, numpad); - - OSSpinLockUnlock(&This->stream->lock); - - return hr; + params.stream = This->stream; + params.padding = numpad; + params.lock = TRUE; + UNIX_CALL(get_current_padding, &params); + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index dd86cd81973..072ffd233c3 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -107,6 +107,14 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct coreaudio_stream *stream; + BOOL lock; /* temporary */ + HRESULT result; + UINT32 *padding; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -116,6 +124,7 @@ enum unix_funcs unix_is_format_supported, unix_get_buffer_size, unix_get_latency, + unix_get_current_padding, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 04/12] winecoreaudio: Move get_latency to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 93 ++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 119 ++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 8 ++ 3 files changed, 109 insertions(+), 111 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 56504a8b7b0..2d5aa29555a 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1127,6 +1127,98 @@ static NTSTATUS get_buffer_size(void *args) return STATUS_SUCCESS; } +static HRESULT ca_get_max_stream_latency(struct coreaudio_stream *stream, UInt32 *max) +{ + AudioObjectPropertyAddress addr; + AudioStreamID *ids; + UInt32 size; + OSStatus sc; + int nstreams, i; + + addr.mScope = get_scope(stream->flow); + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyStreams; + + sc = AudioObjectGetPropertyDataSize(stream->dev_id, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get size for _Streams property: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + ids = malloc(size); + if(!ids) + return E_OUTOFMEMORY; + + sc = AudioObjectGetPropertyData(stream->dev_id, &addr, 0, NULL, &size, ids); + if(sc != noErr){ + WARN("Unable to get _Streams property: %x\n", (int)sc); + free(ids); + return osstatus_to_hresult(sc); + } + + nstreams = size / sizeof(AudioStreamID); + *max = 0; + + addr.mSelector = kAudioStreamPropertyLatency; + for(i = 0; i < nstreams; ++i){ + UInt32 latency; + + size = sizeof(latency); + sc = AudioObjectGetPropertyData(ids[i], &addr, 0, NULL, &size, &latency); + if(sc != noErr){ + WARN("Unable to get _Latency property: %x\n", (int)sc); + continue; + } + + if(latency > *max) + *max = latency; + } + + free(ids); + + return S_OK; +} + +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct coreaudio_stream *stream = params->stream; + UInt32 latency, stream_latency, size; + AudioObjectPropertyAddress addr; + OSStatus sc; + + OSSpinLockLock(&stream->lock); + + addr.mScope = get_scope(stream->flow); + addr.mSelector = kAudioDevicePropertyLatency; + addr.mElement = 0; + + size = sizeof(latency); + sc = AudioObjectGetPropertyData(stream->dev_id, &addr, 0, NULL, &size, &latency); + if(sc != noErr){ + WARN("Couldn't get _Latency property: %x\n", (int)sc); + OSSpinLockUnlock(&stream->lock); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + params->result = ca_get_max_stream_latency(stream, &stream_latency); + if(FAILED(params->result)){ + OSSpinLockUnlock(&stream->lock); + return STATUS_SUCCESS; + } + + latency += stream_latency; + /* pretend we process audio in Period chunks, so max latency includes + * the period time */ + *params->latency = muldiv(latency, 10000000, stream->fmt->nSamplesPerSec) + + stream->period_ms * 10000; + + OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1135,6 +1227,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, is_format_supported, get_buffer_size, + get_latency, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cd33cababd1..63deb458f1a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -130,7 +130,6 @@ struct ACImpl { float *vols; AudioDeviceID adevid; - AudioObjectPropertyScope scope; HANDLE timer; AudioSession *session; @@ -263,19 +262,6 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static HRESULT osstatus_to_hresult(OSStatus sc) -{ - switch(sc){ - case kAudioFormatUnsupportedDataFormatError: - case kAudioFormatUnknownFormatError: - case kAudioDeviceUnsupportedFormatError: - return AUDCLNT_E_UNSUPPORTED_FORMAT; - case kAudioHardwareBadDeviceError: - return AUDCLNT_E_DEVICE_INVALIDATED; - } - return E_FAIL; -} - static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -481,6 +467,9 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(!get_deviceid_by_guid(guid, &adevid, &dataflow)) return AUDCLNT_E_DEVICE_INVALIDATED; + if(dataflow != eRender && dataflow != eCapture) + return E_INVALIDARG; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; @@ -494,15 +483,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; - if(dataflow == eRender) - This->scope = kAudioDevicePropertyScopeOutput; - else if(dataflow == eCapture) - This->scope = kAudioDevicePropertyScopeInput; - else{ - HeapFree(GetProcessHeap(), 0, This); - return E_INVALIDARG; - } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); @@ -871,68 +851,11 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, return params.result; } -static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) -{ - AudioObjectPropertyAddress addr; - AudioStreamID *ids; - UInt32 size; - OSStatus sc; - int nstreams, i; - - addr.mScope = This->scope; - addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyStreams; - - sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, - &size); - if(sc != noErr){ - WARN("Unable to get size for _Streams property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - ids = HeapAlloc(GetProcessHeap(), 0, size); - if(!ids) - return E_OUTOFMEMORY; - - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, ids); - if(sc != noErr){ - WARN("Unable to get _Streams property: %x\n", (int)sc); - HeapFree(GetProcessHeap(), 0, ids); - return osstatus_to_hresult(sc); - } - - nstreams = size / sizeof(AudioStreamID); - *max = 0; - - addr.mSelector = kAudioStreamPropertyLatency; - for(i = 0; i < nstreams; ++i){ - UInt32 latency; - - size = sizeof(latency); - sc = AudioObjectGetPropertyData(ids[i], &addr, 0, NULL, - &size, &latency); - if(sc != noErr){ - WARN("Unable to get _Latency property: %x\n", (int)sc); - continue; - } - - if(latency > *max) - *max = latency; - } - - HeapFree(GetProcessHeap(), 0, ids); - - return S_OK; -} - static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *out) { ACImpl *This = impl_from_IAudioClient3(iface); - UInt32 latency, stream_latency, size; - AudioObjectPropertyAddress addr; - OSStatus sc; - HRESULT hr; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, out); @@ -942,36 +865,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - addr.mScope = This->scope; - addr.mSelector = kAudioDevicePropertyLatency; - addr.mElement = 0; - - size = sizeof(latency); - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, - &size, &latency); - if(sc != noErr){ - WARN("Couldn't get _Latency property: %x\n", (int)sc); - OSSpinLockUnlock(&This->stream->lock); - return osstatus_to_hresult(sc); - } - - hr = ca_get_max_stream_latency(This, &stream_latency); - if(FAILED(hr)){ - OSSpinLockUnlock(&This->stream->lock); - return hr; - } - - latency += stream_latency; - /* pretend we process audio in Period chunks, so max latency includes - * the period time */ - *out = MulDiv(latency, 10000000, This->stream->fmt->nSamplesPerSec) - + This->stream->period_ms * 10000; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.latency = out; + UNIX_CALL(get_latency, &params); + return params.result; } static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7e08b347b02..dd86cd81973 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -100,6 +100,13 @@ struct get_buffer_size_params UINT32 *frames; }; +struct get_latency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -108,6 +115,7 @@ enum unix_funcs unix_get_mix_format, unix_is_format_supported, unix_get_buffer_size, + unix_get_latency, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 03/12] winecoreaudio: Move get_buffer_size to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 13 +++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 12 +++++------- dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f1ab4cf7986..56504a8b7b0 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1115,6 +1115,18 @@ static NTSTATUS capture_resample(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_buffer_size(void *args) +{ + struct get_buffer_size_params *params = args; + struct coreaudio_stream *stream = params->stream; + + OSSpinLockLock(&stream->lock); + *params->frames = stream->bufsize_frames; + OSSpinLockUnlock(&stream->lock); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1122,6 +1134,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, get_mix_format, is_format_supported, + get_buffer_size, capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 578312bf4ef..cd33cababd1 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -855,6 +855,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, UINT32 *frames) { ACImpl *This = impl_from_IAudioClient3(iface); + struct get_buffer_size_params params; TRACE("(%p)->(%p)\n", This, frames); @@ -864,13 +865,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - OSSpinLockLock(&This->stream->lock); - - *frames = This->stream->bufsize_frames; - - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + params.stream = This->stream; + params.frames = frames; + UNIX_CALL(get_buffer_size, &params); + return params.result; } static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index c1762c50e7e..7e08b347b02 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -93,6 +93,13 @@ struct is_format_supported_params HRESULT result; }; +struct get_buffer_size_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT32 *frames; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -100,6 +107,7 @@ enum unix_funcs unix_release_stream, unix_get_mix_format, unix_is_format_supported, + unix_get_buffer_size, unix_capture_resample /* temporary */ }; -- 2.23.0

2 1

[PATCH 02/12] winecoreaudio: Add a temporary capture_resample syscall.
by Huw Davies 23 Nov '21

23 Nov '21

Eventually everything that calls this will reside in the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 105 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 102 +--------------------------- dlls/winecoreaudio.drv/unixlib.h | 2 + 3 files changed, 108 insertions(+), 101 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f7f7777efcb..f1ab4cf7986 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -693,6 +693,7 @@ static NTSTATUS release_stream( void *args ) } if(stream->converter) AudioConverterDispose(stream->converter); + free(stream->resamp_buffer); free(stream->wrap_buffer); free(stream->cap_buffer); if(stream->local_buffer) @@ -1012,6 +1013,108 @@ unsupported: return STATUS_SUCCESS; } +static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) +{ + if(left <= right) + return right - left; + return bufsize - (left - right); +} + +/* place data from cap_buffer into provided AudioBufferList */ +static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBufferList *data, + AudioStreamPacketDescription **packets, void *user) +{ + struct coreaudio_stream *stream = user; + + *nframes = min(*nframes, stream->cap_held_frames); + if(!*nframes){ + data->mBuffers[0].mData = NULL; + data->mBuffers[0].mDataByteSize = 0; + data->mBuffers[0].mNumberChannels = stream->fmt->nChannels; + return noErr; + } + + data->mBuffers[0].mDataByteSize = *nframes * stream->fmt->nBlockAlign; + data->mBuffers[0].mNumberChannels = stream->fmt->nChannels; + + if(stream->cap_offs_frames + *nframes > stream->cap_bufsize_frames){ + UINT32 chunk_frames = stream->cap_bufsize_frames - stream->cap_offs_frames; + + if(stream->wrap_bufsize_frames < *nframes){ + free(stream->wrap_buffer); + stream->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); + stream->wrap_bufsize_frames = *nframes; + } + + memcpy(stream->wrap_buffer, stream->cap_buffer + stream->cap_offs_frames * stream->fmt->nBlockAlign, + chunk_frames * stream->fmt->nBlockAlign); + memcpy(stream->wrap_buffer + chunk_frames * stream->fmt->nBlockAlign, stream->cap_buffer, + (*nframes - chunk_frames) * stream->fmt->nBlockAlign); + + data->mBuffers[0].mData = stream->wrap_buffer; + }else + data->mBuffers[0].mData = stream->cap_buffer + stream->cap_offs_frames * stream->fmt->nBlockAlign; + + stream->cap_offs_frames += *nframes; + stream->cap_offs_frames %= stream->cap_bufsize_frames; + stream->cap_held_frames -= *nframes; + + if(packets) + *packets = NULL; + + return noErr; +} + +static NTSTATUS capture_resample(void *args) +{ + struct coreaudio_stream *stream = args; + UINT32 resamp_period_frames = muldiv(stream->period_frames, stream->dev_desc.mSampleRate, + stream->fmt->nSamplesPerSec); + OSStatus sc; + + /* the resampling process often needs more source frames than we'd + * guess from a straight conversion using the sample rate ratio. so + * only convert if we have extra source data. */ + while(stream->cap_held_frames > resamp_period_frames * 2){ + AudioBufferList converted_list; + UInt32 wanted_frames = stream->period_frames; + + converted_list.mNumberBuffers = 1; + converted_list.mBuffers[0].mNumberChannels = stream->fmt->nChannels; + converted_list.mBuffers[0].mDataByteSize = wanted_frames * stream->fmt->nBlockAlign; + + if(stream->resamp_bufsize_frames < wanted_frames){ + free(stream->resamp_buffer); + stream->resamp_buffer = malloc(converted_list.mBuffers[0].mDataByteSize); + stream->resamp_bufsize_frames = wanted_frames; + } + + converted_list.mBuffers[0].mData = stream->resamp_buffer; + + sc = AudioConverterFillComplexBuffer(stream->converter, feed_cb, + stream, &wanted_frames, &converted_list, NULL); + if(sc != noErr){ + WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); + break; + } + + ca_wrap_buffer(stream->local_buffer, + stream->wri_offs_frames * stream->fmt->nBlockAlign, + stream->bufsize_frames * stream->fmt->nBlockAlign, + stream->resamp_buffer, wanted_frames * stream->fmt->nBlockAlign); + + stream->wri_offs_frames += wanted_frames; + stream->wri_offs_frames %= stream->bufsize_frames; + if(stream->held_frames + wanted_frames > stream->bufsize_frames){ + stream->lcl_offs_frames += buf_ptr_diff(stream->lcl_offs_frames, stream->wri_offs_frames, + stream->bufsize_frames); + stream->held_frames = stream->bufsize_frames; + }else + stream->held_frames += wanted_frames; + } + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1019,4 +1122,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, get_mix_format, is_format_supported, + + capture_resample /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 418bbfa00af..578312bf4ef 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -138,10 +138,6 @@ struct ACImpl { struct coreaudio_stream *stream; struct list entry; - - /* Temporary */ - BYTE *feed_wrap_buffer; - UINT32 feed_wrap_bufsize_frames; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -581,7 +577,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) if(This->stream->tmp_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, &This->stream->tmp_buffer_size, MEM_RELEASE); - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); params.stream = This->stream; UNIX_CALL(release_stream, &params); } @@ -591,7 +586,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - free(This->feed_wrap_buffer); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); HeapFree(GetProcessHeap(), 0, This); @@ -736,103 +730,9 @@ static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) -{ - if(left <= right) - return right - left; - return bufsize - (left - right); -} - -/* place data from cap_buffer into provided AudioBufferList */ -static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBufferList *data, - AudioStreamPacketDescription **packets, void *user) -{ - ACImpl *This = user; - - *nframes = min(*nframes, This->stream->cap_held_frames); - if(!*nframes){ - data->mBuffers[0].mData = NULL; - data->mBuffers[0].mDataByteSize = 0; - data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - return noErr; - } - - data->mBuffers[0].mDataByteSize = *nframes * This->stream->fmt->nBlockAlign; - data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - - if(This->stream->cap_offs_frames + *nframes > This->stream->cap_bufsize_frames){ - UINT32 chunk_frames = This->stream->cap_bufsize_frames - This->stream->cap_offs_frames; - - if(This->feed_wrap_bufsize_frames < *nframes){ - free(This->feed_wrap_buffer); - This->feed_wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->feed_wrap_bufsize_frames = *nframes; - } - - memcpy(This->feed_wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, - chunk_frames * This->stream->fmt->nBlockAlign); - memcpy(This->feed_wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, - (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - - data->mBuffers[0].mData = This->feed_wrap_buffer; - }else - data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; - - This->stream->cap_offs_frames += *nframes; - This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; - This->stream->cap_held_frames -= *nframes; - - if(packets) - *packets = NULL; - - return noErr; -} - static void capture_resample(ACImpl *This) { - UINT32 resamp_period_frames = MulDiv(This->stream->period_frames, This->stream->dev_desc.mSampleRate, This->stream->fmt->nSamplesPerSec); - OSStatus sc; - - /* the resampling process often needs more source frames than we'd - * guess from a straight conversion using the sample rate ratio. so - * only convert if we have extra source data. */ - while(This->stream->cap_held_frames > resamp_period_frames * 2){ - AudioBufferList converted_list; - UInt32 wanted_frames = This->stream->period_frames; - - converted_list.mNumberBuffers = 1; - converted_list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->stream->fmt->nBlockAlign; - - if(This->stream->resamp_bufsize_frames < wanted_frames){ - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); - This->stream->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); - This->stream->resamp_bufsize_frames = wanted_frames; - } - - converted_list.mBuffers[0].mData = This->stream->resamp_buffer; - - sc = AudioConverterFillComplexBuffer(This->stream->converter, feed_cb, - This, &wanted_frames, &converted_list, NULL); - if(sc != noErr){ - WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); - break; - } - - ca_wrap_buffer(This->stream->local_buffer, - This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, - This->stream->resamp_buffer, wanted_frames * This->stream->fmt->nBlockAlign); - - This->stream->wri_offs_frames += wanted_frames; - This->stream->wri_offs_frames %= This->stream->bufsize_frames; - if(This->stream->held_frames + wanted_frames > This->stream->bufsize_frames){ - This->stream->lcl_offs_frames += buf_ptr_diff(This->stream->lcl_offs_frames, - This->stream->wri_offs_frames, This->stream->bufsize_frames); - This->stream->held_frames = This->stream->bufsize_frames; - }else - This->stream->held_frames += wanted_frames; - } + UNIX_CALL(capture_resample, This->stream); } static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 23de92ecfdd..c1762c50e7e 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -100,6 +100,8 @@ enum unix_funcs unix_release_stream, unix_get_mix_format, unix_is_format_supported, + + unix_capture_resample /* temporary */ }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 01/12] winecoreaudio: Move is_format_supported to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 65 ++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 255 ++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 11 ++ 3 files changed, 91 insertions(+), 240 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 208655d20c6..f7f7777efcb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -948,10 +948,75 @@ static NTSTATUS get_mix_format(void *args) return STATUS_SUCCESS; } +static NTSTATUS is_format_supported(void *args) +{ + struct is_format_supported_params *params = args; + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)params->fmt_in; + AudioStreamBasicDescription dev_desc; + AudioConverterRef converter; + AudioComponentInstance unit; + + params->result = S_OK; + + if(!params->fmt_in || (params->share == AUDCLNT_SHAREMODE_SHARED && !params->fmt_out)) + params->result = E_POINTER; + else if(params->share != AUDCLNT_SHAREMODE_SHARED && params->share != AUDCLNT_SHAREMODE_EXCLUSIVE) + params->result = E_INVALIDARG; + else if(params->fmt_in->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(params->fmt_in->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) + params->result = E_INVALIDARG; + else if(params->fmt_in->nAvgBytesPerSec == 0 || params->fmt_in->nBlockAlign == 0 || + fmtex->Samples.wValidBitsPerSample > params->fmt_in->wBitsPerSample) + params->result = E_INVALIDARG; + else if(fmtex->Samples.wValidBitsPerSample < params->fmt_in->wBitsPerSample) + goto unsupported; + else if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE && + (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) + goto unsupported; + } + if(FAILED(params->result)) return STATUS_SUCCESS; + + if(params->fmt_in->nBlockAlign != params->fmt_in->nChannels * params->fmt_in->wBitsPerSample / 8 || + params->fmt_in->nAvgBytesPerSec != params->fmt_in->nBlockAlign * params->fmt_in->nSamplesPerSec) + goto unsupported; + + if(params->fmt_in->nChannels == 0){ + params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + return STATUS_SUCCESS; + } + unit = get_audiounit(params->flow, params->dev_id); + + converter = NULL; + params->result = ca_setup_audiounit(params->flow, unit, params->fmt_in, &dev_desc, &converter); + AudioComponentInstanceDispose(unit); + if(FAILED(params->result)) goto unsupported; + if(converter) AudioConverterDispose(converter); + + params->result = S_OK; + return STATUS_SUCCESS; + +unsupported: + if(params->fmt_out){ + struct get_mix_format_params get_mix_params = + { + .flow = params->flow, + .dev_id = params->dev_id, + .fmt = params->fmt_out, + }; + + get_mix_format(&get_mix_params); + params->result = get_mix_params.result; + if(SUCCEEDED(params->result)) params->result = S_FALSE; + } + else params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, get_mix_format, + is_format_supported, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2ad2938a5d8..418bbfa00af 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -473,62 +473,6 @@ static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) return FALSE; } -static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID adevid) -{ - AudioComponentInstance unit; - AudioComponent comp; - AudioComponentDescription desc; - OSStatus sc; - - memset(&desc, 0, sizeof(desc)); - desc.componentType = kAudioUnitType_Output; - desc.componentSubType = kAudioUnitSubType_HALOutput; - desc.componentManufacturer = kAudioUnitManufacturer_Apple; - - if(!(comp = AudioComponentFindNext(NULL, &desc))){ - WARN("AudioComponentFindNext failed\n"); - return NULL; - } - - sc = AudioComponentInstanceNew(comp, &unit); - if(sc != noErr){ - WARN("AudioComponentInstanceNew failed: %x\n", (int)sc); - return NULL; - } - - if(dataflow == eCapture){ - UInt32 enableio; - - enableio = 1; - sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, - kAudioUnitScope_Input, 1, &enableio, sizeof(enableio)); - if(sc != noErr){ - WARN("Couldn't enable I/O on input element: %x\n", (int)sc); - AudioComponentInstanceDispose(unit); - return NULL; - } - - enableio = 0; - sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, - kAudioUnitScope_Output, 0, &enableio, sizeof(enableio)); - if(sc != noErr){ - WARN("Couldn't disable I/O on output element: %x\n", (int)sc); - AudioComponentInstanceDispose(unit); - return NULL; - } - } - - sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_CurrentDevice, - kAudioUnitScope_Global, 0, &adevid, sizeof(adevid)); - if(sc != noErr){ - WARN("Couldn't set audio unit device\n"); - AudioComponentInstanceDispose(unit); - return NULL; - } - - return unit; -} - HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; @@ -689,46 +633,6 @@ static void dump_fmt(const WAVEFORMATEX *fmt) } } -static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, - const WAVEFORMATEX *fmt) -{ - const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; - - desc->mFormatFlags = 0; - - if(fmt->wFormatTag == WAVE_FORMAT_PCM || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ - desc->mFormatID = kAudioFormatLinearPCM; - if(fmt->wBitsPerSample > 8) - desc->mFormatFlags = kAudioFormatFlagIsSignedInteger; - }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - desc->mFormatID = kAudioFormatLinearPCM; - desc->mFormatFlags = kAudioFormatFlagIsFloat; - }else if(fmt->wFormatTag == WAVE_FORMAT_MULAW || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_MULAW))){ - desc->mFormatID = kAudioFormatULaw; - }else if(fmt->wFormatTag == WAVE_FORMAT_ALAW || - (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_ALAW))){ - desc->mFormatID = kAudioFormatALaw; - }else - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - desc->mSampleRate = fmt->nSamplesPerSec; - desc->mBytesPerPacket = fmt->nBlockAlign; - desc->mFramesPerPacket = 1; - desc->mBytesPerFrame = fmt->nBlockAlign; - desc->mChannelsPerFrame = fmt->nChannels; - desc->mBitsPerChannel = fmt->wBitsPerSample; - desc->mReserved = 0; - - return S_OK; -} - static void session_init_vols(AudioSession *session, UINT channels) { if(session->channel_count < channels){ @@ -931,90 +835,6 @@ static void capture_resample(ACImpl *This) } } -static void dump_adesc(const char *aux, AudioStreamBasicDescription *desc) -{ - TRACE("%s: mSampleRate: %f\n", aux, desc->mSampleRate); - TRACE("%s: mBytesPerPacket: %u\n", aux, (unsigned int)desc->mBytesPerPacket); - TRACE("%s: mFramesPerPacket: %u\n", aux, (unsigned int)desc->mFramesPerPacket); - TRACE("%s: mBytesPerFrame: %u\n", aux, (unsigned int)desc->mBytesPerFrame); - TRACE("%s: mChannelsPerFrame: %u\n", aux, (unsigned int)desc->mChannelsPerFrame); - TRACE("%s: mBitsPerChannel: %u\n", aux, (unsigned int)desc->mBitsPerChannel); -} - -static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance unit, - const WAVEFORMATEX *fmt, AudioStreamBasicDescription *dev_desc, - AudioConverterRef *converter) -{ - OSStatus sc; - HRESULT hr; - - if(dataflow == eCapture){ - AudioStreamBasicDescription desc; - UInt32 size; - Float64 rate; - fenv_t fenv; - BOOL fenv_stored = TRUE; - - hr = ca_get_audiodesc(&desc, fmt); - if(FAILED(hr)) - return hr; - dump_adesc("requested", &desc); - - /* input-only units can't perform sample rate conversion, so we have to - * set up our own AudioConverter to support arbitrary sample rates. */ - size = sizeof(*dev_desc); - sc = AudioUnitGetProperty(unit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, 1, dev_desc, &size); - if(sc != noErr){ - WARN("Couldn't get unit format: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - dump_adesc("hardware", dev_desc); - - rate = dev_desc->mSampleRate; - *dev_desc = desc; - dev_desc->mSampleRate = rate; - - dump_adesc("final", dev_desc); - sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Output, 1, dev_desc, sizeof(*dev_desc)); - if(sc != noErr){ - WARN("Couldn't set unit format: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - /* AudioConverterNew requires divide-by-zero SSE exceptions to be masked */ - if(feholdexcept(&fenv)){ - WARN("Failed to store fenv state\n"); - fenv_stored = FALSE; - } - - sc = AudioConverterNew(dev_desc, &desc, converter); - - if(fenv_stored && fesetenv(&fenv)) - WARN("Failed to restore fenv state\n"); - - if(sc != noErr){ - WARN("Couldn't create audio converter: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - }else{ - hr = ca_get_audiodesc(dev_desc, fmt); - if(FAILED(hr)) - return hr; - - dump_adesc("final", dev_desc); - sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, 0, dev_desc, sizeof(*dev_desc)); - if(sc != noErr){ - WARN("Couldn't set format: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - } - - return S_OK; -} - static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration, REFERENCE_TIME period, const WAVEFORMATEX *fmt, @@ -1298,75 +1118,30 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient3(iface); - AudioStreamBasicDescription dev_desc; - AudioConverterRef converter; - AudioComponentInstance unit; - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; - HRESULT hr; + struct is_format_supported_params params; TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); + if(pwfx) dump_fmt(pwfx); - if(!pwfx || (mode == AUDCLNT_SHAREMODE_SHARED && !outpwfx)) - return E_POINTER; - - if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE) - return E_INVALIDARG; - - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - pwfx->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - - dump_fmt(pwfx); + params.dev_id = This->adevid; + params.flow = This->dataflow; + params.share = mode; + params.fmt_in = pwfx; + params.fmt_out = NULL; if(outpwfx){ *outpwfx = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - outpwfx = NULL; - } - - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - if(pwfx->nAvgBytesPerSec == 0 || - pwfx->nBlockAlign == 0 || - fmtex->Samples.wValidBitsPerSample > pwfx->wBitsPerSample) - return E_INVALIDARG; - if(fmtex->Samples.wValidBitsPerSample < pwfx->wBitsPerSample) - goto unsupported; - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE){ - if(fmtex->dwChannelMask == 0 || - fmtex->dwChannelMask & SPEAKER_RESERVED) - goto unsupported; - } + if(mode == AUDCLNT_SHAREMODE_SHARED) + params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out)); } + UNIX_CALL(is_format_supported, &params); - if(pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample / 8 || - pwfx->nAvgBytesPerSec != pwfx->nBlockAlign * pwfx->nSamplesPerSec) - goto unsupported; - - if(pwfx->nChannels == 0) - return AUDCLNT_E_UNSUPPORTED_FORMAT; - - unit = get_audiounit(This->dataflow, This->adevid); - - converter = NULL; - hr = ca_setup_audiounit(This->dataflow, unit, pwfx, &dev_desc, &converter); - AudioComponentInstanceDispose(unit); - if(FAILED(hr)) - goto unsupported; - - if(converter) - AudioConverterDispose(converter); - - return S_OK; - -unsupported: - if(outpwfx){ - hr = IAudioClient3_GetMixFormat(&This->IAudioClient3_iface, outpwfx); - if(FAILED(hr)) - return hr; - return S_FALSE; - } + if(params.result == S_FALSE) + *outpwfx = &params.fmt_out->Format; + else + CoTaskMemFree(params.fmt_out); - return AUDCLNT_E_UNSUPPORTED_FORMAT; + return params.result; } static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e247b789d55..23de92ecfdd 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -83,12 +83,23 @@ struct get_mix_format_params HRESULT result; }; +struct is_format_supported_params +{ + EDataFlow flow; + DWORD dev_id; + AUDCLNT_SHAREMODE share; + const WAVEFORMATEX *fmt_in; + WAVEFORMATEXTENSIBLE *fmt_out; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, unix_create_stream, unix_release_stream, unix_get_mix_format, + unix_is_format_supported, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 23 Nov '21

23 Nov '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- Corrected the formatting of translation. My last patch seems to break down something on translation progress site. po/zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3371b0a1267..67c973cb091 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-20 21:33+0800\n" +"PO-Revision-Date: 2021-11-23 14:40+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -17352,7 +17352,7 @@ msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：對這個處理程序進行除錯可能會導致資料遺失。\n" +"警告: 對這個處理程序進行除錯可能會導致資料遺失。\n" "您確定要附加除錯程式嗎?" #: programs/taskmgr/taskmgr.rc:314 @@ -17440,8 +17440,8 @@ msgid "" msgstr "" "用法:\n" " uninstaller [選項]\n" -"選項:\n" "\n" +"選項:\n" " --help\t 顯示這個資訊。\n" " --list\t 列出安裝在這個 Wine prefix 中的所有應用程式。\n" " --remove {GUID} 解除安裝指定的應用程式。\n" -- 2.33.0.windows.2

2 1

[PATCH] windows.media.speech: Add stub SpeechSynthesizer class.
by Paul Gofman 23 Nov '21

23 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/windows.media.speech/main.c | 143 +++++++++++++++++++++- dlls/windows.media.speech/tests/speech.c | 19 ++- include/Makefile.in | 1 + include/windows.media.idl | 48 ++++++++ include/windows.media.speechsynthesis.idl | 41 +++++++ 5 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 include/windows.media.idl diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index e34fa9d16b8..1802d19dff8 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winstring.h" #include "wine/debug.h" +#include "wine/heap.h" #include "objbase.h" #include "initguid.h" @@ -171,6 +172,132 @@ static struct voice_information_vector all_voices = 0 }; +struct speech_synthesizer +{ + ISpeechSynthesizer ISpeechSynthesizer_iface; + LONG ref; +}; + +static inline struct speech_synthesizer *impl_from_ISpeechSynthesizer(ISpeechSynthesizer *iface) +{ + return CONTAINING_RECORD(iface, struct speech_synthesizer, ISpeechSynthesizer_iface); +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_QueryInterface( + ISpeechSynthesizer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_ISpeechSynthesizer)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE speech_synthesizer_AddRef( + ISpeechSynthesizer *iface) +{ + struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + + TRACE("iface %p, ref %u.\n", iface, ref); + + return ref; +} + +static ULONG STDMETHODCALLTYPE speech_synthesizer_Release( + ISpeechSynthesizer *iface) +{ + struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + + TRACE("iface %p, ref %u.\n", iface, ref); + + if (!ref) + heap_free(impl); + + return ref; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_GetIids( + ISpeechSynthesizer *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_GetRuntimeClassName( + ISpeechSynthesizer *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub.\n", iface, class_name); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_GetTrustLevel( + ISpeechSynthesizer *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_SynthesizeTextToStreamAsync(ISpeechSynthesizer *iface, + HSTRING text, IAsyncOperation_SpeechSynthesisStream **operation) +{ + FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_SynthesizeSsmlToStreamAsync(ISpeechSynthesizer *iface, + HSTRING ssml, IAsyncOperation_SpeechSynthesisStream **operation) +{ + FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_put_Voice(ISpeechSynthesizer *iface, IVoiceInformation *value) +{ + FIXME("iface %p, value %p stub.\n", iface, value); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE speech_synthesizer_get_Voice(ISpeechSynthesizer *iface, IVoiceInformation **value) +{ + FIXME("iface %p, value %p stub.\n", iface, value); + + return E_NOTIMPL; +} + +static const struct ISpeechSynthesizerVtbl speech_synthesizer_vtbl = +{ + /* IUnknown methods */ + speech_synthesizer_QueryInterface, + speech_synthesizer_AddRef, + speech_synthesizer_Release, + /* IInspectable methods */ + speech_synthesizer_GetIids, + speech_synthesizer_GetRuntimeClassName, + speech_synthesizer_GetTrustLevel, + /* ISpeechSynthesizer methods */ + speech_synthesizer_SynthesizeTextToStreamAsync, + speech_synthesizer_SynthesizeSsmlToStreamAsync, + speech_synthesizer_put_Voice, + speech_synthesizer_get_Voice, +}; + struct windows_media_speech { IActivationFactory IActivationFactory_iface; @@ -259,8 +386,20 @@ static HRESULT STDMETHODCALLTYPE windows_media_speech_GetTrustLevel( static HRESULT STDMETHODCALLTYPE windows_media_speech_ActivateInstance( IActivationFactory *iface, IInspectable **instance) { - FIXME("iface %p, instance %p stub!\n", iface, instance); - return E_NOTIMPL; + struct speech_synthesizer *obj; + + TRACE("iface %p, instance %p.\n", iface, instance); + + if (!(obj = heap_alloc_zero(sizeof(*obj)))) + { + *instance = NULL; + return E_OUTOFMEMORY; + } + + obj->ISpeechSynthesizer_iface.lpVtbl = &speech_synthesizer_vtbl; + obj->ref = 1; + *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface; + return S_OK; } static const struct IActivationFactoryVtbl activation_factory_vtbl = diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index c949b35900b..e27a2bfa4d4 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -44,9 +44,11 @@ static void test_SpeechSynthesizer(void) IVoiceInformation *voice; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; + ISpeechSynthesizer *synthesizer; HSTRING str; HRESULT hr; UINT32 size; + ULONG ref; hr = RoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); @@ -107,8 +109,23 @@ static void test_SpeechSynthesizer(void) IAgileObject_Release(agile_object); IInspectable_Release(inspectable); - IActivationFactory_Release(factory); + hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer); + ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); + + hr = RoActivateInstance(str, &inspectable); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ref = ISpeechSynthesizer_Release(synthesizer); + ok(ref == 1, "Got unexpected ref %u.\n", ref); + + ref = IInspectable_Release(inspectable); + ok(!ref, "Got unexpected ref %u.\n", ref); + + IActivationFactory_Release(factory); WindowsDeleteString(str); RoUninitialize(); diff --git a/include/Makefile.in b/include/Makefile.in index 756e25dcc82..530c5b73f19 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -775,6 +775,7 @@ SOURCES = \ windows.gaming.input.idl \ windows.globalization.idl \ windows.h \ + windows.media.idl \ windows.media.devices.idl \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ diff --git a/include/windows.media.idl b/include/windows.media.idl new file mode 100644 index 00000000000..94a9a516245 --- /dev/null +++ b/include/windows.media.idl @@ -0,0 +1,48 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Media { + apicontract MediaControlContract; + interface IMediaControl; + } +} + +namespace Windows { + namespace Media { + [contractversion(1.0)] + apicontract MediaControlContract { + } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [uuid(1803def8-dca5-4b6f-9c20-e3d3c0643625)] + interface IMediaMarker : IInspectable + { + [propget] HRESULT Time([out] [retval] Windows.Foundation.TimeSpan* value); + [propget] HRESULT MediaMarkerType([out] [retval] HSTRING* value); + [propget] HRESULT Text([out] [retval] HSTRING* value); + } + } +} diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index af4466681dc..169dfdf5a5e 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -22,6 +22,7 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.media.idl"; namespace Windows { namespace Foundation { @@ -35,12 +36,20 @@ namespace Windows { interface ISpeechSynthesizer; interface ISpeechSynthesizer2; interface IVoiceInformation; + interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesisStream; } } } +namespace Windows { + namespace Media { + interface IMediaMarker; + } +} + namespace Windows { namespace Media { namespace SpeechSynthesis { @@ -48,6 +57,9 @@ namespace Windows { interface Windows.Foundation.Collections.IIterator<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IIterable<Windows.Media.SpeechSynthesis.VoiceInformation*>; interface Windows.Foundation.Collections.IVectorView<Windows.Media.SpeechSynthesis.VoiceInformation*>; + interface Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>; + interface Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; + interface Windows.Foundation.AsyncOperationCompletedHandler<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*>; } } } @@ -63,6 +75,27 @@ namespace Windows { Female = 1 }; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesisStream)] + [uuid(83E46E93-244C-4622-BA0B-6229C4D0D65D)] + interface ISpeechSynthesisStream : IInspectable + { + [propget] HRESULT Markers([out] [retval] Windows.Foundation.Collections.IVectorView<Windows.Media.IMediaMarker*>** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(ce9f7c76-97f4-4ced-ad68-d51c458e45c6) + ] + interface ISpeechSynthesizer : IInspectable + { + HRESULT SynthesizeTextToStreamAsync([in] HSTRING text, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + HRESULT SynthesizeSsmlToStreamAsync([in] HSTRING Ssml, [out] [retval] Windows.Foundation.IAsyncOperation<Windows.Media.SpeechSynthesis.SpeechSynthesisStream*> **operation); + [propput] HRESULT Voice([in] VoiceInformation *value); + [propget] HRESULT Voice([out] [retval] VoiceInformation **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -97,6 +130,14 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + [marshaling_behavior(agile)] + runtimeclass SpeechSynthesisStream + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesisStream; + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0), -- 2.33.1

3 2

[PATCH 1/3] chcp: Add internationalization support
by Hugh McMaster 23 Nov '21

23 Nov '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/chcp.com/Makefile.in | 5 ++- programs/chcp.com/chcp.rc | 29 ++++++++++++++ programs/chcp.com/main.c | 75 ++++++++++++++++++++++++++++++++--- programs/chcp.com/resource.h | 24 +++++++++++ 4 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 programs/chcp.com/chcp.rc create mode 100644 programs/chcp.com/resource.h diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in index 46ed25f3cea..2f6d273990a 100644 --- a/programs/chcp.com/Makefile.in +++ b/programs/chcp.com/Makefile.in @@ -1,6 +1,9 @@ -MODULE = chcp.com +MODULE = chcp.com +DELAYIMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode C_SRCS = \ main.c + +RC_SRCS = chcp.rc diff --git a/programs/chcp.com/chcp.rc b/programs/chcp.com/chcp.rc new file mode 100644 index 00000000000..04d90d05942 --- /dev/null +++ b/programs/chcp.com/chcp.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_ACTIVE_CODE_PAGE, "Active code page: %1!u!\n" + STRING_INVALID_CODE_PAGE, "Invalid code page\n" +} diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 6ace10cf93e..5b3486a4366 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -16,20 +16,85 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" +#include <windows.h> +#include <stdlib.h> +#include "resource.h" -#include "wincon.h" -#include "stdlib.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(chcp); +static void output_writeconsole(const WCHAR *str, DWORD wlen) +{ + DWORD count, ret; + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + msgA = malloc(len); + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + free(msgA); + } +} + +static void output_formatstring(const WCHAR *fmt, va_list va_args) +{ + WCHAR *str; + DWORD len; + + len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, + fmt, 0, 0, (WCHAR *)&str, 0, &va_args); + if (!len && GetLastError() != ERROR_NO_WORK_DONE) + { + WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(fmt)); + return; + } + output_writeconsole(str, len); + LocalFree(str); +} + +static void WINAPIV output_message(unsigned int id, ...) +{ + WCHAR *fmt = NULL; + int len; + va_list va_args; + + if (!(len = LoadStringW(GetModuleHandleW(NULL), id, (WCHAR *)&fmt, 0))) + { + WINE_FIXME("LoadString failed with %d\n", GetLastError()); + return; + } + + len++; + fmt = malloc(len * sizeof(WCHAR)); + if (!fmt) return; + + LoadStringW(GetModuleHandleW(NULL), id, fmt, len); + + va_start(va_args, id); + output_formatstring(fmt, va_args); + va_end(va_args); + + free(fmt); +} + int __cdecl wmain(int argc, WCHAR *argv[]) { int i; if (argc == 1) { - printf("Active code page: %d\n", GetConsoleCP()); + output_message(STRING_ACTIVE_CODE_PAGE, GetConsoleCP()); return 0; } else if (argc == 2) @@ -39,7 +104,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!success) { - printf("Invalid code page\n"); + output_message(STRING_INVALID_CODE_PAGE); } return !success; } diff --git a/programs/chcp.com/resource.h b/programs/chcp.com/resource.h new file mode 100644 index 00000000000..200cbb11d18 --- /dev/null +++ b/programs/chcp.com/resource.h @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +/* Translation IDs */ + +#define STRING_ACTIVE_CODE_PAGE 100 +#define STRING_INVALID_CODE_PAGE 101 -- 2.34.0

1 2

[PATCH] dxva2: Introduce progressive processor device.
by Nikolay Sivov 23 Nov '21

23 Nov '21

The point is to provide a device, with similar caps and NV12 support, while keeping software device on its own, the way it should be. This is based on research by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxva2/main.c | 126 +++++++++++++++++++++++++++------ dlls/dxva2/tests/dxva2.c | 149 +++++++++++++++++++++++++++++++++++++++ dlls/evr/mixer.c | 2 + 3 files changed, 257 insertions(+), 20 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 401b5cc976b..5beac4164a6 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxva2); +#define D3DFMT_NV12 MAKEFOURCC('N','V','1','2') + enum device_handle_flags { HANDLE_FLAG_OPEN = 0x1, @@ -125,6 +127,22 @@ static struct video_processor *impl_from_IDirectXVideoProcessor(IDirectXVideoPro return CONTAINING_RECORD(iface, struct video_processor, IDirectXVideoProcessor_iface); } +static const DXVA2_VideoProcessorCaps software_processor_caps = +{ + .DeviceCaps = DXVA2_VPDev_SoftwareDevice, + .InputPool = D3DPOOL_SYSTEMMEM, + .VideoProcessorOperations = DXVA2_VideoProcess_PlanarAlpha | DXVA2_VideoProcess_YUV2RGB | + DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY | DXVA2_VideoProcess_SubRects | + DXVA2_VideoProcess_SubStreams | DXVA2_VideoProcess_SubStreamsExtended | DXVA2_VideoProcess_YUV2RGBExtended, +}; + +static const DXVA2_VideoProcessorCaps progressive_processor_caps = +{ + .DeviceCaps = DXVA2_VPDev_HardwareDevice, + .InputPool = D3DPOOL_DEFAULT, + .VideoProcessorOperations = DXVA2_VideoProcess_YUV2RGB | DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY, +}; + static HRESULT WINAPI video_processor_QueryInterface(IDirectXVideoProcessor *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IDirectXVideoProcessor) || @@ -210,12 +228,11 @@ static HRESULT WINAPI video_processor_GetVideoProcessorCaps(IDirectXVideoProcess if (IsEqualGUID(&processor->device, &DXVA2_VideoProcSoftwareDevice)) { - memset(caps, 0, sizeof(*caps)); - caps->DeviceCaps = DXVA2_VPDev_SoftwareDevice; - caps->InputPool = D3DPOOL_SYSTEMMEM; - caps->VideoProcessorOperations = DXVA2_VideoProcess_PlanarAlpha | DXVA2_VideoProcess_YUV2RGB | - DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY | DXVA2_VideoProcess_SubRects | - DXVA2_VideoProcess_SubStreams | DXVA2_VideoProcess_SubStreamsExtended | DXVA2_VideoProcess_YUV2RGBExtended; + *caps = software_processor_caps; + } + else if (IsEqualGUID(&processor->device, &DXVA2_VideoProcProgressiveDevice)) + { + *caps = progressive_processor_caps; } else { @@ -419,28 +436,66 @@ static HRESULT WINAPI device_manager_processor_service_RegisterVideoProcessorSof return E_NOTIMPL; } -static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) +struct dxva_processor_device_desc +{ + const GUID *guid; + const D3DFORMAT *input_formats; +}; + +static const D3DFORMAT software_processor_input_formats[] = { - return video_desc->Format == D3DFMT_A8R8G8B8 || - video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2; + D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, 0 +}; + +static const D3DFORMAT progressive_processor_input_formats[] = +{ + D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, D3DFMT_NV12, 0 +}; + +static const struct dxva_processor_device_desc processor_devices[] = +{ + { &DXVA2_VideoProcProgressiveDevice, progressive_processor_input_formats }, + { &DXVA2_VideoProcSoftwareDevice, software_processor_input_formats }, +}; + +static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc, const D3DFORMAT *formats) +{ + while (*formats) + { + if (*formats == video_desc->Format) return TRUE; + formats++; + } + + return FALSE; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( IDirectXVideoProcessorService *iface, const DXVA2_VideoDesc *video_desc, UINT *count, GUID **guids) { + unsigned int i; + FIXME("%p, %p, %p, %p semi-stub.\n", iface, video_desc, count, guids); *count = 0; - if (!dxva_is_supported_stream_format(video_desc)) - return E_FAIL; - - if (!(*guids = CoTaskMemAlloc(sizeof(**guids)))) + if (!(*guids = CoTaskMemAlloc(ARRAY_SIZE(processor_devices) * sizeof(**guids)))) return E_OUTOFMEMORY; - memcpy(*guids, &DXVA2_VideoProcSoftwareDevice, sizeof(**guids)); - *count = 1; + for (i = 0; i < ARRAY_SIZE(processor_devices); ++i) + { + if (dxva_is_supported_stream_format(video_desc, processor_devices[i].input_formats)) + { + (*guids)[*count] = *processor_devices[i].guid; + *count += 1; + } + } + + if (!*count) + { + CoTaskMemFree(*guids); + *guids = NULL; + return E_FAIL; + } return S_OK; } @@ -453,7 +508,7 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - if (!dxva_is_supported_stream_format(video_desc)) + if (!dxva_is_supported_stream_format(video_desc, software_processor_input_formats)) { WARN("Unsupported content format %#x.\n", video_desc->Format); return E_FAIL; @@ -468,6 +523,23 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa return S_OK; } + else if (IsEqualGUID(deviceguid, &DXVA2_VideoProcProgressiveDevice)) + { + if (!dxva_is_supported_stream_format(video_desc, progressive_processor_input_formats)) + { + WARN("Unsupported content format %#x.\n", video_desc->Format); + return E_FAIL; + } + + if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) + return E_OUTOFMEMORY; + + *count = 2; + (*formats)[0] = D3DFMT_X8R8G8B8; + (*formats)[1] = D3DFMT_NV12; + + return S_OK; + } else FIXME("Unsupported device %s.\n", debugstr_guid(deviceguid)); @@ -484,12 +556,26 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorSubStrea } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorCaps( - IDirectXVideoProcessorService *iface, REFGUID deviceguid, const DXVA2_VideoDesc *video_desc, + IDirectXVideoProcessorService *iface, REFGUID device, const DXVA2_VideoDesc *video_desc, D3DFORMAT rt_format, DXVA2_VideoProcessorCaps *caps) { - FIXME("%p, %s, %p, %u, %p.\n", iface, debugstr_guid(deviceguid), video_desc, rt_format, caps); + TRACE("%p, %s, %p, %u, %p.\n", iface, debugstr_guid(device), video_desc, rt_format, caps); - return E_NOTIMPL; + if (IsEqualGUID(device, &DXVA2_VideoProcSoftwareDevice)) + { + *caps = software_processor_caps; + } + else if (IsEqualGUID(device, &DXVA2_VideoProcProgressiveDevice)) + { + *caps = progressive_processor_caps; + } + else + { + FIXME("Unrecognized device %s.\n", debugstr_guid(device)); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI device_manager_processor_service_GetProcAmpRange( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index e3307032ad4..01f8f568e6a 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -546,8 +546,157 @@ done: DestroyWindow(window); } +static BOOL check_format_list(D3DFORMAT format, const D3DFORMAT *list, unsigned int count) +{ + unsigned int i; + for (i = 0; i < count; ++i) + if (list[i] == format) return TRUE; + return FALSE; +} + +static void test_progressive_device(void) +{ + static const unsigned int processor_ops = DXVA2_VideoProcess_YUV2RGB | + DXVA2_VideoProcess_StretchX | DXVA2_VideoProcess_StretchY; + IDirectXVideoProcessorService *service; + IDirectXVideoProcessor *processor; + IDirect3DDeviceManager9 *manager; + D3DFORMAT format, *rt_formats; + DXVA2_VideoProcessorCaps caps; + DXVA2_VideoDesc video_desc; + IDirect3DDevice9 *device; + unsigned int count, i, j; + GUID guid, *guids; + IDirect3D9 *d3d; + HANDLE handle; + HWND window; + UINT token; + HRESULT hr; + + static const D3DFORMAT input_formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_YUY2, + MAKEFOURCC('N','V','1','2'), + }; + + static const D3DFORMAT support_rt_formats[] = + { + D3DFMT_X8R8G8B8, + MAKEFOURCC('N','V','1','2'), + D3DFMT_YUY2, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + handle = NULL; + hr = IDirect3DDeviceManager9_OpenDeviceHandle(manager, &handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_GetVideoService(manager, handle, &IID_IDirectXVideoProcessorService, + (void **)&service); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + memset(&video_desc, 0, sizeof(video_desc)); + video_desc.SampleWidth = 64; + video_desc.SampleHeight = 64; + video_desc.Format = MAKEFOURCC('N','V','1','2'); + + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcProgressiveDevice, &video_desc, + D3DFMT_A8R8G8B8, 0, &processor); + if (FAILED(hr)) + { + win_skip("VideoProcProgressiveDevice is not supported.\n"); + goto unsupported; + } + IDirectXVideoProcessor_Release(processor); + + for (i = 0; i < ARRAY_SIZE(input_formats); ++i) + { + init_video_desc(&video_desc, input_formats[i]); + + /* Check that progressive device is returned for given input format. */ + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count > 0, "Unexpected device count.\n"); + for (j = 0; j < count; ++j) + { + if (IsEqualGUID(&guids[j], &DXVA2_VideoProcProgressiveDevice)) break; + } + ok(j < count, "Expected progressive device for format %#x.\n", input_formats[i]); + CoTaskMemFree(guids); + + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(service, &DXVA2_VideoProcProgressiveDevice, + &video_desc, &count, &rt_formats); + ok(hr == S_OK, "Unexpected hr %#x, format %d.\n", hr, input_formats[i]); + ok(count > 0, "Unexpected format count %u.\n", count); + for (j = 0; j < count; ++j) + { + ok(check_format_list(rt_formats[j], support_rt_formats, ARRAY_SIZE(support_rt_formats)), + "Unexpected rt format %#x for input format %#x.\n", rt_formats[j], input_formats[i]); + } + CoTaskMemFree(rt_formats); + } + + memset(&video_desc, 0, sizeof(video_desc)); + video_desc.SampleWidth = 64; + video_desc.SampleHeight = 64; + video_desc.Format = MAKEFOURCC('N','V','1','2'); + + hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &DXVA2_VideoProcProgressiveDevice, &video_desc, + D3DFMT_A8R8G8B8, 0, &processor); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(caps.DeviceCaps == DXVA2_VPDev_HardwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); + ok(caps.InputPool == D3DPOOL_DEFAULT, "Unexpected input pool %#x.\n", caps.InputPool); + ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); + ok(!caps.NumBackwardRefSamples, "Unexpected sample count.\n"); + ok(!caps.Reserved, "Unexpected field.\n"); + ok((caps.VideoProcessorOperations & processor_ops) == processor_ops, "Unexpected processor operations %#x.\n", + caps.VideoProcessorOperations); + + hr = IDirectXVideoProcessor_GetCreationParameters(processor, &guid, NULL, &format, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &DXVA2_VideoProcProgressiveDevice), "Unexpected device guid.\n"); + ok(format == D3DFMT_A8R8G8B8, "Unexpected format %u.\n", format); + + IDirectXVideoProcessor_Release(processor); + +unsupported: + IDirectXVideoProcessorService_Release(service); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(manager, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDevice9_Release(device); + IDirect3DDeviceManager9_Release(manager); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(dxva2) { test_device_manager(); test_video_processor(); + test_progressive_device(); } diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 8fe80c2f4a9..5af5b2861b3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -956,6 +956,8 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, &video_desc, rt_format, MAX_MIXER_INPUT_SUBSTREAMS, &mixer->processor))) { + ERR("picked dxva device %s\n", debugstr_guid(&mixer->output.rt_formats[i].device)); + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&mixer->aperture, sizeof(mixer->aperture), NULL))) { -- 2.33.0

1 0

[PATCH] d3d10/effect: Fix freed register table pointer (Coverity).
by Nikolay Sivov 23 Nov '21

23 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1b2aeb910af..cd6a3cfb238 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -319,7 +319,7 @@ static void d3d10_effect_preshader_clear(struct d3d10_effect_preshader *p) unsigned int i; for (i = 0; i < ARRAY_SIZE(p->reg_tables); ++i) - heap_free(&p->reg_tables[i].f); + heap_free(p->reg_tables[i].f); if (p->code) ID3D10Blob_Release(p->code); heap_free(p->vars); -- 2.33.0

2 1

[v2 PATCH 1/2] d3d10/effect: Parse through value expressions.
by Nikolay Sivov 23 Nov '21

23 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 35 +++++++++++++++++ dlls/d3d10/tests/effect.c | 78 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 7f83fb1182a..b35711b55e5 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -52,6 +52,7 @@ enum d3d10_effect_object_operation D3D10_EOO_CONST_INDEX = 3, D3D10_EOO_VAR_INDEX = 4, D3D10_EOO_INDEX_EXPRESSION = 5, + D3D10_EOO_VALUE_EXPRESSION = 6, D3D10_EOO_ANONYMOUS_SHADER = 7, }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3f35e9cc28a..d763c3fdeaf 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -289,6 +289,10 @@ struct d3d10_effect_prop_dependency struct d3d10_effect_variable *v; struct d3d10_effect_preshader index; } index_expr; + struct + { + struct d3d10_effect_preshader value; + } value_expr; }; }; @@ -392,6 +396,9 @@ static void d3d10_effect_clear_prop_dependencies(struct d3d10_effect_prop_depend case D3D10_EOO_INDEX_EXPRESSION: d3d10_effect_preshader_clear(&dep->index_expr.index); break; + case D3D10_EOO_VALUE_EXPRESSION: + d3d10_effect_preshader_clear(&dep->value_expr.value); + break; } } heap_free(d->entries); @@ -2632,6 +2639,34 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return d3d10_effect_add_prop_dependency(d, &dep); + case D3D10_EOO_VALUE_EXPRESSION: + + if (value_offset >= data_size || !require_space(value_offset, 1, sizeof(uint32_t), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", value_offset, (long)data_size); + return E_FAIL; + } + + data_ptr = data + value_offset; + read_dword(&data_ptr, &blob_size); + + if (!require_space(value_offset, 1, sizeof(uint32_t) + blob_size, data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", value_offset, (long)data_size); + return E_FAIL; + } + + dep.id = id; + dep.idx = idx; + dep.operation = operation; + if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.value_expr.value))) + { + WARN("Failed to parse preshader, hr %#x.\n", hr); + return hr; + } + + return d3d10_effect_add_prop_dependency(d, &dep); + case D3D10_EOO_ANONYMOUS_SHADER: /* Anonymous shader */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7c2bba6d818..eae0036c0b6 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -7947,6 +7947,83 @@ static void test_effect_index_expression(void) ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +float4 g_var; +float4 g_var2; +technique10 tech +{ + pass p0 + { + SetBlendState( NULL, g_var + 0.1f + g_var2, 0 ); + } + pass p1 + { + SetBlendState( NULL, g_var.x + g_var2 + g_var.y, 0 ); + } +} +#endif +static DWORD fx_test_value_expression[] = +{ + 0x43425844, 0xe517f17c, 0xe44eaede, 0xe4fd1240, 0xc67d5084, 0x00000001, 0x0000047c, 0x00000001, + 0x00000024, 0x30315846, 0x00000450, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, + 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, + 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x63657400, 0x30700068, 0x00016000, + 0x42584400, 0x312ce543, 0xc3ebc897, 0xea47c0a2, 0x8a710323, 0x000001d2, 0x00016000, 0x00000300, + 0x00002c00, 0x0000d400, 0x0000f000, 0x41544300, 0x0000a042, 0x00001c00, 0x00007700, 0x58040000, + 0x00000246, 0x00001c00, 0x00010000, 0x00007400, 0x00004400, 0x00000200, 0x00000100, 0x00004c00, + 0x00000000, 0x00005c00, 0x01000200, 0x00000100, 0x00006400, 0x00000000, 0x765f6700, 0xab007261, + 0x030001ab, 0x04000100, 0x00000100, 0x00000000, 0x765f6700, 0x00327261, 0x030001ab, 0x04000100, + 0x00000100, 0x00000000, 0x00787400, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, + 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00001434, 0x00000400, + 0xcccccd00, 0x0000003d, 0x00000000, 0x00000000, 0x4c584600, 0x00006843, 0x00000200, 0x40000400, + 0x00000220, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000400, 0x00000000, + 0x00000700, 0x00000000, 0x40000400, 0x000002a0, 0x00000000, 0x00000100, 0x00000000, 0x00000000, + 0x00000700, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, + 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00317000, 0x00000150, + 0x43425844, 0xc6a29e4c, 0x6292ed35, 0xd90bb8cb, 0x50dcd25f, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x000000d4, 0x000000e0, 0x42415443, 0x000000a0, 0x0000001c, 0x00000077, 0x46580400, + 0x00000002, 0x0000001c, 0x00000100, 0x00000074, 0x00000044, 0x00000002, 0x00000001, 0x0000004c, + 0x00000000, 0x0000005c, 0x00010002, 0x00000001, 0x00000064, 0x00000000, 0x61765f67, 0xabab0072, + 0x00030001, 0x00040001, 0x00000001, 0x00000000, 0x61765f67, 0xab003272, 0x00030001, 0x00040001, + 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000004, 0x00000000, + 0x434c5846, 0x00000068, 0x00000002, 0xa0400004, 0x00000002, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000007, 0x00000000, 0xa0400004, 0x00000002, + 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000004, + 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000001, 0x00000002, 0x00000000, 0x00000001, + 0x00000002, 0x00000000, 0x00000004, 0x00000020, 0x00000000, 0x00000002, 0xffffffff, 0x00000000, + 0x00000030, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000036, + 0x00000014, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x0000003d, 0x00000002, + 0x00000000, 0x00000042, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000045, + 0x0000000b, 0x00000000, 0x00000001, 0x000001a9, 0x00000002, 0x00000000, 0x00000001, 0x000001b5, + 0x000001c1, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x000001c4, 0x0000000b, + 0x00000000, 0x00000001, 0x00000318, 0x00000002, 0x00000000, 0x00000001, 0x00000324, +}; + +static void test_effect_value_expression(void) +{ + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_value_expression, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -7972,4 +8049,5 @@ START_TEST(effect) test_effect_raw_value(); test_effect_dynamic_numeric_field(); test_effect_index_expression(); + test_effect_value_expression(); } -- 2.33.0

2 3

[PATCH v2] conhost: Only use the maximum character width if a double-byte character set is in use
by Hugh McMaster 23 Nov '21

23 Nov '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 319463537d5..7ad0d48effd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -646,7 +646,7 @@ static HFONT select_font_config( struct console_config *config, unsigned int cp, lstrcpyW( config->face_name, lf->lfFaceName ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize == 2) config->cell_width = tm.tmMaxCharWidth; return font; @@ -713,7 +713,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) font_info->width = tm.tmMaxCharWidth; if (console->window->font) DeleteObject( console->window->font ); -- 2.34.0

1 0

[PATCH 1/6] wined3d: Respect the BO address offset when flipping the framebuffer in software.
by Zebediah Figura 23 Nov '21

23 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/surface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 79dc0bd06b6..9c6f5e18c28 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -419,8 +419,8 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i unsigned int restore_idx; BYTE *row, *top, *bottom; BOOL src_is_upside_down; + BYTE *mem = NULL; unsigned int i; - BYTE *mem; wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); @@ -504,8 +504,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i mem = GL_EXTCALL(glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_WRITE)); checkGLcall("glMapBuffer"); } - else - mem = data.addr; + mem += (uintptr_t)data.addr; top = mem; bottom = mem + row_pitch * (height - 1); -- 2.33.0

3 15

[PATCH 1/2] oleacc/tests: Fix failure messages in test_AccessibleObjectFromEvent
by Alex Henrie 23 Nov '21

23 Nov '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/oleacc/tests/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 62346ffed01..8c234aee8aa 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -720,7 +720,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 1, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == 1, "got %#x, expected 1\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent); SET_EXPECT(Accessible_get_accName); V_I4(&cid) = 0; @@ -736,7 +736,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible), "acc == &Accessible\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 2, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == 2, "got %#x, expected 2\n", V_I4(&cid)); SET_EXPECT(Accessible_get_accParent); SET_EXPECT(Accessible_get_accName); V_I4(&cid) = 0; @@ -752,7 +752,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); todo_wine ok(!iface_cmp((IUnknown*)acc, (IUnknown*)&Accessible_child), "acc == &Accessible_child\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); SET_EXPECT(Accessible_child_get_accParent); SET_EXPECT(Accessible_child_get_accName); hr = IAccessible_get_accName(acc, cid, NULL); @@ -767,7 +767,7 @@ static void test_AccessibleObjectFromEvent(void) ok(hr == S_OK, "got %#x\n", hr); ok(acc == &Accessible_child, "acc != &Accessible_child\n"); ok(V_VT(&cid) == VT_I4, "got %#x, expected %#x\n", V_VT(&cid), VT_I4); - ok(V_I4(&cid) == 0, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); + ok(V_I4(&cid) == CHILDID_SELF, "got %#x, expected %#x\n", V_I4(&cid), CHILDID_SELF); SET_EXPECT(Accessible_child_get_accName); hr = IAccessible_get_accName(acc, cid, NULL); ok(hr == E_INVALIDARG, "get_accName returned %x\n", hr); -- 2.34.0

3 3

[PATCH 1/3] kernel32/tests: Test whether every element of the CPINFO.LeadByte array is NUL
by Hugh McMaster 23 Nov '21

23 Nov '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/locale.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index fa0ec374d34..4fb30eb5318 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3962,6 +3962,7 @@ static void test_GetCPInfo(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF7, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) @@ -3970,14 +3971,19 @@ static void test_GetCPInfo(void) } else { + unsigned int i; + ok(ret, "GetCPInfo(CP_UTF7) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + for (i = 2; i < sizeof(cpinfo.LeadByte); i++) + todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); } + memset(cpinfo.LeadByte, '-', ARRAY_SIZE(cpinfo.LeadByte)); SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF8, &cpinfo); if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) @@ -3986,11 +3992,15 @@ static void test_GetCPInfo(void) } else { + unsigned int i; + ok(ret, "GetCPInfo(CP_UTF8) error %u\n", GetLastError()); ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + for (i = 2; i < sizeof(cpinfo.LeadByte); i++) + todo_wine ok(!cpinfo.LeadByte[i], "expected NUL byte in index %u\n", i); ok(cpinfo.MaxCharSize == 4 || broken(cpinfo.MaxCharSize == 3) /* win9x */, "expected 4, got %u\n", cpinfo.MaxCharSize); } -- 2.34.0

2 4

[PATCH 00/12] winecoreaudio: Move more mmdevapi calls to the unixlib.
by Huw Davies 23 Nov '21

23 Nov '21

This series is longer than I'd normally send but: i. It's mainly just moving blocks of code around. ii. It would be nice to get winecoreaudio converted to PE before the code-freeze. After this series there are eight patches to finish the mmdevapi move and a further 24 patches to move the midi stuff. Huw D. M. Davies (12): winecoreaudio: Move is_format_supported to the unixlib. winecoreaudio: Add a temporary capture_resample syscall. winecoreaudio: Move get_buffer_size to the unixlib. winecoreaudio: Move get_latency to the unixlib. winecoreaudio: Move get_current_padding to the unixlib. winecoreaudio: Move start to the unixlib. winecoreaudio: Move stop to the unixlib. winecoreaudio: Move reset to the unixlib. winecoreaudio: Move get_render_buffer to the unixlib. winecoreaudio: Move release_render_buffer to the unixlib. winecoreaudio: Move get_capture_buffer to the unixlib. winecoreaudio: Move release_capture_buffer to the unixlib. dlls/winecoreaudio.drv/coreaudio.c | 550 +++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 820 +++-------------------------- dlls/winecoreaudio.drv/unixlib.h | 96 ++++ 3 files changed, 730 insertions(+), 736 deletions(-) -- 2.23.0

1 0

[PATCH resend 1/2] winemenubuilder: Skip desktop integration for certain associations
by Alex Henrie 23 Nov '21

23 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- loader/wine.inf.in | 6 +++ programs/winemenubuilder/winemenubuilder.c | 43 +++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 49f45e6eed3..75c22288547 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -507,6 +507,12 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +HKCU,Software\Wine\FileOpenNoIntegration,"ieframe",,"ieframe.dll" +HKCU,Software\Wine\FileOpenNoIntegration,"iexplore",,"iexplore.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"notepad",,"notepad.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"winebrowser",,"winebrowser.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"wordpad",,"wordpad.exe" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 16dc32a8859..a88cec1d76c 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1956,6 +1956,35 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } +static BOOL on_exclude_list(const WCHAR *command) +{ + static const WCHAR FileOpenNoIntegrationW[] = L"Software\\Wine\\FileOpenNoIntegration"; + HKEY key; + WCHAR program_name[MAX_PATH], *pattern_to_exclude; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + pattern_to_exclude = reg_get_valW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, program_name); + if (wcsstr(command, pattern_to_exclude)) + { + heap_free(pattern_to_exclude); + RegCloseKey(key); + return TRUE; + } + heap_free(pattern_to_exclude); + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(key); + return FALSE; +} + static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) @@ -2036,6 +2065,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (on_exclude_list(commandW)) + /* command is on the exclude list => desktop integration is not desirable */ + goto end; + wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); @@ -2075,11 +2113,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, L"open"); if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL); -- 2.34.0

1 1

[PATCH v2 3/3] msdasql: Implement IColumnsRowset GetAvailableColumns
by Alistair Leslie-Hughes 23 Nov '21

23 Nov '21

The functions returns a series of custom columns to make a row unique. For us, it's safe to return no extra columns at this stage. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 533cb6ae28a..98b2b4e6c5d 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -886,8 +886,16 @@ static ULONG WINAPI column_rs_Release(IColumnsRowset *iface) static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORDINAL *count, DBID **columns) { struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); - FIXME("%p, %p, %p\n", rowset, count, columns); - return E_NOTIMPL; + + TRACE("%p, %p, %p\n", rowset, count, columns); + + if (!count || !columns) + return E_INVALIDARG; + + *count = 0; + *columns = NULL; + + return S_OK; } static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown *outer, DBORDINAL count, -- 2.33.0

1 0

[PATCH v2 2/3] msdasql: Implement ICommandProperties SetProperties.
by Alistair Leslie-Hughes 23 Nov '21

23 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 9ef29d6b29e..533cb6ae28a 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1152,7 +1152,41 @@ static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULON DBPROPSET propertyset[]) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %p\n", command, propertyset); + int i, j, k; + + TRACE("%p %d, %p\n", command, count, propertyset); + + for(i=0; i < count; i++) + { + TRACE("set %s, count %d\n", debugstr_guid(&propertyset[i].guidPropertySet), propertyset[i].cProperties); + for(j=0; j < propertyset[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].property_id == propertyset[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property 0x%08x\n", command->properties[k].property_id); + if (command->properties[k].flags & DBPROPFLAGS_WRITE) + { + if (command->properties[k].vartype == VT_BOOL) + { + command->properties[k].bool_val = V_BOOL(&propertyset[i].rgProperties[j].vValue); + } + else if (command->properties[k].vartype == VT_I4) + { + command->properties[k].long_val = V_I4(&propertyset[i].rgProperties[j].vValue); + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + } + else + WARN("Attempting to set Readonly property\n"); + + break; + } + } + } + } return S_OK; } -- 2.33.0

1 0

[PATCH v2 1/3] msdasql: Implement ICommandProperties GetProperties
by Alistair Leslie-Hughes 23 Nov '21

23 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 1 + dlls/msdasql/session.c | 217 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 145 +++++++++++++++++++++++ 3 files changed, 361 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index bc208a74cc5..84afdb06145 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b4239c59037..9ef29d6b29e 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -35,6 +35,103 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +struct msdasql_prop +{ + DBPROPID property_id; + DBPROPFLAGS flags; + VARTYPE vartype; + + VARIANT_BOOL bool_val; + LONG_PTR long_val; +}; + +static struct msdasql_prop msdasql_init_props[] = +{ + { DBPROP_ABORTPRESERVE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_DATASOURCEINFO, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_BOOKMARKS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BOOKMARKSKIPPED, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BOOKMARKTYPE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 1 }, + { DBPROP_CANFETCHBACKWARDS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_CANHOLDROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_CANSCROLLBACKWARDS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_COLUMNRESTRICT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_COMMITPRESERVE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_DELAYSTORAGEOBJECTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IMMOBILEROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_LITERALBOOKMARKS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_LITERALIDENTITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_MAXOPENROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_MAXPENDINGROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_MAXROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_NOTIFICATIONPHASES, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 31 }, + { DBPROP_OTHERUPDATEDELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_OWNINSERT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_OWNUPDATEDELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_QUICKRESTART , DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_REENTRANTEVENTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_REMOVEDELETED, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_REPORTMULTIPLECHANGES, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ROWRESTRICT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ROWTHREADMODEL, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 2 }, + { DBPROP_TRANSACTEDOBJECT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_UPDATABILITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_STRONGIDENTITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IAccessor, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IColumnsInfo, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IColumnsRowset, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IConnectionPointContainer, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowset, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IRowsetChange, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetIdentity, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetInfo, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IRowsetLocate, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetResynch, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetUpdate, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ISupportErrorInfo, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_ISequentialStream, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_NOTIFYCOLUMNSET, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWDELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWFIRSTCHANGE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWINSERT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWRESYNCH, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWSETRELEASE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUNDOCHANGE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUNDODELETE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUNDOINSERT, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_NOTIFYROWUPDATE, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 3 }, + { DBPROP_CHANGEINSERTEDROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_RETURNPENDINGINSERTS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IConvertType, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_BOOL, VARIANT_TRUE }, + { DBPROP_NOTIFICATIONGRANULARITY, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 1 }, + { DBPROP_IMultipleResults, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ACCESSORDER, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, 0, 1 }, + { DBPROP_BOOKMARKINFO, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_UNIQUEROWS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetFind, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_IRowsetScroll, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_IRowsetRefresh, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_FINDCOMPAREOPS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ, VT_I4, VARIANT_FALSE, 27 }, + { DBPROP_ORDEREDBOOKMARKS, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_CLIENTCURSOR, DBPROPFLAGS_ROWSET | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_TRUE }, + { DBPROP_ABORTPRESERVE, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ACTIVESESSIONS, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_ASYNCTXNCOMMIT, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_CACHE_AUTHINFO, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 0 }, + { DBPROP_AUTH_INTEGRATED, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_I4, VARIANT_FALSE, 14 }, + { DBPROP_AUTH_MASK_PASSWORD, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_PASSWORD, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_AUTH_USERID, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, + { DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROPFLAGS_DATASOURCEINFO | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE, VT_BOOL, VARIANT_FALSE }, +}; + +#define ROWSET_PROP_COUNT 68 +#define DATASOURCE_PROP_COUNT 12 + struct msdasql_session { IUnknown session_iface; @@ -305,6 +402,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + + struct msdasql_prop properties[80]; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -933,8 +1032,120 @@ static HRESULT WINAPI command_prop_GetProperties(ICommandProperties *iface, ULON const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); - return E_NOTIMPL; + DBPROPSET *propset = NULL; + int i, j, k; + + TRACE("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); + + /* All Properties */ + if (count == 0) + { + propset = CoTaskMemAlloc(2 * sizeof(DBPROPSET)); + if (!propset) + return E_OUTOFMEMORY; + + propset[0].guidPropertySet = DBPROPSET_ROWSET; + propset[0].cProperties = ROWSET_PROP_COUNT; + propset[0].rgProperties = CoTaskMemAlloc(propset[0].cProperties * sizeof(DBPROP)); + if (!propset[0].rgProperties) + { + CoTaskMemFree(propset); + return E_OUTOFMEMORY; + } + + for (j=0; j < propset[0].cProperties; j++) + { + propset[0].rgProperties[j].dwPropertyID = command->properties[j].property_id; + + V_VT(&propset[0].rgProperties[j].vValue) = command->properties[j].vartype; + if (command->properties[j].vartype == VT_BOOL) + { + V_BOOL(&propset[0].rgProperties[j].vValue) = command->properties[j].bool_val; + } + else if (command->properties[j].vartype == VT_I4) + { + V_I4(&propset[0].rgProperties[j].vValue) = command->properties[j].long_val; + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + } + + propset[1].guidPropertySet = DBPROPSET_PROVIDERROWSET; + propset[1].cProperties = DATASOURCE_PROP_COUNT; + propset[1].rgProperties = CoTaskMemAlloc(propset[1].cProperties * sizeof(DBPROP)); + if (!propset[1].rgProperties) + { + CoTaskMemFree(propset[0].rgProperties); + CoTaskMemFree(propset); + return E_OUTOFMEMORY; + } + + i=0; + for (j=ROWSET_PROP_COUNT; j < ROWSET_PROP_COUNT+propset[1].cProperties; j++) + { + propset[1].rgProperties[i].dwPropertyID = command->properties[j].property_id; + + V_VT(&propset[1].rgProperties[i].vValue) = command->properties[j].vartype; + if (command->properties[j].vartype == VT_BOOL) + { + V_BOOL(&propset[1].rgProperties[i].vValue) = command->properties[j].bool_val; + } + else if (command->properties[j].vartype == VT_I4) + { + V_I4(&propset[1].rgProperties[i].vValue) = command->properties[j].long_val; + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + i++; + } + + *sets_cnt = 2; + } + else + { + propset = CoTaskMemAlloc(count * sizeof(DBPROPSET)); + if (!propset) + return E_OUTOFMEMORY; + + for (i=0; i < count; i++) + { + TRACE("Property id %d (count %d, set %s)\n", i, propertyidsets[i].cPropertyIDs, + debugstr_guid(&propertyidsets[i].guidPropertySet)); + + propset[i].cProperties = propertyidsets[i].cPropertyIDs; + propset[i].rgProperties = CoTaskMemAlloc(propset[i].cProperties * sizeof(DBPROP)); + + for (j=0; j < propset[i].cProperties; j++) + { + propset[i].rgProperties[j].dwPropertyID = propertyidsets[i].rgPropertyIDs[j]; + + for(k = 0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].property_id == propertyidsets[i].rgPropertyIDs[j]) + { + V_VT(&propset[i].rgProperties[i].vValue) = command->properties[j].vartype; + if (command->properties[j].vartype == VT_BOOL) + { + V_BOOL(&propset[i].rgProperties[i].vValue) = command->properties[j].bool_val; + } + else if (command->properties[j].vartype == VT_I4) + { + V_I4(&propset[i].rgProperties[i].vValue) = command->properties[j].long_val; + } + else + ERR("Unknown variant type %d\n", command->properties[j].vartype); + break; + } + } + } + } + + *sets_cnt = count; + } + + *propertyset = propset; + + return S_OK; } static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULONG count, @@ -1148,6 +1359,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->refs = 1; command->query = NULL; + memcpy(command->properties, msdasql_init_props, sizeof(msdasql_init_props)); + IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b520b127d67..211116dc382 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -34,6 +34,7 @@ DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); @@ -183,6 +184,149 @@ static void test_Properties(void) IDBProperties_Release(props); } +static void test_command_properties(ICommandProperties *props) +{ + HRESULT hr; + ULONG count; + DBPROPSET *propset; + int i; + + DWORD row_props[68] = { + DBPROP_ABORTPRESERVE, DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROP_BOOKMARKS, DBPROP_BOOKMARKSKIPPED, + DBPROP_BOOKMARKTYPE, DBPROP_CANFETCHBACKWARDS, DBPROP_CANHOLDROWS, DBPROP_CANSCROLLBACKWARDS, + DBPROP_COLUMNRESTRICT, DBPROP_COMMITPRESERVE, DBPROP_DELAYSTORAGEOBJECTS, DBPROP_IMMOBILEROWS, + DBPROP_LITERALBOOKMARKS, DBPROP_LITERALIDENTITY, DBPROP_MAXOPENROWS, DBPROP_MAXPENDINGROWS, + DBPROP_MAXROWS, DBPROP_NOTIFICATIONPHASES, DBPROP_OTHERUPDATEDELETE, DBPROP_OWNINSERT, + DBPROP_OWNUPDATEDELETE, DBPROP_QUICKRESTART, DBPROP_REENTRANTEVENTS, DBPROP_REMOVEDELETED, + DBPROP_REPORTMULTIPLECHANGES, DBPROP_ROWRESTRICT, DBPROP_ROWTHREADMODEL, DBPROP_TRANSACTEDOBJECT, + DBPROP_UPDATABILITY, DBPROP_STRONGIDENTITY, DBPROP_IAccessor, DBPROP_IColumnsInfo, + DBPROP_IColumnsRowset, DBPROP_IConnectionPointContainer, DBPROP_IRowset, DBPROP_IRowsetChange, + DBPROP_IRowsetIdentity, DBPROP_IRowsetInfo, DBPROP_IRowsetLocate, DBPROP_IRowsetResynch, + DBPROP_IRowsetUpdate, DBPROP_ISupportErrorInfo, DBPROP_ISequentialStream, DBPROP_NOTIFYCOLUMNSET, + DBPROP_NOTIFYROWDELETE, DBPROP_NOTIFYROWFIRSTCHANGE, DBPROP_NOTIFYROWINSERT, DBPROP_NOTIFYROWRESYNCH, + DBPROP_NOTIFYROWSETRELEASE, DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE, DBPROP_NOTIFYROWUNDOCHANGE, DBPROP_NOTIFYROWUNDODELETE, + DBPROP_NOTIFYROWUNDOINSERT, DBPROP_NOTIFYROWUPDATE, DBPROP_CHANGEINSERTEDROWS, DBPROP_RETURNPENDINGINSERTS, + DBPROP_IConvertType, DBPROP_NOTIFICATIONGRANULARITY, DBPROP_IMultipleResults, DBPROP_ACCESSORDER, + DBPROP_BOOKMARKINFO, DBPROP_UNIQUEROWS, DBPROP_IRowsetFind, DBPROP_IRowsetScroll, + DBPROP_IRowsetRefresh, DBPROP_FINDCOMPAREOPS, DBPROP_ORDEREDBOOKMARKS, DBPROP_CLIENTCURSOR + }; + + DWORD prov_props[12] = { + DBPROP_ABORTPRESERVE, DBPROP_ACTIVESESSIONS, DBPROP_ASYNCTXNCOMMIT, DBPROP_AUTH_CACHE_AUTHINFO, + DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROP_AUTH_INTEGRATED, DBPROP_AUTH_MASK_PASSWORD, DBPROP_AUTH_PASSWORD, + DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, DBPROP_BLOCKINGSTORAGEOBJECTS + }; + + hr = ICommandProperties_GetProperties(props, 0, NULL, &count, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 2, "got %d\n", count); + ok(propset[0].cProperties == 68, "got %d\n", propset[0].cProperties); + ok(propset[1].cProperties == 12, "got %d\n", propset[1].cProperties); + + ok(IsEqualGUID(&DBPROPSET_ROWSET, &propset[0].guidPropertySet), "got %s\n", + debugstr_guid(&propset[0].guidPropertySet)); + for (i = 0; i < propset[0].cProperties; i++) + { + ok(propset[0].rgProperties[i].dwPropertyID == row_props[i], "%d: got 0x%08x\n", i, propset[0].rgProperties[i].dwPropertyID); + + switch(propset[0].rgProperties[i].dwPropertyID ) + { + case DBPROP_BOOKMARKTYPE: + case DBPROP_NOTIFICATIONGRANULARITY: + case DBPROP_ACCESSORDER: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 1, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_MAXOPENROWS: + case DBPROP_MAXPENDINGROWS: + case DBPROP_MAXROWS: + case DBPROP_UPDATABILITY: + case DBPROP_BOOKMARKINFO: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 0, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_FINDCOMPAREOPS: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 27, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_NOTIFICATIONPHASES: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 31, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_ROWTHREADMODEL: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 2, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_NOTIFYCOLUMNSET: + case DBPROP_NOTIFYROWDELETE: + case DBPROP_NOTIFYROWFIRSTCHANGE: + case DBPROP_NOTIFYROWINSERT: + case DBPROP_NOTIFYROWRESYNCH: + case DBPROP_NOTIFYROWSETRELEASE: + case DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE: + case DBPROP_NOTIFYROWUNDOCHANGE: + case DBPROP_NOTIFYROWUNDODELETE: + case DBPROP_NOTIFYROWUNDOINSERT: + case DBPROP_NOTIFYROWUPDATE: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 3, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_BLOCKINGSTORAGEOBJECTS: + case DBPROP_IMMOBILEROWS: + case DBPROP_LITERALIDENTITY: + case DBPROP_REENTRANTEVENTS: + case DBPROP_IAccessor: + case DBPROP_IColumnsInfo: + case DBPROP_IColumnsRowset: + case DBPROP_IRowset: + case DBPROP_IRowsetInfo: + case DBPROP_ISupportErrorInfo: + case DBPROP_CHANGEINSERTEDROWS: + case DBPROP_IConvertType: + case DBPROP_IRowsetScroll: + case DBPROP_IRowsetRefresh: + case DBPROP_ORDEREDBOOKMARKS: + case DBPROP_CLIENTCURSOR: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_BOOL(&propset[0].rgProperties[i].vValue) == VARIANT_TRUE, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + default: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_BOOL(&propset[0].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + } + } + + ok(IsEqualGUID(&DBPROPSET_PROVIDERROWSET, &propset[1].guidPropertySet), "got %s\n", + debugstr_guid(&propset[1].guidPropertySet)); + for (i = 0; i < propset[1].cProperties; i++) + { + ok(propset[1].rgProperties[i].dwPropertyID == prov_props[i], "%d: got 0x%08x\n", i, propset[1].rgProperties[i].dwPropertyID); + + switch(propset[1].rgProperties[i].dwPropertyID ) + { + case DBPROP_AUTH_ENCRYPT_PASSWORD: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_I4(&propset[1].rgProperties[i].vValue) == 0, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + case DBPROP_AUTH_INTEGRATED: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_I4(&propset[1].rgProperties[i].vValue) == 14, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + case DBPROP_BLOCKINGSTORAGEOBJECTS: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_BOOL(&propset[1].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + default: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_BOOL(&propset[1].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + } + } + + CoTaskMemFree(propset); +} + static void test_command_interfaces(IUnknown *cmd) { HRESULT hr; @@ -198,6 +342,7 @@ static void test_command_interfaces(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); + test_command_properties(commandProp); ICommandProperties_Release(commandProp); hr = IUnknown_QueryInterface(cmd, &IID_ICommandWithParameters, (void**)&cmdwithparams); -- 2.33.0

1 0

[PATCH resend] ws2_32: Support setting SO_ERROR
by Alex Henrie 23 Nov '21

23 Nov '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This patch was previously assigned to Zeb Figura, but dropped off the patches list without review. --- dlls/ws2_32/socket.c | 4 +--- dlls/ws2_32/tests/sock.c | 10 ++++++++-- include/wine/afd.h | 1 + server/sock.c | 38 +++++++++++++++++++++++++++----------- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2db441bee3c..2c2eabc09fa 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2750,9 +2750,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int } case SO_ERROR: - FIXME( "SO_ERROR, stub!\n" ); - SetLastError( WSAENOPROTOOPT ); - return -1; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_ERROR, optval, optlen ); case SO_KEEPALIVE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 02713a7c625..76f4f1ef8a2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1289,7 +1289,6 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); i = 1234; err = setsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, size); -todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); @@ -1300,7 +1299,14 @@ todo_wine ok( !err && !WSAGetLastError(), "got %d with %d (expected 0 with 0)\n", err, WSAGetLastError()); -todo_wine + ok (i == 1234, "got %d (expected 1234)\n", i); + + SetLastError(0xdeadbeef); + i = 4321; + err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); + ok( !err && !WSAGetLastError(), + "got %d with %d (expected 0 with 0)\n", + err, WSAGetLastError()); ok (i == 1234, "got %d (expected 1234)\n", i); /* Test invalid optlen */ diff --git a/include/wine/afd.h b/include/wine/afd.h index 3b8bdcb9e5d..9382e2acf2f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -238,6 +238,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_RECVTTL WINE_AFD_IOC(294) #define IOCTL_AFD_WINE_GET_IP_RECVTOS WINE_AFD_IOC(295) #define IOCTL_AFD_WINE_SET_IP_RECVTOS WINE_AFD_IOC(296) +#define IOCTL_AFD_WINE_SET_SO_ERROR WINE_AFD_IOC(297) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index c9b71137c4c..cfb65e0b54c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -191,6 +191,7 @@ struct sock unsigned int message; /* message to send */ obj_handle_t wparam; /* message wparam (socket handle) */ int errors[AFD_POLL_BIT_COUNT]; /* event errors */ + unsigned int last_error; /* most recent error code */ timeout_t connect_time;/* time the socket was connected */ struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* queue for asynchronous reads */ @@ -963,6 +964,7 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, i sock->pending_events |= event; sock->reported_events |= event; sock->errors[event_bit] = error; + sock->last_error = sock_get_error( error ); } } @@ -978,6 +980,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs { post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); sock->errors[AFD_POLL_BIT_CONNECT_ERR] = 0; + sock->last_error = 0; } if (event & (POLLERR | POLLHUP)) post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); @@ -1441,6 +1444,7 @@ static struct sock *create_socket(void) init_async_queue( &sock->connect_q ); init_async_queue( &sock->poll_q ); memset( sock->errors, 0, sizeof(sock->errors) ); + sock->last_error = 0; list_init( &sock->accept_list ); return sock; } @@ -2675,7 +2679,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { int error; socklen_t len = sizeof(error); - unsigned int i; if (get_reply_max_size() < sizeof(error)) { @@ -2689,19 +2692,32 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } - if (!error) + if (error) + sock->last_error = sock_get_error( error ); + + set_reply_data( &sock->last_error, sizeof(sock->last_error) ); + return; + } + + case IOCTL_AFD_WINE_SET_SO_ERROR: + { + int error; + socklen_t len = sizeof(error); + + if (get_req_data_size() < sizeof(sock->last_error)) { - for (i = 0; i < ARRAY_SIZE( sock->errors ); ++i) - { - if (sock->errors[i]) - { - error = sock_get_error( sock->errors[i] ); - break; - } - } + set_error( STATUS_BUFFER_TOO_SMALL ); + return; + } + + /* clear the native error, if any */ + if (getsockopt( unix_fd, SOL_SOCKET, SO_ERROR, (char *)&error, &len ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return; } - set_reply_data( &error, sizeof(error) ); + sock->last_error = *(unsigned int *)get_req_data(); return; } -- 2.34.0

1 0

Re: Attn Packagers: Dependency change from gstreamer-0.10 to gstreamer >= 1.0
by Koko Firstlove 23 Nov '21

23 Nov '21

1 0

[PATCH website] website: Remove links to www.linuxforums.org
by Floris Renaud 22 Nov '21

22 Nov '21

Since May 2020, the website has been offline. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/en/forums.template | 2 -- templates/fr/forums.template | 2 -- templates/ko/forums.template | 2 -- templates/pl/forums.template | 2 -- templates/pt/forums.template | 2 -- templates/tr/forums.template | 2 -- templates/zh-cn/forums.template | 2 -- 7 files changed, 14 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 61b4531e..85d7a1e2 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -10,8 +10,6 @@ Here are the most useful ones for users: <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> - <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a> - <li>If you want to be notified about new releases, subscribe to the <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li> </ul> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index a1ffa884..8786ee78 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -11,8 +11,6 @@ Voici les plus utiles pour les utilisateurs : <li>Les utilisateurs Ubuntu peuvent également visiter l'<a href="http://ubuntuforums.org/forumdisplay.php?f=313">espace Wine des forums Ubuntu</a> - <li>Les utilisateurs peuvent également visiter l'<a href="http://www.linuxforums.org/forum/wine/">espace Wine sur Linux Forums</a> - <li>Si vous voulez être prévenu(e) des nouvelles versions, inscrivez-vous à la <a href="//www.winehq.org/mailman/listinfo/wine-announce">liste de diffusion Wine-Announce</a></li> </ul> diff --git a/templates/ko/forums.template b/templates/ko/forums.template index e932580b..c67f1c1a 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -10,8 +10,6 @@ <li>우분투 사용자라면 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">우분투 포럼의 Wine 게시판</a>을 확인해 보는 것도 추천합니다. - <li><a href="http://www.linuxforums.org/forum/wine/">리눅스 포럼의 Wine 게시판</a>을 확인해 볼 수도 있습니다. - <li>새 릴리스 알림을 받으려면 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 메일링 리스트</a>를 구독하십시오.</li> </ul> diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 142b90c7..20f073c0 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -11,8 +11,6 @@ Tutaj wymieniono najbardziej użyteczne dla użytkowników: <li>Użytkownicy Ubuntu mogą takżę odwiedzić <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Dział Wine na forum Ubuntu</a> - <li>Użytkownicy mogą także odwiedzić <a href="http://www.linuxforums.org/forum/wine/">Dział Wine na forum Linuksa</a> - <li>Jeżeli chcesz być powiadamiany o nowych wydaniach, zapisz się do <a href="//www.winehq.org/mailman/listinfo/wine-announce">Zawiadamiająca lista mailingowa Wine</a></li> </ul> diff --git a/templates/pt/forums.template b/templates/pt/forums.template index bd618868..2f9f3c6e 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -12,8 +12,6 @@ Aqui estão as mais úteis para os usuários: <li>Usuários do Ubuntu talvez queiram visitar a <a href="http://ubuntuforums.org/forumdisplay.php?f=313">sessão do Wine nos Fóruns do Ubuntu</a> - <li>Usuários talvez também queiram visitar a <a href="http://www.linuxforums.org/forum/wine/">sessão do Wine nos Fóruns de Linux</a> - <li>Caso você queira ser notificado dos novos lançamentos, inscreva-se na <a href="//www.winehq.org/mailman/listinfo/wine-announce">Lista de anúncios do Wine</a></li> </ul> diff --git a/templates/tr/forums.template b/templates/tr/forums.template index ee8bf648..bf4bbd40 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -10,8 +10,6 @@ <li>Ubuntu kullanıcıları ayrıca <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu Forumları Wine Alanı</a> sayfasını ziyaret etmek isteyebilirler.</li> - <li>Kullanıcılar ayrıca <a href="http://www.linuxforums.org/forum/wine/">Linux Forumları Wine Alanı</a> sayfasını ziyaret etmek isteyebilirler.</li> - <li>Eğer yeni sürümlerden haberdar olmak isterseniz <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine Haber posta listesi</a>ne abone olun.</li> </ul> diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 66c56778..8aeab902 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -9,8 +9,6 @@ <li>Ubuntu 用户也许还想去 <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Ubuntu 论坛 Wine 板块</a> - <li>或许您还想去 <a href="http://www.linuxforums.org/forum/wine/">Linux Forums 的 Wine 板块</a> - <li>如果你想被告知最新的发布，请订阅 <a href="//www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce 邮件列表 </a></li> </ul> -- 2.34.0

1 0

[PATCH website 1/3] website: Add the news button to the Dutch website.
by Floris Renaud 22 Nov '21

22 Nov '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- templates/nl/home.template | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/nl/home.template b/templates/nl/home.template index ea998c7f..b93cdb9e 100644 --- a/templates/nl/home.template +++ b/templates/nl/home.template @@ -114,6 +114,16 @@ </a> <div class="clear"></div> + <a class="winehq_menu_item appdb" href="{$root}/news"> + + + + + Nieuws + Wat is er laatst gebeurd? + </a> + <div class="clear"></div> + <a class="winehq_menu_item appdb" href="https://appdb.winehq.org"> @@ -166,6 +176,10 @@  - <a href="{$root}/news" class="btn btn-default"> meer nieuws...</a> + + <a href="{$root}/news" class="btn btn-default"> Nieuwsarchief</a> +   + <a href="{$root}/wwn" class="btn btn-default"> World Wine Nieuws</a> + </div> -- 2.34.0

1 2

[website] Remove stray file
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] winecoreaudio.drv: Place output message before return statement.
by Andrey Gusev 22 Nov '21

22 Nov '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1e37a2a9026..c87aff590e2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2092,8 +2092,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(*ppv) hr = S_OK; else{ - return E_NOINTERFACE; FIXME("stub %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } end: -- 2.33.1

2 1

[PATCH 7/7] winecoreaudio: Move get_mix_format to the unixlib.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 246 +++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 256 ++--------------------------- dlls/winecoreaudio.drv/unixlib.h | 9 + 3 files changed, 267 insertions(+), 244 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 3ab80efc4e2..208655d20c6 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -703,9 +703,255 @@ static NTSTATUS release_stream( void *args ) return STATUS_SUCCESS; } +static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) +{ + int i; + DWORD mask = 0; + + for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { + switch (layout->mChannelDescriptions[i].mChannelLabel) { + default: FIXME("Unhandled channel 0x%x\n", + (unsigned int)layout->mChannelDescriptions[i].mChannelLabel); break; + case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break; + case kAudioChannelLabel_Mono: + case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break; + case kAudioChannelLabel_Right: mask |= SPEAKER_FRONT_RIGHT; break; + case kAudioChannelLabel_LeftSurround: mask |= SPEAKER_BACK_LEFT; break; + case kAudioChannelLabel_CenterSurround: mask |= SPEAKER_BACK_CENTER; break; + case kAudioChannelLabel_RightSurround: mask |= SPEAKER_BACK_RIGHT; break; + case kAudioChannelLabel_LFEScreen: mask |= SPEAKER_LOW_FREQUENCY; break; + case kAudioChannelLabel_LeftSurroundDirect: mask |= SPEAKER_SIDE_LEFT; break; + case kAudioChannelLabel_RightSurroundDirect: mask |= SPEAKER_SIDE_RIGHT; break; + case kAudioChannelLabel_TopCenterSurround: mask |= SPEAKER_TOP_CENTER; break; + case kAudioChannelLabel_VerticalHeightLeft: mask |= SPEAKER_TOP_FRONT_LEFT; break; + case kAudioChannelLabel_VerticalHeightCenter: mask |= SPEAKER_TOP_FRONT_CENTER; break; + case kAudioChannelLabel_VerticalHeightRight: mask |= SPEAKER_TOP_FRONT_RIGHT; break; + case kAudioChannelLabel_TopBackLeft: mask |= SPEAKER_TOP_BACK_LEFT; break; + case kAudioChannelLabel_TopBackCenter: mask |= SPEAKER_TOP_BACK_CENTER; break; + case kAudioChannelLabel_TopBackRight: mask |= SPEAKER_TOP_BACK_RIGHT; break; + case kAudioChannelLabel_LeftCenter: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; + case kAudioChannelLabel_RightCenter: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; + } + } + + return mask; +} + +/* For most hardware on Windows, users must choose a configuration with an even + * number of channels (stereo, quad, 5.1, 7.1). Users can then disable + * channels, but those channels are still reported to applications from + * GetMixFormat! Some applications behave badly if given an odd number of + * channels (e.g. 2.1). Here, we find the nearest configuration that Windows + * would report for a given channel layout. */ +static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt) +{ + DWORD ca_mask = ca_channel_layout_to_channel_mask(ca_layout); + + TRACE("Got channel mask for CA: 0x%x\n", ca_mask); + + if (ca_layout->mNumberChannelDescriptions == 1) + { + fmt->Format.nChannels = 1; + fmt->dwChannelMask = ca_mask; + return; + } + + /* compare against known configurations and find smallest configuration + * which is a superset of the given speakers */ + + if (ca_layout->mNumberChannelDescriptions <= 2 && + (ca_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) + { + fmt->Format.nChannels = 2; + fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 4 && + (ca_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) + { + fmt->Format.nChannels = 4; + fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 6 && + (ca_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 6; + fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; + return; + } + + if (ca_layout->mNumberChannelDescriptions <= 8 && + (ca_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) + { + fmt->Format.nChannels = 8; + fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; + return; + } + + /* oddball format, report truthfully */ + fmt->Format.nChannels = ca_layout->mNumberChannelDescriptions; + fmt->dwChannelMask = ca_mask; +} + +static DWORD get_channel_mask(unsigned int channels) +{ + switch(channels){ + case 0: + return 0; + case 1: + return KSAUDIO_SPEAKER_MONO; + case 2: + return KSAUDIO_SPEAKER_STEREO; + case 3: + return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; + case 4: + return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ + case 5: + return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; + case 6: + return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ + case 7: + return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; + case 8: + return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ + } + FIXME("Unknown speaker configuration: %u\n", channels); + return 0; +} + +static NTSTATUS get_mix_format(void *args) +{ + struct get_mix_format_params *params = args; + AudioObjectPropertyAddress addr; + AudioChannelLayout *layout; + AudioBufferList *buffers; + Float64 rate; + UInt32 size; + OSStatus sc; + int i; + + params->fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + + addr.mScope = get_scope(params->flow); + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyPreferredChannelLayout; + + sc = AudioObjectGetPropertyDataSize(params->dev_id, &addr, 0, NULL, &size); + if(sc == noErr){ + layout = malloc(size); + sc = AudioObjectGetPropertyData(params->dev_id, &addr, 0, NULL, &size, layout); + if(sc == noErr){ + TRACE("Got channel layout: {tag: 0x%x, bitmap: 0x%x, num_descs: %u}\n", + (unsigned int)layout->mChannelLayoutTag, (unsigned int)layout->mChannelBitmap, + (unsigned int)layout->mNumberChannelDescriptions); + + if(layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions){ + convert_channel_layout(layout, params->fmt); + }else{ + WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", + (unsigned int)layout->mChannelLayoutTag); + params->fmt->Format.nChannels = 0; + } + }else{ + TRACE("Unable to get _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + params->fmt->Format.nChannels = 0; + } + + free(layout); + }else{ + TRACE("Unable to get size for _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); + params->fmt->Format.nChannels = 0; + } + + if(params->fmt->Format.nChannels == 0){ + addr.mScope = get_scope(params->flow); + addr.mElement = 0; + addr.mSelector = kAudioDevicePropertyStreamConfiguration; + + sc = AudioObjectGetPropertyDataSize(params->dev_id, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + buffers = malloc(size); + if(!buffers){ + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + sc = AudioObjectGetPropertyData(params->dev_id, &addr, 0, NULL, &size, buffers); + if(sc != noErr){ + free(buffers); + WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + for(i = 0; i < buffers->mNumberBuffers; ++i) + params->fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; + + free(buffers); + + params->fmt->dwChannelMask = get_channel_mask(params->fmt->Format.nChannels); + } + + addr.mSelector = kAudioDevicePropertyNominalSampleRate; + size = sizeof(Float64); + sc = AudioObjectGetPropertyData(params->dev_id, &addr, 0, NULL, &size, &rate); + if(sc != noErr){ + WARN("Unable to get _NominalSampleRate property: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + params->fmt->Format.nSamplesPerSec = rate; + + params->fmt->Format.wBitsPerSample = 32; + params->fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; + + params->fmt->Format.nBlockAlign = (params->fmt->Format.wBitsPerSample * + params->fmt->Format.nChannels) / 8; + params->fmt->Format.nAvgBytesPerSec = params->fmt->Format.nSamplesPerSec * + params->fmt->Format.nBlockAlign; + + params->fmt->Samples.wValidBitsPerSample = params->fmt->Format.wBitsPerSample; + params->fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, create_stream, release_stream, + get_mix_format, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 572126562c6..7ec282c514d 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -689,32 +689,6 @@ static void dump_fmt(const WAVEFORMATEX *fmt) } } -static DWORD get_channel_mask(unsigned int channels) -{ - switch(channels){ - case 0: - return 0; - case 1: - return KSAUDIO_SPEAKER_MONO; - case 2: - return KSAUDIO_SPEAKER_STEREO; - case 3: - return KSAUDIO_SPEAKER_STEREO | SPEAKER_LOW_FREQUENCY; - case 4: - return KSAUDIO_SPEAKER_QUAD; /* not _SURROUND */ - case 5: - return KSAUDIO_SPEAKER_QUAD | SPEAKER_LOW_FREQUENCY; - case 6: - return KSAUDIO_SPEAKER_5POINT1; /* not 5POINT1_SURROUND */ - case 7: - return KSAUDIO_SPEAKER_5POINT1 | SPEAKER_BACK_CENTER; - case 8: - return KSAUDIO_SPEAKER_7POINT1_SURROUND; /* Vista deprecates 7POINT1 */ - } - FIXME("Unknown speaker configuration: %u\n", channels); - return 0; -} - static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, const WAVEFORMATEX *fmt) { @@ -1395,134 +1369,11 @@ unsupported: return AUDCLNT_E_UNSUPPORTED_FORMAT; } -static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) -{ - int i; - DWORD mask = 0; - - for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { - switch (layout->mChannelDescriptions[i].mChannelLabel) { - default: FIXME("Unhandled channel 0x%x\n", (unsigned int)layout->mChannelDescriptions[i].mChannelLabel); break; - case kAudioChannelLabel_Left: mask |= SPEAKER_FRONT_LEFT; break; - case kAudioChannelLabel_Mono: - case kAudioChannelLabel_Center: mask |= SPEAKER_FRONT_CENTER; break; - case kAudioChannelLabel_Right: mask |= SPEAKER_FRONT_RIGHT; break; - case kAudioChannelLabel_LeftSurround: mask |= SPEAKER_BACK_LEFT; break; - case kAudioChannelLabel_CenterSurround: mask |= SPEAKER_BACK_CENTER; break; - case kAudioChannelLabel_RightSurround: mask |= SPEAKER_BACK_RIGHT; break; - case kAudioChannelLabel_LFEScreen: mask |= SPEAKER_LOW_FREQUENCY; break; - case kAudioChannelLabel_LeftSurroundDirect: mask |= SPEAKER_SIDE_LEFT; break; - case kAudioChannelLabel_RightSurroundDirect: mask |= SPEAKER_SIDE_RIGHT; break; - case kAudioChannelLabel_TopCenterSurround: mask |= SPEAKER_TOP_CENTER; break; - case kAudioChannelLabel_VerticalHeightLeft: mask |= SPEAKER_TOP_FRONT_LEFT; break; - case kAudioChannelLabel_VerticalHeightCenter: mask |= SPEAKER_TOP_FRONT_CENTER; break; - case kAudioChannelLabel_VerticalHeightRight: mask |= SPEAKER_TOP_FRONT_RIGHT; break; - case kAudioChannelLabel_TopBackLeft: mask |= SPEAKER_TOP_BACK_LEFT; break; - case kAudioChannelLabel_TopBackCenter: mask |= SPEAKER_TOP_BACK_CENTER; break; - case kAudioChannelLabel_TopBackRight: mask |= SPEAKER_TOP_BACK_RIGHT; break; - case kAudioChannelLabel_LeftCenter: mask |= SPEAKER_FRONT_LEFT_OF_CENTER; break; - case kAudioChannelLabel_RightCenter: mask |= SPEAKER_FRONT_RIGHT_OF_CENTER; break; - } - } - - return mask; -} - -/* For most hardware on Windows, users must choose a configuration with an even - * number of channels (stereo, quad, 5.1, 7.1). Users can then disable - * channels, but those channels are still reported to applications from - * GetMixFormat! Some applications behave badly if given an odd number of - * channels (e.g. 2.1). Here, we find the nearest configuration that Windows - * would report for a given channel layout. */ -static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt) -{ - DWORD ca_mask = ca_channel_layout_to_channel_mask(ca_layout); - - TRACE("Got channel mask for CA: 0x%x\n", ca_mask); - - if (ca_layout->mNumberChannelDescriptions == 1) - { - fmt->Format.nChannels = 1; - fmt->dwChannelMask = ca_mask; - return; - } - - /* compare against known configurations and find smallest configuration - * which is a superset of the given speakers */ - - if (ca_layout->mNumberChannelDescriptions <= 2 && - (ca_mask & ~KSAUDIO_SPEAKER_STEREO) == 0) - { - fmt->Format.nChannels = 2; - fmt->dwChannelMask = KSAUDIO_SPEAKER_STEREO; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 4 && - (ca_mask & ~KSAUDIO_SPEAKER_QUAD) == 0) - { - fmt->Format.nChannels = 4; - fmt->dwChannelMask = KSAUDIO_SPEAKER_QUAD; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 4 && - (ca_mask & ~KSAUDIO_SPEAKER_SURROUND) == 0) - { - fmt->Format.nChannels = 4; - fmt->dwChannelMask = KSAUDIO_SPEAKER_SURROUND; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 6 && - (ca_mask & ~KSAUDIO_SPEAKER_5POINT1) == 0) - { - fmt->Format.nChannels = 6; - fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 6 && - (ca_mask & ~KSAUDIO_SPEAKER_5POINT1_SURROUND) == 0) - { - fmt->Format.nChannels = 6; - fmt->dwChannelMask = KSAUDIO_SPEAKER_5POINT1_SURROUND; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 8 && - (ca_mask & ~KSAUDIO_SPEAKER_7POINT1) == 0) - { - fmt->Format.nChannels = 8; - fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1; - return; - } - - if (ca_layout->mNumberChannelDescriptions <= 8 && - (ca_mask & ~KSAUDIO_SPEAKER_7POINT1_SURROUND) == 0) - { - fmt->Format.nChannels = 8; - fmt->dwChannelMask = KSAUDIO_SPEAKER_7POINT1_SURROUND; - return; - } - - /* oddball format, report truthfully */ - fmt->Format.nChannels = ca_layout->mNumberChannelDescriptions; - fmt->dwChannelMask = ca_mask; -} - static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx) { ACImpl *This = impl_from_IAudioClient3(iface); - WAVEFORMATEXTENSIBLE *fmt; - OSStatus sc; - UInt32 size; - Float64 rate; - AudioBufferList *buffers; - AudioChannelLayout *layout; - AudioObjectPropertyAddress addr; - int i; + struct get_mix_format_params params; TRACE("(%p)->(%p)\n", This, pwfx); @@ -1530,104 +1381,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface, return E_POINTER; *pwfx = NULL; - fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); - if(!fmt) + params.dev_id = This->adevid; + params.flow = This->dataflow; + params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!params.fmt) return E_OUTOFMEMORY; - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - - addr.mScope = This->scope; - addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyPreferredChannelLayout; - - sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); - if(sc == noErr){ - layout = HeapAlloc(GetProcessHeap(), 0, size); - - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, layout); - if(sc == noErr){ - TRACE("Got channel layout: {tag: 0x%x, bitmap: 0x%x, num_descs: %u}\n", - (unsigned int)layout->mChannelLayoutTag, (unsigned int)layout->mChannelBitmap, - (unsigned int)layout->mNumberChannelDescriptions); - - if(layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelDescriptions){ - convert_channel_layout(layout, fmt); - }else{ - WARN("Haven't implemented support for this layout tag: 0x%x, guessing at layout\n", (unsigned int)layout->mChannelLayoutTag); - fmt->Format.nChannels = 0; - } - }else{ - TRACE("Unable to get _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); - fmt->Format.nChannels = 0; - } - - HeapFree(GetProcessHeap(), 0, layout); - }else{ - TRACE("Unable to get size for _PreferredChannelLayout property: %x, guessing at layout\n", (int)sc); - fmt->Format.nChannels = 0; - } - - if(fmt->Format.nChannels == 0){ - addr.mScope = This->scope; - addr.mElement = 0; - addr.mSelector = kAudioDevicePropertyStreamConfiguration; - - sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); - if(sc != noErr){ - CoTaskMemFree(fmt); - WARN("Unable to get size for _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - buffers = HeapAlloc(GetProcessHeap(), 0, size); - if(!buffers){ - CoTaskMemFree(fmt); - return E_OUTOFMEMORY; - } - - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, - &size, buffers); - if(sc != noErr){ - CoTaskMemFree(fmt); - HeapFree(GetProcessHeap(), 0, buffers); - WARN("Unable to get _StreamConfiguration property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - fmt->Format.nChannels = 0; - for(i = 0; i < buffers->mNumberBuffers; ++i) - fmt->Format.nChannels += buffers->mBuffers[i].mNumberChannels; - - HeapFree(GetProcessHeap(), 0, buffers); - - fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); - } + UNIX_CALL(get_mix_format, &params); - addr.mSelector = kAudioDevicePropertyNominalSampleRate; - size = sizeof(Float64); - sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); - if(sc != noErr){ - CoTaskMemFree(fmt); - WARN("Unable to get _NominalSampleRate property: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - fmt->Format.nSamplesPerSec = rate; - - fmt->Format.wBitsPerSample = 32; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; - - fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * - fmt->Format.nChannels) / 8; - fmt->Format.nAvgBytesPerSec = fmt->Format.nSamplesPerSec * - fmt->Format.nBlockAlign; - - fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; - fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); - - *pwfx = (WAVEFORMATEX*)fmt; - dump_fmt(*pwfx); + if(SUCCEEDED(params.result)){ + *pwfx = &params.fmt->Format; + dump_fmt(*pwfx); + }else + CoTaskMemFree(params.fmt); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7ebdc0b7786..e247b789d55 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -75,11 +75,20 @@ struct release_stream_params HRESULT result; }; +struct get_mix_format_params +{ + EDataFlow flow; + DWORD dev_id; + WAVEFORMATEXTENSIBLE *fmt; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, unix_create_stream, unix_release_stream, + unix_get_mix_format, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 6/7] winecoreaudio: Move create_stream and release_stream to the unixlib.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 464 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 304 +++---------------- dlls/winecoreaudio.drv/unixlib.h | 20 ++ 3 files changed, 527 insertions(+), 261 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index f3af24f80fb..3ab80efc4e2 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -85,6 +85,30 @@ static HRESULT osstatus_to_hresult(OSStatus sc) return E_FAIL; } +/* copied from kernelbase */ +static int muldiv( int a, int b, int c ) +{ + LONGLONG ret; + + if (!c) return -1; + + /* We want to deal with a positive divisor to simplify the logic. */ + if (c < 0) + { + a = -a; + c = -c; + } + + /* If the result is positive, we "add" to round. else, we subtract to round. */ + if ((a < 0 && b < 0) || (a >= 0 && b >= 0)) + ret = (((LONGLONG)a * b) + (c / 2)) / c; + else + ret = (((LONGLONG)a * b) - (c / 2)) / c; + + if (ret > 2147483647 || ret < -2147483647) return -1; + return ret; +} + static AudioObjectPropertyScope get_scope(EDataFlow flow) { return (flow == eRender) ? kAudioDevicePropertyScopeOutput : kAudioDevicePropertyScopeInput; @@ -241,7 +265,447 @@ static NTSTATUS get_endpoint_ids(void *args) return STATUS_SUCCESS; } +static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) +{ + WAVEFORMATEX *ret; + size_t size; + + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + size = sizeof(WAVEFORMATEXTENSIBLE); + else + size = sizeof(WAVEFORMATEX); + + ret = malloc(size); + if(!ret) + return NULL; + + memcpy(ret, fmt, size); + + ret->cbSize = size - sizeof(WAVEFORMATEX); + + return ret; +} + +static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); + else + memset(buffer, 0, frames * stream->fmt->nBlockAlign); +} + +/* CA is pulling data from us */ +static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, + const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, + AudioBufferList *data) +{ + struct coreaudio_stream *stream = user; + UINT32 to_copy_bytes, to_copy_frames, chunk_bytes, lcl_offs_bytes; + + OSSpinLockLock(&stream->lock); + + if(stream->playing){ + lcl_offs_bytes = stream->lcl_offs_frames * stream->fmt->nBlockAlign; + to_copy_frames = min(nframes, stream->held_frames); + to_copy_bytes = to_copy_frames * stream->fmt->nBlockAlign; + + chunk_bytes = (stream->bufsize_frames - stream->lcl_offs_frames) * stream->fmt->nBlockAlign; + + if(to_copy_bytes > chunk_bytes){ + memcpy(data->mBuffers[0].mData, stream->local_buffer + lcl_offs_bytes, chunk_bytes); + memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, stream->local_buffer, to_copy_bytes - chunk_bytes); + }else + memcpy(data->mBuffers[0].mData, stream->local_buffer + lcl_offs_bytes, to_copy_bytes); + + stream->lcl_offs_frames += to_copy_frames; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames -= to_copy_frames; + }else + to_copy_bytes = to_copy_frames = 0; + + if(nframes > to_copy_frames) + silence_buffer(stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); + + OSSpinLockUnlock(&stream->lock); + + return noErr; +} + +static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, + BYTE *src, UINT32 src_bytes) +{ + UINT32 chunk_bytes = dst_bytes - dst_offs; + + if(chunk_bytes < src_bytes){ + memcpy(dst + dst_offs, src, chunk_bytes); + memcpy(dst, src + chunk_bytes, src_bytes - chunk_bytes); + }else + memcpy(dst + dst_offs, src, src_bytes); +} + +/* we need to trigger CA to pull data from the device and give it to us + * + * raw data from CA is stored in cap_buffer, possibly via wrap_buffer + * + * raw data is resampled from cap_buffer into resamp_buffer in period-size + * chunks and copied to local_buffer + */ +static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, + const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, + AudioBufferList *data) +{ + struct coreaudio_stream *stream = user; + AudioBufferList list; + OSStatus sc; + UINT32 cap_wri_offs_frames; + + OSSpinLockLock(&stream->lock); + + cap_wri_offs_frames = (stream->cap_offs_frames + stream->cap_held_frames) % stream->cap_bufsize_frames; + + list.mNumberBuffers = 1; + list.mBuffers[0].mNumberChannels = stream->fmt->nChannels; + list.mBuffers[0].mDataByteSize = nframes * stream->fmt->nBlockAlign; + + if(!stream->playing || cap_wri_offs_frames + nframes > stream->cap_bufsize_frames){ + if(stream->wrap_bufsize_frames < nframes){ + free(stream->wrap_buffer); + stream->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); + stream->wrap_bufsize_frames = nframes; + } + + list.mBuffers[0].mData = stream->wrap_buffer; + }else + list.mBuffers[0].mData = stream->cap_buffer + cap_wri_offs_frames * stream->fmt->nBlockAlign; + + sc = AudioUnitRender(stream->unit, flags, ts, bus, nframes, &list); + if(sc != noErr){ + OSSpinLockUnlock(&stream->lock); + return sc; + } + + if(stream->playing){ + if(list.mBuffers[0].mData == stream->wrap_buffer){ + ca_wrap_buffer(stream->cap_buffer, + cap_wri_offs_frames * stream->fmt->nBlockAlign, + stream->cap_bufsize_frames * stream->fmt->nBlockAlign, + stream->wrap_buffer, list.mBuffers[0].mDataByteSize); + } + + stream->cap_held_frames += list.mBuffers[0].mDataByteSize / stream->fmt->nBlockAlign; + if(stream->cap_held_frames > stream->cap_bufsize_frames){ + stream->cap_offs_frames += stream->cap_held_frames % stream->cap_bufsize_frames; + stream->cap_offs_frames %= stream->cap_bufsize_frames; + stream->cap_held_frames = stream->cap_bufsize_frames; + } + } + + OSSpinLockUnlock(&stream->lock); + return noErr; +} + +static AudioComponentInstance get_audiounit(EDataFlow dataflow, AudioDeviceID adevid) +{ + AudioComponentInstance unit; + AudioComponent comp; + AudioComponentDescription desc; + OSStatus sc; + + memset(&desc, 0, sizeof(desc)); + desc.componentType = kAudioUnitType_Output; + desc.componentSubType = kAudioUnitSubType_HALOutput; + desc.componentManufacturer = kAudioUnitManufacturer_Apple; + + if(!(comp = AudioComponentFindNext(NULL, &desc))){ + WARN("AudioComponentFindNext failed\n"); + return NULL; + } + + sc = AudioComponentInstanceNew(comp, &unit); + if(sc != noErr){ + WARN("AudioComponentInstanceNew failed: %x\n", (int)sc); + return NULL; + } + + if(dataflow == eCapture){ + UInt32 enableio; + + enableio = 1; + sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, + kAudioUnitScope_Input, 1, &enableio, sizeof(enableio)); + if(sc != noErr){ + WARN("Couldn't enable I/O on input element: %x\n", (int)sc); + AudioComponentInstanceDispose(unit); + return NULL; + } + + enableio = 0; + sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_EnableIO, + kAudioUnitScope_Output, 0, &enableio, sizeof(enableio)); + if(sc != noErr){ + WARN("Couldn't disable I/O on output element: %x\n", (int)sc); + AudioComponentInstanceDispose(unit); + return NULL; + } + } + + sc = AudioUnitSetProperty(unit, kAudioOutputUnitProperty_CurrentDevice, + kAudioUnitScope_Global, 0, &adevid, sizeof(adevid)); + if(sc != noErr){ + WARN("Couldn't set audio unit device\n"); + AudioComponentInstanceDispose(unit); + return NULL; + } + + return unit; +} + +static void dump_adesc(const char *aux, AudioStreamBasicDescription *desc) +{ + TRACE("%s: mSampleRate: %f\n", aux, desc->mSampleRate); + TRACE("%s: mBytesPerPacket: %u\n", aux, (unsigned int)desc->mBytesPerPacket); + TRACE("%s: mFramesPerPacket: %u\n", aux, (unsigned int)desc->mFramesPerPacket); + TRACE("%s: mBytesPerFrame: %u\n", aux, (unsigned int)desc->mBytesPerFrame); + TRACE("%s: mChannelsPerFrame: %u\n", aux, (unsigned int)desc->mChannelsPerFrame); + TRACE("%s: mBitsPerChannel: %u\n", aux, (unsigned int)desc->mBitsPerChannel); +} + +static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, + const WAVEFORMATEX *fmt) +{ + const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + + desc->mFormatFlags = 0; + + if(fmt->wFormatTag == WAVE_FORMAT_PCM || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + desc->mFormatID = kAudioFormatLinearPCM; + if(fmt->wBitsPerSample > 8) + desc->mFormatFlags = kAudioFormatFlagIsSignedInteger; + }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ + desc->mFormatID = kAudioFormatLinearPCM; + desc->mFormatFlags = kAudioFormatFlagIsFloat; + }else if(fmt->wFormatTag == WAVE_FORMAT_MULAW || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_MULAW))){ + desc->mFormatID = kAudioFormatULaw; + }else if(fmt->wFormatTag == WAVE_FORMAT_ALAW || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_ALAW))){ + desc->mFormatID = kAudioFormatALaw; + }else + return AUDCLNT_E_UNSUPPORTED_FORMAT; + + desc->mSampleRate = fmt->nSamplesPerSec; + desc->mBytesPerPacket = fmt->nBlockAlign; + desc->mFramesPerPacket = 1; + desc->mBytesPerFrame = fmt->nBlockAlign; + desc->mChannelsPerFrame = fmt->nChannels; + desc->mBitsPerChannel = fmt->wBitsPerSample; + desc->mReserved = 0; + + return S_OK; +} + +static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance unit, + const WAVEFORMATEX *fmt, AudioStreamBasicDescription *dev_desc, + AudioConverterRef *converter) +{ + OSStatus sc; + HRESULT hr; + + if(dataflow == eCapture){ + AudioStreamBasicDescription desc; + UInt32 size; + Float64 rate; + fenv_t fenv; + BOOL fenv_stored = TRUE; + + hr = ca_get_audiodesc(&desc, fmt); + if(FAILED(hr)) + return hr; + dump_adesc("requested", &desc); + + /* input-only units can't perform sample rate conversion, so we have to + * set up our own AudioConverter to support arbitrary sample rates. */ + size = sizeof(*dev_desc); + sc = AudioUnitGetProperty(unit, kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Input, 1, dev_desc, &size); + if(sc != noErr){ + WARN("Couldn't get unit format: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + dump_adesc("hardware", dev_desc); + + rate = dev_desc->mSampleRate; + *dev_desc = desc; + dev_desc->mSampleRate = rate; + + dump_adesc("final", dev_desc); + sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Output, 1, dev_desc, sizeof(*dev_desc)); + if(sc != noErr){ + WARN("Couldn't set unit format: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + + /* AudioConverterNew requires divide-by-zero SSE exceptions to be masked */ + if(feholdexcept(&fenv)){ + WARN("Failed to store fenv state\n"); + fenv_stored = FALSE; + } + + sc = AudioConverterNew(dev_desc, &desc, converter); + + if(fenv_stored && fesetenv(&fenv)) + WARN("Failed to restore fenv state\n"); + + if(sc != noErr){ + WARN("Couldn't create audio converter: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + }else{ + hr = ca_get_audiodesc(dev_desc, fmt); + if(FAILED(hr)) + return hr; + + dump_adesc("final", dev_desc); + sc = AudioUnitSetProperty(unit, kAudioUnitProperty_StreamFormat, + kAudioUnitScope_Input, 0, dev_desc, sizeof(*dev_desc)); + if(sc != noErr){ + WARN("Couldn't set format: %x\n", (int)sc); + return osstatus_to_hresult(sc); + } + } + + return S_OK; +} + +static NTSTATUS create_stream(void *args) +{ + struct create_stream_params *params = args; + struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); + AURenderCallbackStruct input; + OSStatus sc; + + if(!stream){ + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + stream->fmt = clone_format(params->fmt); + if(!stream->fmt){ + params->result = E_OUTOFMEMORY; + goto end; + } + + stream->period_ms = params->period / 10000; + stream->period_frames = muldiv(params->period, stream->fmt->nSamplesPerSec, 10000000); + stream->dev_id = params->dev_id; + stream->flow = params->flow; + stream->share = params->share; + + stream->bufsize_frames = muldiv(params->duration, stream->fmt->nSamplesPerSec, 10000000); + if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) + stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; + + if(!(stream->unit = get_audiounit(stream->flow, stream->dev_id))){ + params->result = AUDCLNT_E_DEVICE_INVALIDATED; + goto end; + } + + params->result = ca_setup_audiounit(stream->flow, stream->unit, stream->fmt, &stream->dev_desc, &stream->converter); + if(FAILED(params->result)) goto end; + + input.inputProcRefCon = stream; + if(stream->flow == eCapture){ + input.inputProc = ca_capture_cb; + sc = AudioUnitSetProperty(stream->unit, kAudioOutputUnitProperty_SetInputCallback, + kAudioUnitScope_Output, 1, &input, sizeof(input)); + }else{ + input.inputProc = ca_render_cb; + sc = AudioUnitSetProperty(stream->unit, kAudioUnitProperty_SetRenderCallback, + kAudioUnitScope_Input, 0, &input, sizeof(input)); + } + if(sc != noErr){ + WARN("Couldn't set callback: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + goto end; + } + + sc = AudioUnitInitialize(stream->unit); + if(sc != noErr){ + WARN("Couldn't initialize: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + goto end; + } + + /* we play audio continuously because AudioOutputUnitStart sometimes takes + * a while to return */ + sc = AudioOutputUnitStart(stream->unit); + if(sc != noErr){ + WARN("Unit failed to start: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + goto end; + } + + stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, + MEM_COMMIT, PAGE_READWRITE)){ + params->result = E_OUTOFMEMORY; + goto end; + } + silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); + + if(stream->flow == eCapture){ + stream->cap_bufsize_frames = muldiv(params->duration, stream->dev_desc.mSampleRate, 10000000); + stream->cap_buffer = malloc(stream->cap_bufsize_frames * stream->fmt->nBlockAlign); + } + params->result = S_OK; + +end: + if(FAILED(params->result)){ + if(stream->converter) AudioConverterDispose(stream->converter); + if(stream->unit) AudioComponentInstanceDispose(stream->unit); + free(stream->fmt); + free(stream); + } else + params->stream = stream; + + return STATUS_SUCCESS; +} + +static NTSTATUS release_stream( void *args ) +{ + struct release_stream_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->unit){ + AudioOutputUnitStop(stream->unit); + AudioComponentInstanceDispose(stream->unit); + } + + if(stream->converter) AudioConverterDispose(stream->converter); + free(stream->wrap_buffer); + free(stream->cap_buffer); + if(stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, + &stream->local_buffer_size, MEM_RELEASE); + free(stream->fmt); + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, + create_stream, + release_stream, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 0abfebfb1a5..572126562c6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -138,6 +138,10 @@ struct ACImpl { struct coreaudio_stream *stream; struct list entry; + + /* Temporary */ + BYTE *feed_wrap_buffer; + UINT32 feed_wrap_bufsize_frames; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -613,7 +617,9 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); + struct release_stream_params params; ULONG ref; + ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ @@ -627,22 +633,13 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) WaitForSingleObject(event, INFINITE); CloseHandle(event); } - if (This->stream){ - AudioOutputUnitStop(This->stream->unit); - AudioComponentInstanceDispose(This->stream->unit); - if(This->stream->converter) - AudioConverterDispose(This->stream->converter); - HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); - if(This->stream->local_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, - &This->stream->local_buffer_size, MEM_RELEASE); + if(This->stream){ if(This->stream->tmp_buffer) NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, &This->stream->tmp_buffer_size, MEM_RELEASE); - free(This->stream->wrap_buffer); HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); - CoTaskMemFree(This->stream->fmt); - HeapFree(GetProcessHeap(), 0, This->stream); + params.stream = This->stream; + UNIX_CALL(release_stream, &params); } if(This->session){ EnterCriticalSection(&g_sessions_lock); @@ -650,6 +647,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); + free(This->feed_wrap_buffer); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); HeapFree(GetProcessHeap(), 0, This); @@ -717,27 +715,6 @@ static DWORD get_channel_mask(unsigned int channels) return 0; } -static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) -{ - WAVEFORMATEX *ret; - size_t size; - - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) - size = sizeof(WAVEFORMATEXTENSIBLE); - else - size = sizeof(WAVEFORMATEX); - - ret = CoTaskMemAlloc(size); - if(!ret) - return NULL; - - memcpy(ret, fmt, size); - - ret->cbSize = size - sizeof(WAVEFORMATEX); - - return ret; -} - static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, const WAVEFORMATEX *fmt) { @@ -881,43 +858,6 @@ static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -/* CA is pulling data from us */ -static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, - const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, - AudioBufferList *data) -{ - ACImpl *This = user; - UINT32 to_copy_bytes, to_copy_frames, chunk_bytes, lcl_offs_bytes; - - OSSpinLockLock(&This->stream->lock); - - if(This->stream->playing){ - lcl_offs_bytes = This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - to_copy_frames = min(nframes, This->stream->held_frames); - to_copy_bytes = to_copy_frames * This->stream->fmt->nBlockAlign; - - chunk_bytes = (This->stream->bufsize_frames - This->stream->lcl_offs_frames) * This->stream->fmt->nBlockAlign; - - if(to_copy_bytes > chunk_bytes){ - memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, chunk_bytes); - memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, This->stream->local_buffer, to_copy_bytes - chunk_bytes); - }else - memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, to_copy_bytes); - - This->stream->lcl_offs_frames += to_copy_frames; - This->stream->lcl_offs_frames %= This->stream->bufsize_frames; - This->stream->held_frames -= to_copy_frames; - }else - to_copy_bytes = to_copy_frames = 0; - - if(nframes > to_copy_frames) - silence_buffer(This->stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); - - OSSpinLockUnlock(&This->stream->lock); - - return noErr; -} - static UINT buf_ptr_diff(UINT left, UINT right, UINT bufsize) { if(left <= right) @@ -945,18 +885,18 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe if(This->stream->cap_offs_frames + *nframes > This->stream->cap_bufsize_frames){ UINT32 chunk_frames = This->stream->cap_bufsize_frames - This->stream->cap_offs_frames; - if(This->stream->wrap_bufsize_frames < *nframes){ - free(This->stream->wrap_buffer); - This->stream->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->stream->wrap_bufsize_frames = *nframes; + if(This->feed_wrap_bufsize_frames < *nframes){ + free(This->feed_wrap_buffer); + This->feed_wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); + This->feed_wrap_bufsize_frames = *nframes; } - memcpy(This->stream->wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, + memcpy(This->feed_wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, chunk_frames * This->stream->fmt->nBlockAlign); - memcpy(This->stream->wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, + memcpy(This->feed_wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - data->mBuffers[0].mData = This->stream->wrap_buffer; + data->mBuffers[0].mData = This->feed_wrap_buffer; }else data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; @@ -1017,67 +957,6 @@ static void capture_resample(ACImpl *This) } } -/* we need to trigger CA to pull data from the device and give it to us - * - * raw data from CA is stored in cap_buffer, possibly via wrap_buffer - * - * raw data is resampled from cap_buffer into resamp_buffer in period-size - * chunks and copied to local_buffer - */ -static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, - const AudioTimeStamp *ts, UInt32 bus, UInt32 nframes, - AudioBufferList *data) -{ - ACImpl *This = user; - AudioBufferList list; - OSStatus sc; - UINT32 cap_wri_offs_frames; - - OSSpinLockLock(&This->stream->lock); - - cap_wri_offs_frames = (This->stream->cap_offs_frames + This->stream->cap_held_frames) % This->stream->cap_bufsize_frames; - - list.mNumberBuffers = 1; - list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - list.mBuffers[0].mDataByteSize = nframes * This->stream->fmt->nBlockAlign; - - if(!This->stream->playing || cap_wri_offs_frames + nframes > This->stream->cap_bufsize_frames){ - if(This->stream->wrap_bufsize_frames < nframes){ - free(This->stream->wrap_buffer); - This->stream->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); - This->stream->wrap_bufsize_frames = nframes; - } - - list.mBuffers[0].mData = This->stream->wrap_buffer; - }else - list.mBuffers[0].mData = This->stream->cap_buffer + cap_wri_offs_frames * This->stream->fmt->nBlockAlign; - - sc = AudioUnitRender(This->stream->unit, flags, ts, bus, nframes, &list); - if(sc != noErr){ - OSSpinLockUnlock(&This->stream->lock); - return sc; - } - - if(This->stream->playing){ - if(list.mBuffers[0].mData == This->stream->wrap_buffer){ - ca_wrap_buffer(This->stream->cap_buffer, - cap_wri_offs_frames * This->stream->fmt->nBlockAlign, - This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign, - This->stream->wrap_buffer, list.mBuffers[0].mDataByteSize); - } - - This->stream->cap_held_frames += list.mBuffers[0].mDataByteSize / This->stream->fmt->nBlockAlign; - if(This->stream->cap_held_frames > This->stream->cap_bufsize_frames){ - This->stream->cap_offs_frames += This->stream->cap_held_frames % This->stream->cap_bufsize_frames; - This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; - This->stream->cap_held_frames = This->stream->cap_bufsize_frames; - } - } - - OSSpinLockUnlock(&This->stream->lock); - return noErr; -} - static void dump_adesc(const char *aux, AudioStreamBasicDescription *desc) { TRACE("%s: mSampleRate: %f\n", aux, desc->mSampleRate); @@ -1168,9 +1047,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); - struct coreaudio_stream *stream; - HRESULT hr; - OSStatus sc; + struct release_stream_params release_params; + struct create_stream_params params; UINT32 i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, @@ -1233,146 +1111,50 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*stream)); - if(!stream){ - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } - - stream->fmt = clone_format(fmt); - if(!stream->fmt){ - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } - - stream->period_ms = period / 10000; - stream->period_frames = MulDiv(period, stream->fmt->nSamplesPerSec, 10000000); - - stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; - - if(!(stream->unit = get_audiounit(This->dataflow, This->adevid))){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - - hr = ca_setup_audiounit(This->dataflow, stream->unit, stream->fmt, &stream->dev_desc, &stream->converter); - if(FAILED(hr)){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return hr; - } - - if(This->dataflow == eCapture){ - AURenderCallbackStruct input; - - memset(&input, 0, sizeof(input)); - input.inputProc = &ca_capture_cb; - input.inputProcRefCon = This; - - sc = AudioUnitSetProperty(stream->unit, kAudioOutputUnitProperty_SetInputCallback, - kAudioUnitScope_Output, 1, &input, sizeof(input)); - if(sc != noErr){ - WARN("Couldn't set callback: %x\n", (int)sc); - AudioConverterDispose(stream->converter); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - }else{ - AURenderCallbackStruct input; - - memset(&input, 0, sizeof(input)); - input.inputProc = &ca_render_cb; - input.inputProcRefCon = This; - - sc = AudioUnitSetProperty(stream->unit, kAudioUnitProperty_SetRenderCallback, - kAudioUnitScope_Input, 0, &input, sizeof(input)); - if(sc != noErr){ - WARN("Couldn't set callback: %x\n", (int)sc); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - } + params.dev_id = This->adevid; + params.flow = This->dataflow; + params.share = mode; + params.duration = duration; + params.period = period; + params.fmt = fmt; - sc = AudioUnitInitialize(stream->unit); - if(sc != noErr){ - WARN("Couldn't initialize: %x\n", (int)sc); - if(stream->converter) - AudioConverterDispose(stream->converter); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - - /* we play audio continuously because AudioOutputUnitStart sometimes takes - * a while to return */ - sc = AudioOutputUnitStart(stream->unit); - if(sc != noErr){ - WARN("Unit failed to start: %x\n", (int)sc); - if(stream->converter) - AudioConverterDispose(stream->converter); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return osstatus_to_hresult(sc); - } - - stream->local_buffer_size = stream->bufsize_frames * fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, - &stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); - - if(This->dataflow == eCapture){ - stream->cap_bufsize_frames = MulDiv(duration, stream->dev_desc.mSampleRate, 10000000); - stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, stream->cap_bufsize_frames * stream->fmt->nBlockAlign); - } + UNIX_CALL(create_stream, &params); + if(FAILED(params.result)) goto end; - stream->share = mode; This->flags = flags; This->channel_count = fmt->nChannels; This->period_ms = period / 10000; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; + params.result = E_OUTOFMEMORY; + goto end; } for(i = 0; i < This->channel_count; ++i) This->vols[i] = 1.f; - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, - &This->session); - if(FAILED(hr)){ - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); - HeapFree(GetProcessHeap(), 0, This->vols); - This->vols = NULL; - LeaveCriticalSection(&g_sessions_lock); - return E_INVALIDARG; - } + params.result = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); + if(FAILED(params.result)) goto end; list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, stream, -1); + ca_setvol(This, params.stream, -1); - This->stream = stream; +end: + if(FAILED(params.result)){ + if(params.stream){ + release_params.stream = This->stream; + UNIX_CALL(release_stream, &release_params); + } + HeapFree(GetProcessHeap(), 0, This->vols); + This->vols = NULL; + }else + This->stream = params.stream; LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 1b773b7f820..7ebdc0b7786 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -57,9 +57,29 @@ struct get_endpoint_ids_params unsigned int default_idx; }; +struct create_stream_params +{ + DWORD dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + REFERENCE_TIME duration; + REFERENCE_TIME period; + const WAVEFORMATEX *fmt; + HRESULT result; + struct coreaudio_stream *stream; +}; + +struct release_stream_params +{ + struct coreaudio_stream *stream; + HRESULT result; +}; + enum unix_funcs { unix_get_endpoint_ids, + unix_create_stream, + unix_release_stream, }; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1

[PATCH 5/7] winecoreaudio: Use the presence of stream to indicate the init state.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 211 +++++++++++++----------------- 1 file changed, 93 insertions(+), 118 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1e678b08c5b..0abfebfb1a5 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -129,7 +129,6 @@ struct ACImpl { HANDLE event; float *vols; - BOOL initted; AudioDeviceID adevid; AudioObjectPropertyScope scope; HANDLE timer; @@ -541,11 +540,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; - This->stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!This->stream){ - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; @@ -561,16 +555,12 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient else if(dataflow == eCapture) This->scope = kAudioDevicePropertyScopeInput; else{ - HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return E_INVALIDARG; } - This->stream->lock = 0; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return hr; } @@ -637,29 +627,31 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) WaitForSingleObject(event, INFINITE); CloseHandle(event); } - AudioOutputUnitStop(This->stream->unit); - AudioComponentInstanceDispose(This->stream->unit); - if(This->stream->converter) - AudioConverterDispose(This->stream->converter); + if (This->stream){ + AudioOutputUnitStop(This->stream->unit); + AudioComponentInstanceDispose(This->stream->unit); + if(This->stream->converter) + AudioConverterDispose(This->stream->converter); + HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); + if(This->stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, + &This->stream->local_buffer_size, MEM_RELEASE); + if(This->stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); + free(This->stream->wrap_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); + CoTaskMemFree(This->stream->fmt); + HeapFree(GetProcessHeap(), 0, This->stream); + } if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); - if(This->stream->local_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, - &This->stream->local_buffer_size, MEM_RELEASE); - if(This->stream->tmp_buffer) - NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, - &This->stream->tmp_buffer_size, MEM_RELEASE); - free(This->stream->wrap_buffer); - HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); - CoTaskMemFree(This->stream->fmt); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); - HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -1176,6 +1168,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); + struct coreaudio_stream *stream; HRESULT hr; OSStatus sc; UINT32 i; @@ -1235,40 +1228,42 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, EnterCriticalSection(&g_sessions_lock); - if(This->initted){ + if(This->stream){ LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } - OSSpinLockLock(&This->stream->lock); + stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*stream)); + if(!stream){ + LeaveCriticalSection(&g_sessions_lock); + return E_OUTOFMEMORY; + } - This->stream->fmt = clone_format(fmt); - if(!This->stream->fmt){ - OSSpinLockUnlock(&This->stream->lock); + stream->fmt = clone_format(fmt); + if(!stream->fmt){ + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } - This->stream->period_ms = period / 10000; - This->stream->period_frames = MulDiv(period, This->stream->fmt->nSamplesPerSec, 10000000); + stream->period_ms = period / 10000; + stream->period_frames = MulDiv(period, stream->fmt->nSamplesPerSec, 10000000); - This->stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; + stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; - if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + if(!(stream->unit = get_audiounit(This->dataflow, This->adevid))){ + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_DEVICE_INVALIDATED; } - hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); + hr = ca_setup_audiounit(This->dataflow, stream->unit, stream->fmt, &stream->dev_desc, &stream->converter); if(FAILED(hr)){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return hr; } @@ -1280,15 +1275,13 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_capture_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->stream->unit, kAudioOutputUnitProperty_SetInputCallback, + sc = AudioUnitSetProperty(stream->unit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Output, 1, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - AudioConverterDispose(This->stream->converter); - This->stream->converter = NULL; - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + AudioConverterDispose(stream->converter); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } @@ -1299,68 +1292,60 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_render_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->stream->unit, kAudioUnitProperty_SetRenderCallback, + sc = AudioUnitSetProperty(stream->unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } } - sc = AudioUnitInitialize(This->stream->unit); + sc = AudioUnitInitialize(stream->unit); if(sc != noErr){ WARN("Couldn't initialize: %x\n", (int)sc); - if(This->stream->converter){ - AudioConverterDispose(This->stream->converter); - This->stream->converter = NULL; - } - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + if(stream->converter) + AudioConverterDispose(stream->converter); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } /* we play audio continuously because AudioOutputUnitStart sometimes takes * a while to return */ - sc = AudioOutputUnitStart(This->stream->unit); + sc = AudioOutputUnitStart(stream->unit); if(sc != noErr){ WARN("Unit failed to start: %x\n", (int)sc); - if(This->stream->converter){ - AudioConverterDispose(This->stream->converter); - This->stream->converter = NULL; - } - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + if(stream->converter) + AudioConverterDispose(stream->converter); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } - This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, - &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(This->stream, This->stream->local_buffer, This->stream->bufsize_frames); + stream->local_buffer_size = stream->bufsize_frames * fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, + &stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); + silence_buffer(stream, stream->local_buffer, stream->bufsize_frames); if(This->dataflow == eCapture){ - This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); - This->stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign); + stream->cap_bufsize_frames = MulDiv(duration, stream->dev_desc.mSampleRate, 10000000); + stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, stream->cap_bufsize_frames * stream->fmt->nBlockAlign); } - This->stream->share = mode; + stream->share = mode; This->flags = flags; This->channel_count = fmt->nChannels; This->period_ms = period / 10000; This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); if(!This->vols){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1371,22 +1356,20 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); if(FAILED(hr)){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - OSSpinLockUnlock(&This->stream->lock); LeaveCriticalSection(&g_sessions_lock); return E_INVALIDARG; } list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, This->stream, -1); + ca_setvol(This, stream, -1); - This->initted = TRUE; + This->stream = stream; - OSSpinLockUnlock(&This->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; @@ -1402,12 +1385,10 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!frames) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); *frames = This->stream->bufsize_frames; @@ -1484,12 +1465,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!out) return E_POINTER; - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); addr.mScope = This->scope; addr.mSelector = kAudioDevicePropertyLatency; @@ -1524,7 +1503,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, UINT32 *numpad) { - if(!This->initted) + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; if(This->dataflow == eCapture) @@ -1546,6 +1525,9 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!numpad) return E_POINTER; + if(!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + OSSpinLockLock(&This->stream->lock); hr = AudioClient_GetCurrentPadding_nolock(This, numpad); @@ -1898,12 +1880,10 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); if(This->stream->playing){ OSSpinLockUnlock(&This->stream->lock); @@ -1937,12 +1917,10 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); if(!This->stream->playing){ OSSpinLockUnlock(&This->stream->lock); @@ -1962,12 +1940,10 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->stream->lock); - - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - } + + OSSpinLockLock(&This->stream->lock); if(This->stream->playing){ OSSpinLockUnlock(&This->stream->lock); @@ -2007,11 +1983,12 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!event) return E_INVALIDARG; + if(!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + EnterCriticalSection(&g_sessions_lock); - if(!This->initted) - hr = AUDCLNT_E_NOT_INITIALIZED; - else if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) hr = AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; else if(This->event){ FIXME("called twice\n"); @@ -2036,12 +2013,10 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - EnterCriticalSection(&g_sessions_lock); + if(!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; - if(!This->initted){ - hr = AUDCLNT_E_NOT_INITIALIZED; - goto end; - } + EnterCriticalSection(&g_sessions_lock); if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ -- 2.23.0

2 1

[PATCH 4/7] winecoreaudio: Pass the stream separately to ca_setvol().
by Huw Davies 22 Nov '21

22 Nov '21

This is a temporary measure that will enable the client volumes to be initialized without having the stream set. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index abe77d11ee9..1e678b08c5b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -178,7 +178,7 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, UINT32 index); +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -1382,7 +1382,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, -1); + ca_setvol(This, This->stream, -1); This->initted = TRUE; @@ -2978,7 +2978,7 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = }; /* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, UINT32 index) +static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) { Float32 level; OSStatus sc; @@ -2989,7 +2989,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->stream->fmt->nChannels; ++i){ + for(i = 0; i < stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -3000,7 +3000,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3015,7 +3015,7 @@ static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ HRESULT hr; - hr = ca_setvol(client, index); + hr = ca_setvol(client, client->stream, index); if(FAILED(hr)) ret = hr; } @@ -3214,7 +3214,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, index); + ret = ca_setvol(This, This->stream, index); LeaveCriticalSection(&g_sessions_lock); @@ -3259,7 +3259,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, -1); + ret = ca_setvol(This, This->stream, -1); LeaveCriticalSection(&g_sessions_lock); -- 2.23.0

2 1

[PATCH 3/7] winecoreaudio: Pass the stream directly to silence_buffer().
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 56f533f8bc1..abe77d11ee9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -877,16 +877,16 @@ static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, memcpy(dst + dst_offs, src, src_bytes); } -static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) -{ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->stream->fmt; - if((This->stream->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->stream->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->stream->fmt->nBlockAlign); +static void silence_buffer(struct coreaudio_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->stream->fmt->nBlockAlign); + memset(buffer, 0, frames * stream->fmt->nBlockAlign); } /* CA is pulling data from us */ @@ -919,7 +919,7 @@ static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, to_copy_bytes = to_copy_frames = 0; if(nframes > to_copy_frames) - silence_buffer(This, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); + silence_buffer(This->stream, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); OSSpinLockUnlock(&This->stream->lock); @@ -1344,7 +1344,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); - silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); + silence_buffer(This->stream, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); @@ -2318,7 +2318,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->stream->getbuf_last = frames; } - silence_buffer(This, *data, frames); + silence_buffer(This->stream, *data, frames); OSSpinLockUnlock(&This->stream->lock); @@ -2357,7 +2357,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buffer = This->stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - silence_buffer(This, buffer, frames); + silence_buffer(This->stream, buffer, frames); if(This->stream->getbuf_last < 0) ca_wrap_buffer(This->stream->local_buffer, -- 2.23.0

2 1

[PATCH 2/7] winecoreaudio: Move creation of the audio unit to IAudioClient_Initialize().
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 642610b4b60..56f533f8bc1 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -580,12 +580,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->adevid = adevid; - if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ - HeapFree(GetProcessHeap(), 0, This->stream); - HeapFree(GetProcessHeap(), 0, This); - return AUDCLNT_E_DEVICE_INVALIDATED; - } - *out = (IAudioClient *)&This->IAudioClient3_iface; IAudioClient3_AddRef(&This->IAudioClient3_iface); @@ -1262,6 +1256,14 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; + if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); if(FAILED(hr)){ CoTaskMemFree(This->stream->fmt); -- 2.23.0

2 1

[PATCH 1/7] winecoreaudio: Use NtAllocateVirtualMemory() for local and tmp buffers.
by Huw Davies 22 Nov '21

22 Nov '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 28 ++++++++++++++++++++-------- dlls/winecoreaudio.drv/unixlib.h | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 1e37a2a9026..642610b4b60 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -653,9 +653,13 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); - HeapFree(GetProcessHeap(), 0, This->stream->local_buffer); + if(This->stream->local_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, + &This->stream->local_buffer_size, MEM_RELEASE); + if(This->stream->tmp_buffer) + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); free(This->stream->wrap_buffer); HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); CoTaskMemFree(This->stream->fmt); @@ -1335,7 +1339,9 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return osstatus_to_hresult(sc); } - This->stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->bufsize_frames * fmt->nBlockAlign); + This->stream->local_buffer_size = This->stream->bufsize_frames * fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->local_buffer, 0, + &This->stream->local_buffer_size, MEM_COMMIT, PAGE_READWRITE); silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ @@ -2292,9 +2298,12 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ if(This->stream->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); - This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->stream->fmt->nBlockAlign); - if(!This->stream->tmp_buffer){ + NtFreeVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, + &This->stream->tmp_buffer_size, MEM_RELEASE); + This->stream->tmp_buffer_size = frames * This->stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, + &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + This->stream->tmp_buffer_frames = 0; OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } @@ -2449,8 +2458,11 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; if(chunk_frames < This->stream->period_frames){ chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; - if(!This->stream->tmp_buffer) - This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->period_frames * This->stream->fmt->nBlockAlign); + if(!This->stream->tmp_buffer){ + This->stream->tmp_buffer_size = This->stream->period_frames * This->stream->fmt->nBlockAlign; + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&This->stream->tmp_buffer, 0, + &This->stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + } *data = This->stream->tmp_buffer; memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 6a991f1de98..1b773b7f820 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -29,7 +29,6 @@ struct coreaudio_stream /* To be made private */ AUDCLNT_SHAREMODE share; BOOL playing; - SIZE_T local_buffer_size, tmp_buffer_size; UINT32 period_ms, period_frames; UINT32 bufsize_frames, resamp_bufsize_frames; UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; @@ -39,6 +38,7 @@ struct coreaudio_stream /* To be made private */ INT32 getbuf_last; WAVEFORMATEX *fmt; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; + SIZE_T local_buffer_size, tmp_buffer_size; }; struct endpoint -- 2.23.0

2 1

[PATCH 1/6] wined3d: Move the "buffer_offset" field to struct wined3d_bo.
by Zebediah Figura 22 Nov '21

22 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 14 +++++++------- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 8 ++++---- dlls/wined3d/context_vk.c | 10 +++++----- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- 9 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e6f5bf108c7..f9a31265cd3 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1011,7 +1011,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = bo->buffer_offset + (uintptr_t)data->addr; + vk_barrier.offset = bo->b.buffer_offset + (uintptr_t)data->addr; vk_barrier.size = size; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); @@ -1113,8 +1113,8 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, src_access_mask = vk_access_mask_from_buffer_usage(src_bo->usage); dst_access_mask = vk_access_mask_from_buffer_usage(dst_bo->usage); - region.srcOffset = src_bo->buffer_offset + (uintptr_t)src->addr; - region.dstOffset = dst_bo->buffer_offset + (uintptr_t)dst->addr; + region.srcOffset = src_bo->b.buffer_offset + (uintptr_t)src->addr; + region.dstOffset = dst_bo->b.buffer_offset + (uintptr_t)dst->addr; region.size = size; vk_barrier[0].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; @@ -1781,7 +1781,7 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(context_vk->vk_so_counters); ++i) { context_vk->vk_so_counters[i] = bo->vk_buffer; - context_vk->vk_so_offsets[i] = bo->buffer_offset + i * sizeof(uint32_t) * 2; + context_vk->vk_so_offsets[i] = bo->b.buffer_offset + i * sizeof(uint32_t) * 2; } } @@ -1805,13 +1805,13 @@ static void adapter_vk_draw_primitive(struct wined3d_device *device, { stride = sizeof(VkDrawIndexedIndirectCommand); VK_CALL(vkCmdDrawIndexedIndirect(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + parameters->u.indirect.offset, size / stride, stride)); + bo->b.buffer_offset + parameters->u.indirect.offset, size / stride, stride)); } else { stride = sizeof(VkDrawIndirectCommand); VK_CALL(vkCmdDrawIndirect(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + parameters->u.indirect.offset, size / stride, stride)); + bo->b.buffer_offset + parameters->u.indirect.offset, size / stride, stride)); } } else @@ -1871,7 +1871,7 @@ static void adapter_vk_dispatch_compute(struct wined3d_device *device, wined3d_context_vk_reference_bo(context_vk, bo); VK_CALL(vkCmdDispatchIndirect(vk_command_buffer, bo->vk_buffer, - bo->buffer_offset + parameters->u.indirect.offset)); + bo->b.buffer_offset + parameters->u.indirect.offset)); } else { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 315ea05260e..d3aeb2e76f4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1521,7 +1521,7 @@ const VkDescriptorBufferInfo *wined3d_buffer_vk_get_buffer_info(struct wined3d_b return &buffer_vk->buffer_info; buffer_vk->buffer_info.buffer = bo->vk_buffer; - buffer_vk->buffer_info.offset = bo->buffer_offset; + buffer_vk->buffer_info.offset = bo->b.buffer_offset; buffer_vk->buffer_info.range = buffer_vk->b.resource.size; buffer_vk->b.bo_user.valid = true; @@ -1702,7 +1702,7 @@ void wined3d_buffer_vk_barrier(struct wined3d_buffer_vk *buffer_vk, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = bo->buffer_offset; + vk_barrier.offset = bo->b.buffer_offset; vk_barrier.size = buffer_vk->b.resource.size; VK_CALL(vkCmdPipelineBarrier(wined3d_context_vk_get_command_buffer(context_vk), vk_pipeline_stage_mask_from_bind_flags(src_bind_mask), diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 2751a4a2182..69eb13f3027 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2922,7 +2922,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; - bo->buffer_offset = 0; + bo->b.buffer_offset = 0; bo->b.map_ptr = NULL; return true; @@ -3789,7 +3789,7 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex if (view_gl->counter_bo.id) GL_EXTCALL(glBindBufferRange(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo.id, - view_gl->counter_bo.buffer_offset, view_gl->counter_bo.size)); + view_gl->counter_bo.b.buffer_offset, view_gl->counter_bo.size)); } checkGLcall("Bind unordered access views"); } @@ -4915,7 +4915,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!bo || !stream_info->all_vbo) idx_data = index_buffer->resource.heap_memory; else - idx_data = (void *)wined3d_bo_gl(bo)->buffer_offset; + idx_data = (void *)bo->buffer_offset; idx_data = (const BYTE *)idx_data + state->index_offset; if (state->index_format == WINED3DFMT_R16_UINT) @@ -5077,7 +5077,7 @@ static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_el const uint8_t *offset = element->data.addr + state->load_base_vertex_index * element->stride; if (element->data.buffer_object) - offset += wined3d_bo_gl(element->data.buffer_object)->buffer_offset; + offset += element->data.buffer_object->buffer_offset; return offset; } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ec3554ddc30..56b2da53060 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -456,8 +456,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context *bo = slab->bo; bo->memory = NULL; bo->slab = slab; - bo->buffer_offset = idx * object_size; - bo->b.memory_offset = slab->bo.b.memory_offset + bo->buffer_offset; + bo->b.buffer_offset = idx * object_size; + bo->b.memory_offset = slab->bo.b.memory_offset + bo->b.buffer_offset; bo->size = size; list_init(&bo->b.users); bo->command_buffer_id = 0; @@ -465,7 +465,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context TRACE("Using buffer 0x%s, memory 0x%s, offset 0x%s for bo %p.\n", wine_dbgstr_longlong(bo->vk_buffer), wine_dbgstr_longlong(bo->vk_memory), - wine_dbgstr_longlong(bo->buffer_offset), bo); + wine_dbgstr_longlong(bo->b.buffer_offset), bo); return true; } @@ -534,7 +534,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic } bo->b.map_ptr = NULL; - bo->buffer_offset = 0; + bo->b.buffer_offset = 0; bo->size = size; bo->usage = usage; bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; @@ -961,7 +961,7 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->b.map_ptr) wined3d_bo_slab_vk_unmap(slab_vk, context_vk); object_size = slab_vk->bo.size / 32; - idx = bo->buffer_offset / object_size; + idx = bo->b.buffer_offset / object_size; wined3d_context_vk_destroy_bo_slab_slice(context_vk, slab_vk, idx, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c5de58c29c9..7fb8a7ec3a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -657,9 +657,9 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) return false; - VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.buffer_offset, r->bo.size, 0x00000000u)); + VK_CALL(vkCmdFillBuffer(vk_command_buffer, r->bo.vk_buffer, r->bo.b.buffer_offset, r->bo.size, 0x00000000u)); r->buffer_info.buffer = r->bo.vk_buffer; - r->buffer_info.offset = r->bo.buffer_offset; + r->buffer_info.offset = r->bo.b.buffer_offset; r->buffer_info.range = r->bo.size; if (!wined3d_null_image_vk_init(&r->image_1d, context_vk, vk_command_buffer, VK_IMAGE_TYPE_1D, 1, 1)) @@ -735,7 +735,7 @@ bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk, st buffer_create_info.flags = 0; buffer_create_info.buffer = r->bo.vk_buffer; buffer_create_info.format = VK_FORMAT_R32_UINT; - buffer_create_info.offset = r->bo.buffer_offset; + buffer_create_info.offset = r->bo.b.buffer_offset; buffer_create_info.range = r->bo.size; if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e0dba8701bc..c76e0c2b604 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4600,7 +4600,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state buffer = buffer_state->buffer; bo_gl = wined3d_bo_gl(buffer->buffer_object); GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i, - bo_gl->id, bo_gl->buffer_offset + buffer_state->offset, buffer_state->size)); + bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, buffer_state->size)); buffer->bo_user.valid = true; } checkGLcall("bind constant buffers"); @@ -4677,7 +4677,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state } size = buffer->resource.size - offset; GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, - bo_gl->id, bo_gl->buffer_offset + offset, size)); + bo_gl->id, bo_gl->b.buffer_offset + offset, size)); buffer->bo_user.valid = true; } checkGLcall("bind transform feedback buffers"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7e2da350f5a..87ae569b549 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4764,7 +4764,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = src_bo->vk_buffer; - vk_barrier.offset = src_bo->buffer_offset + (size_t)src_bo_addr->addr; + vk_barrier.offset = src_bo->b.buffer_offset + (size_t)src_bo_addr->addr; vk_barrier.size = sub_resource->size; src_offset += (size_t)src_bo_addr->addr; @@ -4788,7 +4788,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->image.vk_image, &vk_range); - region.bufferOffset = src_bo->buffer_offset + src_offset; + region.bufferOffset = src_bo->b.buffer_offset + src_offset; region.bufferRowLength = (src_row_pitch / src_format->block_byte_count) * src_format->block_width; if (src_row_pitch) region.bufferImageHeight = (src_slice_pitch / src_row_pitch) * src_format->block_height; @@ -4941,7 +4941,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = dst_bo->vk_buffer; - vk_barrier.offset = dst_bo->buffer_offset + (size_t)dst_bo_addr->addr; + vk_barrier.offset = dst_bo->b.buffer_offset + (size_t)dst_bo_addr->addr; vk_barrier.size = sub_resource->size; bo_stage_flags = vk_pipeline_stage_mask_from_buffer_usage(dst_bo->usage); @@ -4964,7 +4964,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, src_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->image.vk_image, &vk_range); - region.bufferOffset = dst_bo->buffer_offset + dst_offset; + region.bufferOffset = dst_bo->b.buffer_offset + dst_offset; region.bufferRowLength = 0; region.bufferImageHeight = 0; region.imageSubresource.aspectMask = vk_range.aspectMask; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b902812aded..b981602f1a2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -685,7 +685,7 @@ static VkBufferView wined3d_view_vk_create_vk_buffer_view(struct wined3d_context create_info.flags = 0; create_info.buffer = bo->vk_buffer; create_info.format = view_format_vk->vk_format; - create_info.offset = bo->buffer_offset + offset; + create_info.offset = bo->b.buffer_offset + offset; create_info.range = size; device_vk = wined3d_device_vk(buffer_vk->b.resource.device); @@ -2101,7 +2101,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view buffer_info.buffer = constants_bo.vk_buffer; buffer_info.range = constants_bo.size; - buffer_info.offset = constants_bo.buffer_offset; + buffer_info.offset = constants_bo.b.buffer_offset; vk_info = context_vk->vk_info; @@ -2234,7 +2234,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) wined3d_context_vk_end_current_render_pass(context_vk); VK_CALL(vkCmdFillBuffer(wined3d_context_vk_get_command_buffer(context_vk), - uav_vk->counter_bo.vk_buffer, uav_vk->counter_bo.buffer_offset, sizeof(uint32_t), 0)); + uav_vk->counter_bo.vk_buffer, uav_vk->counter_bo.b.buffer_offset, sizeof(uint32_t), 0)); wined3d_context_vk_reference_bo(context_vk, &uav_vk->counter_bo); create_info.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; @@ -2242,7 +2242,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object) create_info.flags = 0; create_info.buffer = uav_vk->counter_bo.vk_buffer; create_info.format = VK_FORMAT_R32_UINT; - create_info.offset = uav_vk->counter_bo.buffer_offset; + create_info.offset = uav_vk->counter_bo.b.buffer_offset; create_info.range = sizeof(uint32_t); if ((vr = VK_CALL(vkCreateBufferView(device_vk->vk_device, &create_info, NULL, &uav_vk->vk_counter_view))) < 0) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b02c2448d..2fce585c6b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1597,6 +1597,7 @@ struct wined3d_bo { struct list users; void *map_ptr; + size_t buffer_offset; size_t memory_offset; bool coherent; }; @@ -1606,7 +1607,6 @@ struct wined3d_bo_gl struct wined3d_bo b; GLuint id; - GLsizeiptr buffer_offset; GLsizeiptr size; GLenum binding; GLenum usage; @@ -1641,7 +1641,6 @@ struct wined3d_bo_vk VkDeviceMemory vk_memory; - VkDeviceSize buffer_offset; VkDeviceSize size; VkBufferUsageFlags usage; VkMemoryPropertyFlags memory_type; -- 2.33.0

3 12

[PATCH vkd3d] vkd3d-shader/hlsl: Add Gather methods and tests.
by Francisco Casas 22 Nov '21

22 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + libs/vkd3d-shader/hlsl.c | 4 ++ libs/vkd3d-shader/hlsl.h | 4 ++ libs/vkd3d-shader/hlsl.y | 78 +++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_sm4.c | 66 ++++++++++++++++++++- tests/hlsl-gather.shader_test | 106 ++++++++++++++++++++++++++++++++++ 6 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 tests/hlsl-gather.shader_test diff --git a/Makefile.am b/Makefile.am index 3e083b0a..1a80152a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,6 +67,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -292,6 +293,7 @@ XFAIL_TESTS = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-gather.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278..74b78f1b 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1250,6 +1250,10 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru { [HLSL_RESOURCE_LOAD] = "load_resource", [HLSL_RESOURCE_SAMPLE] = "sample", + [HLSL_RESOURCE_GATHER_RED] = "gather4r", + [HLSL_RESOURCE_GATHER_GREEN] = "gather4g", + [HLSL_RESOURCE_GATHER_BLUE] = "gather4b", + [HLSL_RESOURCE_GATHER_ALPHA] = "gather4a", }; vkd3d_string_buffer_printf(buffer, "%s(resource = ", type_names[load->load_type]); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 365ef980..891f671a 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -377,6 +377,10 @@ enum hlsl_resource_load_type { HLSL_RESOURCE_LOAD, HLSL_RESOURCE_SAMPLE, + HLSL_RESOURCE_GATHER_RED, + HLSL_RESOURCE_GATHER_GREEN, + HLSL_RESOURCE_GATHER_BLUE, + HLSL_RESOURCE_GATHER_ALPHA, }; struct hlsl_ir_resource_load diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b7e0409d..8a2c1dd9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1852,6 +1852,84 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } + else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") + || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) + { + const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); + enum hlsl_resource_load_type load_type; + const struct hlsl_type *sampler_type; + struct hlsl_ir_resource_load *load; + struct hlsl_ir_load *sampler_load; + struct hlsl_type *result_type; + struct hlsl_ir_node *coords; + int read_channel; + + if(!strcmp(name, "Gather") || !strcmp(name, "GatherRed")){ + load_type = HLSL_RESOURCE_GATHER_RED; + read_channel = 0; + } + else if(!strcmp(name, "GatherGreen")){ + load_type = HLSL_RESOURCE_GATHER_GREEN; + read_channel = 1; + } + else if(!strcmp(name, "GatherBlue")){ + load_type = HLSL_RESOURCE_GATHER_BLUE; + read_channel = 2; + } + else if(!strcmp(name, "GatherAlpha")){ + load_type = HLSL_RESOURCE_GATHER_ALPHA; + read_channel = 3; + } else { + assert(!"Unexpected Gather method."); + } + + if (params->args_count != 3 && params->args_count != 4) + { + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to method '%s': expected 3 or 4, but got %u.", name, params->args_count); + return false; + } + if (params->args_count >= 3) + FIXME("Ignoring offset parameter.\n"); + if (params->args_count >= 4) + FIXME("Ignoring 'status' output parameter.\n"); + + sampler_type = params->args[0]->data_type; + if (sampler_type->type != HLSL_CLASS_OBJECT || sampler_type->base_type != HLSL_TYPE_SAMPLER + || sampler_type->sampler_dim != HLSL_SAMPLER_DIM_GENERIC) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, sampler_type))) + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument 0 of %s(): expected 'sampler', but got '%s'.", name, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if(read_channel >= object_type->e.resource_format->dimx){ + hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Method %s() requires at least %d channels.", name, read_channel+1); + return false; + } + + result_type = hlsl_get_vector_type(ctx, object_type->e.resource_format->base_type, 4); + + /* Only HLSL_IR_LOAD can return an object. */ + sampler_load = hlsl_ir_load(params->args[0]); + + if (!(coords = add_implicit_conversion(ctx, instrs, params->args[1], + hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc))) + coords = params->args[1]; + + if (!(load = hlsl_new_resource_load(ctx, result_type, + load_type, object_load->src.var, object_load->src.offset.node, + sampler_load->src.var, sampler_load->src.offset.node, coords, loc))) + return false; + list_add_tail(instrs, &load->node.entry); + return true; + + } else { struct vkd3d_string_buffer *string; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..5f290129 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -753,7 +753,7 @@ struct sm4_instruction struct sm4_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; unsigned int swizzle; - } srcs[2]; + } srcs[3]; unsigned int src_count; uint32_t idx[2]; @@ -1506,6 +1506,61 @@ static void write_sm4_loop(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } + +static void write_sm4_gather(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, + const struct hlsl_deref *resource, const struct hlsl_deref *sampler, const struct hlsl_ir_node *coords, + enum hlsl_resource_load_type load_type) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_GATHER4; + + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); + instr.dst_count = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); + + sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, + resource, resource_type); + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); + + sm4_register_from_deref(ctx, &instr.srcs[2].reg, &writemask, NULL, + sampler, sampler->var->data_type); + instr.srcs[2].reg.type = VKD3D_SM4_RT_SAMPLER; + instr.srcs[2].reg.dim = 1; + instr.srcs[2].swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; + + switch (load_type){ + case HLSL_RESOURCE_GATHER_RED: + instr.srcs[2].swizzle = HLSL_SWIZZLE(X, X, X, X); + break; + case HLSL_RESOURCE_GATHER_GREEN: + instr.srcs[2].swizzle = HLSL_SWIZZLE(Y, Y, Y, Y); + break; + case HLSL_RESOURCE_GATHER_BLUE: + instr.srcs[2].swizzle = HLSL_SWIZZLE(Z, Z, Z, Z); + break; + case HLSL_RESOURCE_GATHER_ALPHA: + instr.srcs[2].swizzle = HLSL_SWIZZLE(W, W, W, W); + break; + default: + assert(!"Invalid hlsl_resource_load_type."); + break; + } + instr.src_count = 3; + + write_sm4_instruction(buffer, &instr); +} + + + + + + static void write_sm4_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_resource_load *load) { @@ -1527,6 +1582,15 @@ static void write_sm4_resource_load(struct hlsl_ctx *ctx, case HLSL_RESOURCE_SAMPLE: hlsl_fixme(ctx, load->node.loc, "Resource sample instruction."); break; + + case HLSL_RESOURCE_GATHER_RED: + case HLSL_RESOURCE_GATHER_GREEN: + case HLSL_RESOURCE_GATHER_BLUE: + case HLSL_RESOURCE_GATHER_ALPHA: + assert(load->sampler.var); + write_sm4_gather(ctx, buffer, resource_type, &load->node, &load->resource, + &load->sampler, coords, load->load_type); + break; } } diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl-gather.shader_test new file mode 100644 index 00000000..6731b77c --- /dev/null +++ b/tests/hlsl-gather.shader_test @@ -0,0 +1,106 @@ +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Gather(s, float2(0.2, 0.2), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.1, 0.1, 0.0) + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.8, 0.8), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.1, 0.1) + + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherGreen(s, float2(0.2, 0.2), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.1, 0.1, 0.0, 0.0) + + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherBlue(s, float2(0.2, 0.8), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.0, 0.5, 0.0, 0.5) + + + + +[pixel shader] +SamplerState s; +Texture2D t; + +float4 main() : sv_target +{ + return t.GatherAlpha(s, float2(0.2, 0.8), int2(0 , 0)); +} + +[test] +draw quad +probe all rgba (0.4, 0.0, 0.4, 0.0) + + + + -- 2.25.1

2 1

[PATCH vkd3d v2 1/7] vkd3d-shader/hlsl: Write SM4 integer negation.
by Giovanni Mascellani 22 Nov '21

22 Nov '21

--- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..acc11ce9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1376,6 +1376,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.34.0

2 15

[RFC, website] Remove stray file
by Julian Rüger 22 Nov '21

22 Nov '21

Good evening to you all! I just noticed there is an empty file "freenode.uP4Y16UYccnE.html" in the top-level of wine-website git. https://source.winehq.org/git/website.git/tree Since freenode is dead and all, can this file be removed? Does anyone know what it's purpose was supposed to be? Best, Julian

2 1

[PATCH] ntdll: Place PEB before first TEB.
by Paul Gofman 22 Nov '21

22 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/wow64.c | 25 +++++++++++++++++++++++++ dlls/ntdll/thread.c | 4 +--- dlls/ntdll/unix/debug.c | 2 +- dlls/ntdll/unix/virtual.c | 15 ++++++++------- 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index be2f2138933..3d2548843be 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -225,6 +225,14 @@ static void test_query_architectures(void) } } +static TEB *test_thread_teb_addr; + +static DWORD WINAPI test_teb_addr_thread(void *ptr) +{ + test_thread_teb_addr = NtCurrentTeb(); + return 0; +} + static void test_peb_teb(void) { PROCESS_BASIC_INFORMATION proc_info; @@ -232,6 +240,7 @@ static void test_peb_teb(void) PROCESS_INFORMATION pi; STARTUPINFOA si = {0}; NTSTATUS status; + HANDLE thread; void *redir; SIZE_T res; TEB teb; @@ -419,6 +428,22 @@ static void test_peb_teb(void) ok( !NtCurrentTeb()->GdiBatchCount, "GdiBatchCount set to %x\n", NtCurrentTeb()->GdiBatchCount ); ok( !NtCurrentTeb()->WowTebOffset || broken( NtCurrentTeb()->WowTebOffset == 1 ), /* vista */ "WowTebOffset set to %x\n", NtCurrentTeb()->WowTebOffset ); + + thread = CreateThread( NULL, 0, test_teb_addr_thread, NULL, 0, NULL ); + WaitForSingleObject( thread, INFINITE ); + if (test_thread_teb_addr > NtCurrentTeb()) + { + if (sizeof(void *) > sizeof(int) || is_wow64) + { + ok( (char *)NtCurrentTeb() - NtCurrentTeb()->WowTebOffset == (char *)NtCurrentTeb()->Peb + 0x1000, + "Got unexpected teb %p, peb %p.\n", NtCurrentTeb(), NtCurrentTeb()->Peb ); + } + } + else + { + /* Before Win10 1607. */ + win_skip( "Old teb placement.\n" ); + } } static void test_selectors(void) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 37dc7c8ab37..dcf226294e8 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -63,9 +63,7 @@ static inline struct debug_info *get_info(void) static void init_options(void) { - unsigned int offset = page_size * (sizeof(void *) / 4); - - debug_options = (struct __wine_debug_channel *)((char *)NtCurrentTeb()->Peb + offset); + debug_options = (struct __wine_debug_channel *)((char *)NtCurrentTeb()->Peb - 3 * page_size); while (debug_options[nb_debug_options].name[0]) nb_debug_options++; } diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 26e7decc059..7744d421f6d 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -324,7 +324,7 @@ void dbg_init(void) if (nb_debug_options == -1) init_options(); - options = (struct __wine_debug_channel *)((char *)peb + (is_win64 ? 2 : 1) * page_size); + options = (struct __wine_debug_channel *)((char *)peb - 3 * page_size); memcpy( options, debug_options, nb_debug_options * sizeof(*options) ); free( debug_options ); debug_options = options; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 5873a3e2335..1dcde261bcf 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2986,6 +2986,7 @@ static TEB *init_teb( void *ptr, BOOL is_wow ) */ TEB *virtual_alloc_first_teb(void) { + static const BOOL is_wow = FALSE; void *ptr; NTSTATUS status; SIZE_T data_size = page_size; @@ -3003,12 +3004,12 @@ TEB *virtual_alloc_first_teb(void) NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? 0x7fffffff : 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); - teb_block_pos = 30; - ptr = (char *)teb_block + 30 * block_size; + teb_block_pos = 2; + ptr = (char *)teb_block; data_size = 2 * block_size; NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &data_size, MEM_COMMIT, PAGE_READWRITE ); - peb = (PEB *)((char *)teb_block + 31 * block_size + (is_win64 ? 0 : page_size)); - return init_teb( ptr, FALSE ); + peb = (PEB *)((char *)teb_block + block_size - page_size - (is_win64 && is_wow ? page_size : 0)); + return init_teb( (char *)ptr + block_size, is_wow ); } @@ -3033,7 +3034,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) } else { - if (!teb_block_pos) + if (teb_block_pos == 32) { SIZE_T total = 32 * block_size; @@ -3044,9 +3045,9 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) return status; } teb_block = ptr; - teb_block_pos = 32; + teb_block_pos = 0; } - ptr = ((char *)teb_block + --teb_block_pos * block_size); + ptr = ((char *)teb_block + teb_block_pos++ * block_size); NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } -- 2.33.1

1 0

[website] German translation for release 6.22
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 407
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.21
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for WWN issue 406
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.0.2
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.20
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.19
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.18
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.17
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 6.16
by Julian Rüger 22 Nov '21

22 Nov '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v5 01/11] jscript: Support deletion for accessor, builtin and idx props.
by Gabriel Ivăncescu 22 Nov '21

22 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..a5b3543 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1630,10 +1630,14 @@ static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) if(prop->type == PROP_JSVAL) { jsval_release(prop->u.val); - prop->type = PROP_DELETED; } - if(prop->type == PROP_ACCESSOR) - FIXME("not supported on accessor property\n"); + if(prop->type == PROP_ACCESSOR) { + if(prop->u.accessor.getter) + jsdisp_release(prop->u.accessor.getter); + if(prop->u.accessor.setter) + jsdisp_release(prop->u.accessor.setter); + } + prop->type = PROP_DELETED; return S_OK; } -- 2.31.1

3 23

[PATCH] msvcp140: Fix time_get<char>::get_monthname spec file entry.
by Piotr Caban 22 Nov '21

22 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] advapi32: Improve perflib provider registration stubs.
by Paul Gofman 22 Nov '21

22 Nov '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Avoids crash in Edge Webview embedded in Forza Horizon 5. Technically it is enough just to fake success from these stubs but PerfCreateInstance returns a documented (albeit wrongly) structure and it looks better to return correcly layed out data. dlls/advapi32/tests/Makefile.in | 1 + dlls/advapi32/tests/perf.c | 100 ++++++++++++++++++++++++++++++++ dlls/kernelbase/main.c | 49 +++++++++++++--- include/perflib.h | 4 ++ 4 files changed, 146 insertions(+), 8 deletions(-) create mode 100644 dlls/advapi32/tests/perf.c diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 12583e59f57..2e9b007a91f 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ crypt_sha.c \ eventlog.c \ lsa.c \ + perf.c \ registry.c \ security.c \ service.c diff --git a/dlls/advapi32/tests/perf.c b/dlls/advapi32/tests/perf.c new file mode 100644 index 00000000000..34fedd2b645 --- /dev/null +++ b/dlls/advapi32/tests/perf.c @@ -0,0 +1,100 @@ +/* + * Unit tests for Perflib functions + * + * Copyright (c) 2021 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "perflib.h" + +#include "wine/test.h" + +static ULONG WINAPI test_provider_callback(ULONG code, void *buffer, ULONG size) +{ + ok(0, "Provider callback called.\n"); + return ERROR_SUCCESS; +} + +void test_provider_init(void) +{ + static GUID test_guid = {0xdeadbeef, 0x0001, 0x0002, {0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00 ,0x0a}}; + PERF_PROVIDER_CONTEXT prov_context; + HANDLE prov, prov2; + ULONG ret; + BOOL bret; + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(NULL, test_provider_callback, &prov); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(&test_guid, test_provider_callback, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProvider(&test_guid, test_provider_callback, &prov); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov != (HANDLE)0xdeadbeef, "Provider handle is not set.\n"); + + prov2 = prov; + ret = PerfStartProvider(&test_guid, test_provider_callback, &prov2); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov2 != prov, "Got the same provider handle.\n"); + + ret = PerfStopProvider(prov2); + ok(!ret, "Got unexpected ret %u.\n", ret); + + if (0) + { + /* Access violation on Windows. */ + PerfStopProvider(prov2); + } + + /* Provider handle is a pointer and not a kernel object handle. */ + bret = DuplicateHandle(GetCurrentProcess(), prov, GetCurrentProcess(), &prov2, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(!bret && GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected bret %d, err %u.\n", bret, GetLastError()); + bret = IsBadWritePtr(prov, 8); + ok(!bret, "Handle does not point to the data.\n"); + + ret = PerfStopProvider(prov); + ok(!ret, "Got unexpected ret %u.\n", ret); + + memset( &prov_context, 0, sizeof(prov_context) ); + prov = (HANDLE)0xdeadbeef; + ret = PerfStartProviderEx( &test_guid, &prov_context, &prov ); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + ok(prov == (HANDLE)0xdeadbeef, "Got unexpected prov %p.\n", prov); + + prov_context.ContextSize = sizeof(prov_context) + 1; + ret = PerfStartProviderEx( &test_guid, &prov_context, &prov ); + ok(!ret, "Got unexpected ret %u.\n", ret); + ok(prov != (HANDLE)0xdeadbeef, "Provider handle is not set.\n"); + + ret = PerfStopProvider(prov); + ok(!ret, "Got unexpected ret %u.\n", ret); +} + +START_TEST(perf) +{ + test_provider_init(); +} diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index e6cf892a4dc..d468c84f619 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -154,6 +154,17 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po return ERROR_SUCCESS; } +struct perf_provider +{ + GUID guid; + PERFLIBREQUEST callback; +}; + +static struct perf_provider *perf_provider_from_handle(HANDLE prov) +{ + return (struct perf_provider *)prov; +} + /*********************************************************************** * PerfCreateInstance (KERNELBASE.@) */ @@ -195,19 +206,37 @@ ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE i /*********************************************************************** * PerfStartProvider (KERNELBASE.@) */ -ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +ULONG WINAPI PerfStartProvider( GUID *guid, PERFLIBREQUEST callback, HANDLE *provider ) { - FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); - return ERROR_CALL_NOT_IMPLEMENTED; + PERF_PROVIDER_CONTEXT ctx; + + FIXME( "guid %s, callback %p, provider %p semi-stub.\n", debugstr_guid(guid), callback, provider ); + + memset( &ctx, 0, sizeof(ctx) ); + ctx.ContextSize = sizeof(ctx); + ctx.ControlCallback = callback; + + return PerfStartProviderEx( guid, &ctx, provider ); } /*********************************************************************** * PerfStartProviderEx (KERNELBASE.@) */ -ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +ULONG WINAPI PerfStartProviderEx( GUID *guid, PERF_PROVIDER_CONTEXT *context, HANDLE *provider ) { - FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov; + + FIXME( "guid %s, context %p, provider %p semi-stub.\n", debugstr_guid(guid), context, provider ); + + if (!guid || !context || !provider) return ERROR_INVALID_PARAMETER; + if (context->ContextSize < sizeof(*context)) return ERROR_INVALID_PARAMETER; + + if (!(prov = heap_alloc_zero( sizeof(*prov) ))) return ERROR_OUTOFMEMORY; + memcpy( &prov->guid, guid, sizeof(prov->guid) ); + prov->callback = context->ControlCallback; + *provider = prov; + + return STATUS_SUCCESS; } /*********************************************************************** @@ -215,8 +244,12 @@ ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HAN */ ULONG WINAPI PerfStopProvider(HANDLE handle) { - FIXME("%p: stub\n", handle); - return ERROR_CALL_NOT_IMPLEMENTED; + struct perf_provider *prov = perf_provider_from_handle( handle ); + + TRACE( "handle %p.\n", handle ); + + heap_free( prov ); + return STATUS_SUCCESS; } /*********************************************************************** diff --git a/include/perflib.h b/include/perflib.h index 2d3f6efb419..47bc0716541 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -51,6 +51,10 @@ typedef struct _PROVIDER_CONTEXT { LPVOID pMemContext; } PERF_PROVIDER_CONTEXT, * PPERF_PROVIDER_CONTEXT; +ULONG WINAPI PerfStartProvider(GUID *, PERFLIBREQUEST, HANDLE *); +ULONG WINAPI PerfStartProviderEx(GUID *, PERF_PROVIDER_CONTEXT *, HANDLE *); +ULONG WINAPI PerfStopProvider(HANDLE); + #ifdef __cplusplus } /* extern "C" */ #endif -- 2.33.1

2 4

[PATCH vkd3d 1/7] vkd3d-shader/hlsl: Write SM4 integer negation.
by Giovanni Mascellani 22 Nov '21

22 Nov '21

--- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..acc11ce9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1376,6 +1376,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_NEG: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_INEG, &expr->node, arg1, 0); + break; + default: hlsl_fixme(ctx, expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); break; -- 2.34.0

2 8

[PATCH] ntdll: Save status from attaching dependencies in process_attach().
by Jan Sikorski 22 Nov '21

22 Nov '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- I don't know for sure if that's an actual bug, but it looks like it was changed accidentally in 0dd37b02f99f5090dd855343fcd8a99496047f3e. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a754579bf54..5bae44f175d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1552,7 +1552,7 @@ static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ) if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); /* Recursively attach all DLLs this one depends on */ - walk_node_dependencies( node, lpReserved, process_attach ); + status = walk_node_dependencies( node, lpReserved, process_attach ); if (!wm->ldr.InInitializationOrderLinks.Flink) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList, -- 2.32.0

2 1

[PATCH vkd3d] vkd3d-shader/hlsl: Allocate samplers.
by Matteo Bruni 22 Nov '21

22 Nov '21

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v3: Get rid of struct object_type_info name field. --- libs/vkd3d-shader/hlsl_codegen.c | 62 ++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 7ff68b84..8b0eb9b3 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1223,60 +1223,91 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } } -static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint32_t index) +static const struct hlsl_ir_var *get_reserved_object(struct hlsl_ctx *ctx, char type, uint32_t index) { const struct hlsl_ir_var *var; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) { - if (var->last_read && var->reg_reservation.type == 't' && var->reg_reservation.index == index) + if (var->last_read && var->reg_reservation.type == type && var->reg_reservation.index == index) return var; } return NULL; } -static void allocate_textures(struct hlsl_ctx *ctx) +static const struct object_type_info { + enum hlsl_base_type type; + char reg_name; +} +object_types[] = +{ + { HLSL_TYPE_SAMPLER, 's' }, + { HLSL_TYPE_TEXTURE, 't' }, +}; + +static const struct object_type_info *get_object_type_info(enum hlsl_base_type type) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(object_types); ++i) + if (type == object_types[i].type) + return &object_types[i]; + + WARN("No type info for object type %u.\n", type); + return NULL; +} + +static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) +{ + const struct object_type_info *type_info = get_object_type_info(type); struct hlsl_ir_var *var; uint32_t index = 0; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (!var->last_read || var->data_type->type != HLSL_CLASS_OBJECT - || var->data_type->base_type != HLSL_TYPE_TEXTURE) + || var->data_type->base_type != type) continue; - if (var->reg_reservation.type == 't') + if (var->reg_reservation.type == type_info->reg_name) { - const struct hlsl_ir_var *reserved_texture = get_reserved_texture(ctx, var->reg_reservation.index); + const struct hlsl_ir_var *reserved_object = get_reserved_object(ctx, type_info->reg_name, + var->reg_reservation.index); - if (reserved_texture && reserved_texture != var) + if (reserved_object && reserved_object != var) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, - "Multiple textures bound to t%u.", var->reg_reservation.index); - hlsl_note(ctx, reserved_texture->loc, VKD3D_SHADER_LOG_ERROR, - "Texture '%s' is already bound to t%u.", reserved_texture->name, + "Multiple objects bound to %c%u.", type_info->reg_name, var->reg_reservation.index); + hlsl_note(ctx, reserved_object->loc, VKD3D_SHADER_LOG_ERROR, + "Object '%s' is already bound to %c%u.", reserved_object->name, + type_info->reg_name, var->reg_reservation.index); } var->reg.id = var->reg_reservation.index; var->reg.allocated = true; - TRACE("Allocated reserved %s to t%u.\n", var->name, var->reg_reservation.index); + TRACE("Allocated reserved %s to %c%u.\n", var->name, type_info->reg_name, var->reg_reservation.index); } else if (!var->reg_reservation.type) { - while (get_reserved_texture(ctx, index)) + while (get_reserved_object(ctx, type_info->reg_name, index)) ++index; var->reg.id = index; var->reg.allocated = true; - TRACE("Allocated %s to t%u.\n", var->name, index); + TRACE("Allocated object to %c%u.\n", type_info->reg_name, index); ++index; } else { + struct vkd3d_string_buffer *type_string; + + type_string = hlsl_type_to_string(ctx, var->data_type); hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, - "Textures must be bound to register type 't'."); + "Object of type '%s' must be bound to register type '%c'.", + type_string->buffer, type_info->reg_name); + hlsl_release_string_buffer(ctx, type_string); } } } @@ -1413,9 +1444,10 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun else { allocate_buffers(ctx); - allocate_textures(ctx); + allocate_objects(ctx, HLSL_TYPE_TEXTURE); } allocate_semantic_registers(ctx); + allocate_objects(ctx, HLSL_TYPE_SAMPLER); if (ctx->result) return ctx->result; -- 2.26.3

4 3

[PATCH 1/5] d3dx9/tests: Clean up GetMatrixTransposePointerArray() tests.
by Matteo Bruni 22 Nov '21

22 Nov '21

Inspired by a patch from Eric Pouech <eric.pouech(a)gmail.com>. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/effect.c | 42 +++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a13dc708726..ea90299f936 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1475,16 +1475,16 @@ static void test_effect_parameter_value_GetMatrixPointerArray(const struct test_ float f[sizeof(D3DXMATRIX) / sizeof(float)]; D3DXMATRIX m; } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - D3DXMATRIX *matrix_pointer_array[ARRAY_SIZE(fvalue)]; UINT l, k, m, element, err = 0; union { DWORD d; float f; } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { @@ -1670,20 +1670,28 @@ static void test_effect_parameter_value_GetMatrixTransposeArray(const struct tes static void test_effect_parameter_value_GetMatrixTransposePointerArray(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) { + union + { + float f[sizeof(D3DXMATRIX) / sizeof(float)]; + D3DXMATRIX m; + } fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE * sizeof(float) / sizeof(D3DXMATRIX)]; + D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)]; const D3DXPARAMETER_DESC *res_desc = &res->desc; const char *res_full_name = res->full_name; - HRESULT hr; - DWORD cmp = 0xabababab; - FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - D3DXMATRIX *matrix_pointer_array[sizeof(fvalue)/sizeof(D3DXMATRIX)]; UINT l, k, m, element, err = 0; + union + { + DWORD d; + float f; + } cmp = {0xabababab}; + HRESULT hr; for (element = 0; element <= res_desc->Elements + 1; ++element) { memset(fvalue, 0xab, sizeof(fvalue)); for (l = 0; l < element; ++l) { - matrix_pointer_array[l] = (D3DXMATRIX *)&fvalue[l * sizeof(**matrix_pointer_array) / sizeof(FLOAT)]; + matrix_pointer_array[l] = &fvalue[l].m; } hr = effect->lpVtbl->GetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); if (!element) @@ -1691,7 +1699,10 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str ok(hr == D3D_OK, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3D_OK); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else if (element <= res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) { @@ -1706,23 +1717,30 @@ static void test_effect_parameter_value_GetMatrixTransposePointerArray(const str { if (k < res_desc->Columns && l < res_desc->Rows) { - if (!compare_float(fvalue[m * 16 + l + k * 4], get_float(res_desc->Type, + if (!compare_float(fvalue[m].m.m[k][l], get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512)) ++err; } - else if (fvalue[m * 16 + l + k * 4] != 0.0f) ++err; + else if (fvalue[m].m.m[k][l] != 0.0f) + ++err; } } } - for (l = element * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = element; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } else { ok(hr == D3DERR_INVALIDCALL, "%u - %s[%u]: GetMatrixTransposePointerArray failed, got %#x, expected %#x\n", i, res_full_name, element, hr, D3DERR_INVALIDCALL); - for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) if (fvalue[l] != *(FLOAT *)&cmp) ++err; + for (m = 0; m < ARRAY_SIZE(fvalue); ++m) + for (l = 0; l < ARRAY_SIZE(fvalue[m].f); ++l) + if (fvalue[m].f[l] != cmp.f) + ++err; } ok(!err, "%u - %s[%u]: GetMatrixTransposePointerArray failed with %u errors\n", i, res_full_name, element, err); } -- 2.26.3

2 5

[PATCH v6 vkd3d] vkd3d-shader/hlsl: Implement cross() intrinsic function.
by Matteo Bruni 22 Nov '21

22 Nov '21

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v6: Recover the lost tests... Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 55 ++++++++++++++++++++++++++++++++++++ tests/hlsl-cross.shader_test | 28 ++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 tests/hlsl-cross.shader_test diff --git a/Makefile.am b/Makefile.am index 6d392e1d..be3d8ec1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,6 +64,7 @@ vkd3d_shader_tests = \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ @@ -290,6 +291,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ + tests/hlsl-cross.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index abf5da91..ff35c09e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1586,6 +1586,60 @@ static bool intrinsic_clamp(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MIN, &max->node, params->args[2], &loc); } +static bool intrinsic_cross(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_swizzle *arg1_swzl1, *arg1_swzl2, *arg2_swzl1, *arg2_swzl2; + struct hlsl_ir_node *arg1 = params->args[0], *arg2 = params->args[1]; + struct hlsl_ir_node *arg1_cast, *arg2_cast, *mul1_neg; + struct hlsl_ir_expr *mul1, *mul2; + struct hlsl_type *cast_type; + enum hlsl_base_type base; + + if (arg1->data_type->base_type == HLSL_TYPE_HALF && arg2->data_type->base_type == HLSL_TYPE_HALF) + base = HLSL_TYPE_HALF; + else + base = HLSL_TYPE_FLOAT; + + cast_type = hlsl_get_vector_type(ctx, base, 3); + + if (!(arg1_cast = add_implicit_conversion(ctx, params->instrs, arg1, cast_type, &loc))) + return false; + + if (!(arg2_cast = add_implicit_conversion(ctx, params->instrs, arg2, cast_type, &loc))) + return false; + + if (!(arg1_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl1->node.entry); + + if (!(arg2_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl1->node.entry); + + if (!(mul1 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl1->node, &arg2_swzl1->node, &loc))) + return false; + + if (!(mul1_neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &mul1->node, loc))) + return false; + list_add_tail(params->instrs, &mul1_neg->entry); + + if (!(arg1_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl2->node.entry); + + if (!(arg2_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl2->node.entry); + + if (!(mul2 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl2->node, &arg2_swzl2->node, &loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, &mul2->node, mul1_neg, &loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1635,6 +1689,7 @@ intrinsic_functions[] = /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, + {"cross", 2, true, intrinsic_cross}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, diff --git a/tests/hlsl-cross.shader_test b/tests/hlsl-cross.shader_test new file mode 100644 index 00000000..101db607 --- /dev/null +++ b/tests/hlsl-cross.shader_test @@ -0,0 +1,28 @@ +[pixel shader] +float4 main(uniform float4 u, uniform float4 v) : sv_target +{ + float4 res = float4(0, 0, 0, 0); + res.xyz = cross(u, v); + return res; +} + +[test] +uniform 0 float4 1 -2 3 4 +uniform 4 float4 10 100 1000 10000 +draw quad +probe all rgba (-2300, -970, 120, 0) + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float4 res = float4(0, 0, 0, 3.5); + res.xyz = cross(u, 4); + return res; +} + +[test] +uniform 0 float4 1 -2 3 4 +draw quad +probe all rgba (-20, 8, 12, 3.5) -- 2.26.3

3 2

[PATCH vkd3d v5 1/2] vkd3d-shader/hlsl: Implement round() intrinsic function in SM4.
by Matteo Bruni 22 Nov '21

22 Nov '21

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 ++++++++ libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/round.shader_test | 26 ++++++++++++++++++++++++++ 6 files changed, 41 insertions(+) create mode 100644 tests/round.shader_test diff --git a/Makefile.am b/Makefile.am index 3e083b0a..6d392e1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,6 +91,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/round.shader_test \ tests/sampler.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278..9824c56d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1156,6 +1156,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_NEG] = "-", [HLSL_OP1_NRM] = "nrm", [HLSL_OP1_RCP] = "rcp", + [HLSL_OP1_ROUND] = "round", [HLSL_OP1_RSQ] = "rsq", [HLSL_OP1_SAT] = "sat", [HLSL_OP1_SIGN] = "sign", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 365ef980..e7bdb45e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -299,6 +299,7 @@ enum hlsl_ir_expr_op HLSL_OP1_NEG, HLSL_OP1_NRM, HLSL_OP1_RCP, + HLSL_OP1_ROUND, HLSL_OP1_RSQ, HLSL_OP1_SAT, HLSL_OP1_SIGN, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b7e0409d..abf5da91 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1611,6 +1611,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_round(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], &loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1626,10 +1632,12 @@ static const struct intrinsic_function } intrinsic_functions[] = { + /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, + {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a95503ee..c0c26f80 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1305,6 +1305,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break; + case HLSL_OP1_ROUND: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NE, &expr->node, arg1, 0); + break; + case HLSL_OP1_SAT: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV | (VKD3D_SM4_INSTRUCTION_FLAG_SATURATE << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT), diff --git a/tests/round.shader_test b/tests/round.shader_test new file mode 100644 index 00000000..d8eb11b7 --- /dev/null +++ b/tests/round.shader_test @@ -0,0 +1,26 @@ +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (0.0, 6.0, 8.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float a = round(u.r); + int2 b = round(u.gb); + float4 res = float4(b, a, u.a); + return round(res); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (6.0, 8.0, 0.0, 3.0) 4 -- 2.26.3

5 6

[PATCH vkd3d] vkd3d-shader/hlsl: Fix texture reservation trace.
by Matteo Bruni 22 Nov '21

22 Nov '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..0bf18c2b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1240,7 +1240,7 @@ static void allocate_textures(struct hlsl_ctx *ctx) var->reg.id = var->reg_reservation.index; var->reg.allocated = true; - TRACE("Allocated reserved %s to t%u.\n", var->name, index); + TRACE("Allocated reserved %s to t%u.\n", var->name, var->reg_reservation.index); } else if (!var->reg_reservation.type) { -- 2.26.3

4 3

[PATCH 1/7] winebus.sys: Initialize last_report length and buffer.
by Rémi Bernon 22 Nov '21

22 Nov '21

Fixes a regression from e9c3c494fd2f388acd046c95ac6b121c0830bb46 where although we use the last report length, it was only initialized after the first corresponding report was received. Calling HidD_GetInputReport before that could cause a buffer overlow and report invalid data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52068 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index d805f887a6f..111953c3bae 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -444,8 +444,6 @@ static void process_hid_report(DEVICE_OBJECT *device, BYTE *report_buf, DWORD re if (!ext->collection_desc.ReportIDs[0].ReportID) last_report = ext->last_reports[0]; else last_report = ext->last_reports[report_buf[0]]; - - last_report->length = report_len; memcpy(last_report->buffer, report_buf, report_len); if ((irp = pop_pending_read(ext))) @@ -861,7 +859,13 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { if (!(size = reports[i].InputLength)) continue; size = offsetof( struct hid_report, buffer[size] ); - if (!(ext->last_reports[reports[i].ReportID] = RtlAllocateHeap(GetProcessHeap(), 0, size))) status = STATUS_NO_MEMORY; + if (!(report = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) status = STATUS_NO_MEMORY; + else + { + report->length = reports[i].InputLength; + report->buffer[0] = reports[i].ReportID; + ext->last_reports[reports[i].ReportID] = report; + } } if (!status) ext->state = DEVICE_STATE_STARTED; } -- 2.33.1

1 6

[PATCH v2] user32: Add exception handler to GetWindowText. (Resend).
by Dmitry Timoshkov 22 Nov '21

22 Nov '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 29 ++++++++++++++++---- dlls/user32/win.c | 59 ++++++++++++++++++++++++++++++----------- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 88989f4064b..0156987f529 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7923,17 +7923,36 @@ static void test_gettext(void) if (0) { r = SendMessageA( hwnd, WM_GETTEXT, 0x10, 0x1000); - ok( r == 0, "settext should return zero\n"); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0x10000, 0); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0xff000000, 0x1000); - ok( r == 0, "settext should return zero (%ld)\n", r); + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); r = SendMessageA( hwnd, WM_GETTEXT, 0x1000, 0xff000000); - ok( r == 0, "settext should return zero (%ld)\n", r); - } + ok( r == 0, "WM_GETTEXT should return zero (%ld)\n", r ); + } + + /* GetWindowText doesn't crash */ + r = GetWindowTextA( hwnd, (LPSTR)0x10, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0x10000, 0 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0xff000000, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextA( hwnd, (LPSTR)0x1000, 0xff000000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + + r = GetWindowTextW( hwnd, (LPWSTR)0x10, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0x10000, 0 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0xff000000, 0x1000 ); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); + r = GetWindowTextW( hwnd, (LPWSTR)0x1000, 0xff000000); + ok( r == 0, "GetWindowText should return zero (%ld)\n", r ); DestroyWindow(hwnd); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 221607b3169..735478c16e4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -31,6 +31,7 @@ #include "win.h" #include "controls.h" #include "winerror.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(win); @@ -2999,22 +3000,34 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) { WCHAR *buffer; + int ret = 0; if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { - lpString[0] = 0; - return (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + if (WIN_IsCurrentProcess( hwnd )) + { + lpString[0] = 0; + ret = (INT)SendMessageA( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else if ((buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, buffer, nMaxCount ); + if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) + lpString[nMaxCount-1] = 0; + HeapFree( GetProcessHeap(), 0, buffer ); + ret = strlen(lpString); + } + } + __EXCEPT_ALL + { + ret = 0; } + __ENDTRY - /* when window belongs to other process, don't send a message */ - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) return 0; - get_server_window_text( hwnd, buffer, nMaxCount ); - if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) - lpString[nMaxCount-1] = 0; - HeapFree( GetProcessHeap(), 0, buffer ); - return strlen(lpString); + return ret; } @@ -3047,17 +3060,31 @@ INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) */ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) { + int ret; + if (!lpString || nMaxCount <= 0) return 0; - if (WIN_IsCurrentProcess( hwnd )) + __TRY { - lpString[0] = 0; - return (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + if (WIN_IsCurrentProcess( hwnd )) + { + lpString[0] = 0; + ret = (INT)SendMessageW( hwnd, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); + } + else + { + /* when window belongs to other process, don't send a message */ + get_server_window_text( hwnd, lpString, nMaxCount ); + ret = lstrlenW(lpString); + } } + __EXCEPT_ALL + { + ret = 0; + } + __ENDTRY - /* when window belongs to other process, don't send a message */ - get_server_window_text( hwnd, lpString, nMaxCount ); - return lstrlenW(lpString); + return ret; } -- 2.33.1

2 1

[PATCH 1/2] include: Add mfd3d12.idl.
by Nikolay Sivov 22 Nov '21

22 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/mfd3d12.idl | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 include/mfd3d12.idl diff --git a/include/Makefile.in b/include/Makefile.in index df049fd284f..756e25dcc82 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -408,6 +408,7 @@ SOURCES = \ mediaobj.idl \ metahost.idl \ mfapi.h \ + mfd3d12.idl \ mferror.h \ mfidl.idl \ mfmediaengine.idl \ diff --git a/include/mfd3d12.idl b/include/mfd3d12.idl new file mode 100644 index 00000000000..2098e6d405a --- /dev/null +++ b/include/mfd3d12.idl @@ -0,0 +1,63 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "mfidl.idl"; +import "d3d12.idl"; + +[ + object, + uuid(09d0f835-92ff-4e53-8efa-40faa551f233), + local +] +interface IMFD3D12SynchronizationObjectCommands : IUnknown +{ + HRESULT EnqueueResourceReady([in] ID3D12CommandQueue *producer_queue); + HRESULT EnqueueResourceReadyWait([in] ID3D12CommandQueue *consumer_queue); + HRESULT SignalEventOnResourceReady(HANDLE event); + HRESULT EnqueueResourceRelease([in] ID3D12CommandQueue *consumer_queue); +} + +[ + object, + uuid(802302b0-82de-45e1-b421-f19ee5bdaf23), + local +] +interface IMFD3D12SynchronizationObject : IUnknown +{ + HRESULT SignalEventOnFinalResourceRelease(HANDLE hEvent); +} + +typedef enum MF_MT_D3D_RESOURCE_VERSION_ENUM +{ + MF_D3D11_RESOURCE, + MF_D3D12_RESOURCE +} MF_MT_D3D_RESOURCE_VERSION_ENUM; + +cpp_quote("EXTERN_GUID(MF_D3D12_SYNCHRONIZATION_OBJECT, 0x2a7c8d6a, 0x85a6, 0x494d, 0xa0, 0x46, 0x06, 0xea, 0x1a, 0x13, 0x8f, 0x4b);") +cpp_quote("EXTERN_GUID(MF_MT_D3D_RESOURCE_VERSION, 0x174f1e85, 0xfe26, 0x453d, 0xb5, 0x2e, 0x5b, 0xdd, 0x4e, 0x55, 0xb9, 0x44);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_CPU_READBACK, 0x28ee9fe3, 0xd481, 0x46a6, 0xb9, 0x8a, 0x7f, 0x69, 0xd5, 0x28, 0xe, 0x82);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_TEXTURE_LAYOUT, 0x97c85caa, 0xbeb, 0x4ee1, 0x97, 0x15, 0xf2, 0x2f, 0xad, 0x8c, 0x10, 0xf5);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET, 0xeeac2585, 0x3430, 0x498c, 0x84, 0xa2, 0x77, 0xb1, 0xbb, 0xa5, 0x70, 0xf6);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL, 0xb1138dc3, 0x01d5, 0x4c14, 0x9b, 0xdc, 0xcd, 0xc9, 0x33, 0x6f, 0x55, 0xb9);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, 0x82c85647, 0x5057, 0x4960, 0x95, 0x59, 0xf4, 0x5b, 0x8e, 0x27, 0x14, 0x27);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, 0xba06bfac, 0xffe3, 0x474a, 0xab, 0x55, 0x16, 0x1e, 0xe4, 0x41, 0x7a, 0x2e);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER, 0xa6a1e439, 0x2f96, 0x4ab5, 0x98, 0xdc, 0xad, 0xf7, 0x49, 0x73, 0x50, 0x5d);") +cpp_quote("EXTERN_GUID(MF_MT_D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS, 0xa4940b2, 0xcfd6, 0x4738, 0x9d, 0x02, 0x98, 0x11, 0x37, 0x34, 0x01, 0x5a);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_HEAP_FLAGS, 0x496b3266, 0xd28f, 0x4f8c, 0x93, 0xa7, 0x4a, 0x59, 0x6b, 0x1a, 0x31, 0xa1);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_HEAP_TYPE, 0x56f26a76, 0xbbc1, 0x4ce0, 0xbb, 0x11, 0xe2, 0x23, 0x68, 0xd8, 0x74, 0xed);") +cpp_quote("EXTERN_GUID(MF_SA_D3D12_CLEAR_VALUE, 0x86ba9a39, 0x526, 0x495d, 0x9a, 0xb5, 0x54, 0xec, 0x9f, 0xad, 0x6f, 0xc3);") -- 2.33.0

1 1

[PATCH 1/3] include: Add featurestagingapi.h
by Alex Henrie 22 Nov '21

22 Nov '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/featurestagingapi.h | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 include/featurestagingapi.h diff --git a/include/featurestagingapi.h b/include/featurestagingapi.h new file mode 100644 index 00000000000..d0220b210f0 --- /dev/null +++ b/include/featurestagingapi.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _FEATURESTAGINGAPI_H_ +#define _FEATURESTAGINGAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(FEATURE_STATE_CHANGE_SUBSCRIPTION); + +typedef void WINAPI FEATURE_STATE_CHANGE_CALLBACK(void*); + +typedef enum FEATURE_CHANGE_TIME +{ + FEATURE_CHANGE_TIME_READ = 0, + FEATURE_CHANGE_TIME_MODULE_RELOAD = 1, + FEATURE_CHANGE_TIME_SESSION = 2, + FEATURE_CHANGE_TIME_REBOOT = 3 +} FEATURE_CHANGE_TIME; + +typedef enum FEATURE_ENABLED_STATE +{ + FEATURE_ENABLED_STATE_DEFAULT = 0, + FEATURE_ENABLED_STATE_DISABLED = 1, + FEATURE_ENABLED_STATE_ENABLED = 2 +} FEATURE_ENABLED_STATE; + +#ifdef __cplusplus +} +#endif + +#endif -- 2.34.0

1 2

[PATCH] po: Update Traditional Chinese translation.
by Chilung Chan 22 Nov '21

22 Nov '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- po/zh_TW.po | 568 ++++++++++++++++++++++++---------------------------- 1 file changed, 259 insertions(+), 309 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index f7589eac26d..2fb5e3069dd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-11-06 18:33+0800\n" +"PO-Revision-Date: 2021-11-20 21:33+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -1402,7 +1402,7 @@ msgstr "CRL 原因編碼" #: dlls/crypt32/crypt32.rc:40 msgid "CRL Distribution Points" -msgstr "CRL 發佈點" +msgstr "CRL 發布點" #: dlls/crypt32/crypt32.rc:41 msgid "Enhanced Key Usage" @@ -1619,7 +1619,7 @@ msgstr "Delta CRL 指示器" #: dlls/crypt32/crypt32.rc:94 msgid "Issuing Distribution Point" -msgstr "發行發佈點" +msgstr "發行發布點" #: dlls/crypt32/crypt32.rc:95 msgid "Freshest CRL" @@ -1639,7 +1639,7 @@ msgstr "原則條件約束" #: dlls/crypt32/crypt32.rc:99 msgid "Cross-Certificate Distribution Points" -msgstr "交叉憑證發佈點" +msgstr "交叉憑證發布點" #: dlls/crypt32/crypt32.rc:100 msgid "Application Policies" @@ -1711,7 +1711,7 @@ msgstr "虛擬基本 CRL 數目" #: dlls/crypt32/crypt32.rc:117 msgid "Next CRL Publish" -msgstr "下一個 CRL 發佈" +msgstr "下一個 CRL 發布" #: dlls/crypt32/crypt32.rc:118 msgid "CA Encryption Certificate" @@ -1911,7 +1911,7 @@ msgstr "永久簽署" #: dlls/crypt32/crypt32.rc:167 msgid "All issuance policies" -msgstr "所有發佈原則" +msgstr "所有發布原則" #: dlls/crypt32/crypt32.rc:172 msgid "Trusted Root Certification Authorities" @@ -2038,11 +2038,11 @@ msgstr "替代名稱" #: dlls/crypt32/crypt32.rc:206 msgid "CRL Distribution Point" -msgstr "CRL 發佈點" +msgstr "CRL 發布點" #: dlls/crypt32/crypt32.rc:207 msgid "Distribution Point Name" -msgstr "發佈點名稱" +msgstr "發布點名稱" #: dlls/crypt32/crypt32.rc:208 msgid "Full Name" @@ -4090,7 +4090,7 @@ msgstr "鎖定違規。\n" #: dlls/kernel32/winerror.mc:198 msgid "Wrong disk.\n" -msgstr "錯誤磁碟。\n" +msgstr "錯誤的磁碟。\n" #: dlls/kernel32/winerror.mc:203 msgid "Sharing buffer exceeded.\n" @@ -6642,7 +6642,7 @@ msgstr "無效的分隔符號檔案。\n" #: dlls/kernel32/winerror.mc:3413 msgid "Invalid priority.\n" -msgstr "無效的優先權。\n" +msgstr "無效的優先順序。\n" #: dlls/kernel32/winerror.mc:3418 msgid "Invalid printer name.\n" @@ -8096,11 +8096,11 @@ msgstr "正在移動檔案" #: dlls/msi/msi.rc:112 msgid "Publishing assembly information" -msgstr "正在發佈組合資訊" +msgstr "正在發布組合資訊" #: dlls/msi/msi.rc:113 msgid "Unpublishing assembly information" -msgstr "正在解除發佈組合資訊" +msgstr "正在解除發布組合資訊" #: dlls/msi/msi.rc:114 msgid "Patching files" @@ -8112,15 +8112,15 @@ msgstr "正在更新元件登錄" #: dlls/msi/msi.rc:116 msgid "Publishing Qualified Components" -msgstr "正在發佈合格的元件" +msgstr "正在發布合格的元件" #: dlls/msi/msi.rc:117 msgid "Publishing Product Features" -msgstr "正在發佈產品功能" +msgstr "正在發布產品功能" #: dlls/msi/msi.rc:118 msgid "Publishing product information" -msgstr "正在發佈產品資訊" +msgstr "正在發布產品資訊" #: dlls/msi/msi.rc:119 msgid "Registering Class servers" @@ -8216,15 +8216,15 @@ msgstr "正在停止服務" #: dlls/msi/msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "正在解除發佈合格的元件" +msgstr "正在解除發布合格的元件" #: dlls/msi/msi.rc:144 msgid "Unpublishing Product Features" -msgstr "正在解除發佈產品功能" +msgstr "正在解除發布產品功能" #: dlls/msi/msi.rc:145 msgid "Unpublishing product information" -msgstr "正在解除發佈產品資訊" +msgstr "正在解除發布產品資訊" #: dlls/msi/msi.rc:146 msgid "Unregister Class servers" @@ -12603,7 +12603,7 @@ msgstr "無法存取指定的檔案或多媒體控制介面裝置，因為應用 msgid "" "Cannot access specified file or MCI device because the application cannot " "change drives." -msgstr "無法存取指定的檔案或多媒體控制介面裝置，因為應用程式無法變更磁碟。" +msgstr "無法存取指定的檔案或多媒體控制介面裝置，因為應用程式無法變更儲存裝置。" #: dlls/winmm/winmm.rc:109 msgid "Specify a device or driver name that is less than 79 characters." @@ -13265,11 +13265,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL 用於設定磁碟的磁碟區標籤。\n" +"LABEL 用於設定儲存裝置的磁碟區標籤。\n" "\n" -"語法: LABEL [裝置代號:]\n" +"語法: LABEL [磁碟機代號:]\n" "命令將向您提示詢問要讓給定的儲存裝置使用的磁碟區標籤。\n" -"您可以利用 VOL 命令來顯示磁碟的磁碟區標籤。\n" +"您可以利用 VOL 命令來顯示磁碟機的磁碟區標籤。\n" #: programs/cmd/cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -13532,7 +13532,7 @@ msgstr "VER 顯示您正在執行的 cmd 版本。\n" #: programs/cmd/cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 顯示磁碟裝置的磁碟區標籤。\n" +msgstr "VOL 顯示儲存裝置的磁碟區標籤。\n" #: programs/cmd/cmd.rc:263 msgid "" @@ -13733,7 +13733,7 @@ msgstr "" "TITLE\t\t設定用於 CMD 作業階段的視窗標題\n" "TYPE\t\t印出文字檔的內容\n" "VER\t\t顯示目前的 CMD 版本\n" -"VOL\t\t顯示磁碟裝置的磁碟區標籤\n" +"VOL\t\t顯示儲存裝置的磁碟區標籤\n" "XCOPY\t\t複製來源檔案或樹狀目錄到目的地\n" "EXIT\t\t關閉 CMD\n" "\n" @@ -14219,13 +14219,11 @@ msgstr "IPv6 位址" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "主要 DNS 字尾" #: programs/msinfo32/msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "系統設定" +msgstr "系統資訊" #: programs/net/net.rc:30 msgid "" @@ -16515,7 +16513,7 @@ msgstr "" "/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" "/belownormal 在 Belownormal 優先類別中啟動程式。\n" "/node n 以指定的 NUMA 節點啟動程式。\n" -"/affinity mask 以指定的親和性遮罩啟動程式。\n" +"/affinity 遮罩以指定的親和性遮罩啟動程式。\n" "/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" "/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" "/exec 對指定檔案進行 Exec (在 Wine 內部使用)。\n" @@ -16594,7 +16592,7 @@ msgstr "錯誤：不允許行程自我終止。\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" -msgstr "新工作(&N)..." +msgstr "執行新工作(&N)..." #: programs/taskmgr/taskmgr.rc:39 msgid "E&xit Task Manager" @@ -16638,19 +16636,19 @@ msgstr "暫停(&P)" #: programs/taskmgr/taskmgr.rc:68 programs/taskmgr/taskmgr.rc:256 msgid "&Select Columns..." -msgstr "選擇行(&S)..." +msgstr "選擇欄(&S)..." #: programs/taskmgr/taskmgr.rc:69 programs/taskmgr/taskmgr.rc:258 msgid "&CPU History" -msgstr "&CPU 歷程" +msgstr "CPU 歷程記錄(&C)" #: programs/taskmgr/taskmgr.rc:71 programs/taskmgr/taskmgr.rc:259 msgid "&One Graph, All CPUs" -msgstr "在一張圖中顯示所有的 CPU(&O)" +msgstr "所有 CPU 處理為一個圖形(&O)" #: programs/taskmgr/taskmgr.rc:73 programs/taskmgr/taskmgr.rc:260 msgid "One Graph &Per CPU" -msgstr "每一個 C&PU 各一張圖" +msgstr "每個 CPU 各一個圖形(&P)" #: programs/taskmgr/taskmgr.rc:76 programs/taskmgr/taskmgr.rc:261 msgid "&Show Kernel Times" @@ -16695,15 +16693,15 @@ msgstr "結束工作(&E)" #: programs/taskmgr/taskmgr.rc:130 msgid "&Go To Process" -msgstr "跳到行程(&G)" +msgstr "跳到處理程序(&G)" #: programs/taskmgr/taskmgr.rc:149 programs/taskmgr/taskmgr.rc:363 msgid "&End Process" -msgstr "結束行程(&E)" +msgstr "結束處理程序(&E)" #: programs/taskmgr/taskmgr.rc:150 msgid "End Process &Tree" -msgstr "結束行程樹(&T)" +msgstr "結束處理程序樹(&T)" #: programs/taskmgr/taskmgr.rc:152 programs/winedbg/winedbg.rc:32 msgid "&Debug" @@ -16711,7 +16709,7 @@ msgstr "除錯(&D)" #: programs/taskmgr/taskmgr.rc:154 msgid "Set &Priority" -msgstr "設定優先權(&P)" +msgstr "設定優先順序(&P)" #: programs/taskmgr/taskmgr.rc:156 msgid "&Realtime" @@ -16719,15 +16717,15 @@ msgstr "即時(&R)" #: programs/taskmgr/taskmgr.rc:160 msgid "&Above Normal" -msgstr "正常以上(&A)" +msgstr "中等以上(&A)" #: programs/taskmgr/taskmgr.rc:164 msgid "&Below Normal" -msgstr "正常以下(&B)" +msgstr "中等以下(&B)" #: programs/taskmgr/taskmgr.rc:169 msgid "Set &Affinity..." -msgstr "設定親和度(&A)..." +msgstr "設定親和性(&A)..." #: programs/taskmgr/taskmgr.rc:170 msgid "Edit Debug &Channels..." @@ -16744,7 +16742,7 @@ msgstr "新工作(&N)..." #: programs/taskmgr/taskmgr.rc:364 msgid "&Show processes from all users" -msgstr "顯示所有使用者的行程(&S)" +msgstr "顯示所有使用者的處理程序(&S)" #: programs/taskmgr/taskmgr.rc:372 msgid "CPU usage" @@ -16764,11 +16762,11 @@ msgstr "使用中(K)" #: programs/taskmgr/taskmgr.rc:376 msgid "Physical memory (K)" -msgstr "實體記憶體(K)" +msgstr "實體記憶體 (K)" #: programs/taskmgr/taskmgr.rc:377 msgid "Kernel memory (K)" -msgstr "內核記憶體(K)" +msgstr "核心記憶體 (K)" #: programs/taskmgr/taskmgr.rc:378 programs/taskmgr/taskmgr.rc:290 msgid "Handles" @@ -16780,7 +16778,7 @@ msgstr "執行緒" #: programs/taskmgr/taskmgr.rc:380 programs/taskmgr/taskmgr.rc:263 msgid "Processes" -msgstr "行程" +msgstr "處理程序" #: programs/taskmgr/taskmgr.rc:387 programs/taskmgr/taskmgr.rc:396 #: programs/taskmgr/taskmgr.rc:405 @@ -16801,19 +16799,19 @@ msgstr "系統快取" #: programs/taskmgr/taskmgr.rc:406 msgid "Paged" -msgstr "置換頁" +msgstr "分頁" #: programs/taskmgr/taskmgr.rc:407 msgid "Nonpaged" -msgstr "非置換頁" +msgstr "非分頁" #: programs/taskmgr/taskmgr.rc:414 msgid "CPU usage history" -msgstr "CPU 使用歷程" +msgstr "CPU 使用歷程記錄" #: programs/taskmgr/taskmgr.rc:415 msgid "Memory usage history" -msgstr "記憶體使用歷程" +msgstr "記憶體使用歷程記錄" #: programs/taskmgr/taskmgr.rc:428 programs/taskmgr/taskmgr.rc:327 msgid "Debug Channels" @@ -16821,13 +16819,13 @@ msgstr "除錯通道" #: programs/taskmgr/taskmgr.rc:439 msgid "Processor Affinity" -msgstr "處理器親和度" +msgstr "處理器親和性" #: programs/taskmgr/taskmgr.rc:444 msgid "" "The Processor Affinity setting controls which CPUs the process will be " "allowed to execute on." -msgstr "處理器親和度設定控制各行程使用 CPU 分配情況。" +msgstr "處理器親和性設定控制各處理程序使用 CPU 分配情況。" #: programs/taskmgr/taskmgr.rc:446 msgid "CPU 0" @@ -16959,24 +16957,24 @@ msgstr "CPU 31" #: programs/taskmgr/taskmgr.rc:514 msgid "Select Columns" -msgstr "選擇顯示行" +msgstr "選擇顯示欄" #: programs/taskmgr/taskmgr.rc:519 msgid "" "Select the columns that will appear on the Process page of the Task Manager." -msgstr "請選擇工作管理員中行程分頁的顯示行。" +msgstr "請選擇工作管理員中處理程序分頁的顯示欄。" #: programs/taskmgr/taskmgr.rc:521 msgid "&Image Name" -msgstr "程式名稱(&I)" +msgstr "影像名稱(&I)" #: programs/taskmgr/taskmgr.rc:523 msgid "&PID (Process Identifier)" -msgstr "&PID (行程編號)" +msgstr "PID (處理程序編號)(&P)" #: programs/taskmgr/taskmgr.rc:525 msgid "&CPU Usage" -msgstr "&CPU 用量" +msgstr "CPU 用量(&C)" #: programs/taskmgr/taskmgr.rc:527 msgid "CPU Tim&e" @@ -17028,23 +17026,23 @@ msgstr "虛擬記憶體大小(&V)" #: programs/taskmgr/taskmgr.rc:551 msgid "Pa&ged Pool" -msgstr "置換頁池(&G)" +msgstr "分頁集區(&G)" #: programs/taskmgr/taskmgr.rc:553 msgid "N&on-paged Pool" -msgstr "非置換頁池(&O)" +msgstr "非分頁集區(&O)" #: programs/taskmgr/taskmgr.rc:555 msgid "Base P&riority" -msgstr "基本優先權(&R)" +msgstr "基本優先順序(&R)" #: programs/taskmgr/taskmgr.rc:557 msgid "&Handle Count" -msgstr "控制代碼(&H)" +msgstr "控制代碼計數(&H)" #: programs/taskmgr/taskmgr.rc:559 msgid "&Thread Count" -msgstr "執行緒(&T)" +msgstr "執行緒計數(&T)" #: programs/taskmgr/taskmgr.rc:561 programs/taskmgr/taskmgr.rc:292 msgid "GDI Objects" @@ -17080,7 +17078,7 @@ msgstr "工作管理員總是在其他視窗的最上面，除非是最小化" #: programs/taskmgr/taskmgr.rc:190 msgid "Task Manager is minimized when a SwitchTo operation is performed" -msgstr "工作管理員使用時最小化" +msgstr "當 SwitchTo 操作進行時將工作管理員最小化" #: programs/taskmgr/taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" @@ -17148,7 +17146,7 @@ msgstr "顯示工作管理員說明主題" #: programs/taskmgr/taskmgr.rc:212 msgid "Displays program information, version number, and copyright" -msgstr "顯示本程式資訊，版本及版權" +msgstr "顯示本程式資訊，版本及著作權" #: programs/taskmgr/taskmgr.rc:213 msgid "Exits the Task Manager application" @@ -17156,11 +17154,11 @@ msgstr "結束工作管理員" #: programs/taskmgr/taskmgr.rc:215 msgid "Shows 16-bit tasks under the associated ntvdm.exe" -msgstr "顯示 16 位元工作及有關的 ntvdm.exe" +msgstr "顯示與 ntvdm.exe 關聯的 16 位元工作" #: programs/taskmgr/taskmgr.rc:216 msgid "Select which columns will be visible on the Process page" -msgstr "選擇在行程分頁的顯示行" +msgstr "選擇在處理程序分頁的顯示欄" #: programs/taskmgr/taskmgr.rc:217 msgid "Displays kernel time in the performance graphs" @@ -17168,11 +17166,11 @@ msgstr "在效能圖表上顯示核心使用時間" #: programs/taskmgr/taskmgr.rc:219 msgid "A single history graph shows total CPU usage" -msgstr "在一張歷程圖表顯示所有 CPU 用量" +msgstr "在一張歷程記錄圖表顯示所有 CPU 用量" #: programs/taskmgr/taskmgr.rc:220 msgid "Each CPU has its own history graph" -msgstr "每一個 CPU 有自己的歷程圖表" +msgstr "每一個 CPU 有自己的歷程記錄圖表" #: programs/taskmgr/taskmgr.rc:222 msgid "Brings a task to the foreground, switch focus to that task" @@ -17180,7 +17178,7 @@ msgstr "將工作設為前景，並且切換至該工作" #: programs/taskmgr/taskmgr.rc:227 msgid "Tells the selected tasks to close" -msgstr "通知關閉選擇的工作" +msgstr "通知關閉已選取的工作" #: programs/taskmgr/taskmgr.rc:228 msgid "Switches the focus to the process of the selected task" @@ -17192,47 +17190,47 @@ msgstr "取消工作管理員隱藏狀態" #: programs/taskmgr/taskmgr.rc:230 msgid "Removes the process from the system" -msgstr "將行程從系統中移除" +msgstr "將處理程序從系統中移除" #: programs/taskmgr/taskmgr.rc:232 msgid "Removes this process and all descendants from the system" -msgstr "將行程及其附屬行程從系統中移除" +msgstr "將處理程序及其附屬處理程序從系統中移除" #: programs/taskmgr/taskmgr.rc:233 msgid "Attaches the debugger to this process" -msgstr "將除錯器接到本行程" +msgstr "將除錯器附加到這個處理程序" #: programs/taskmgr/taskmgr.rc:235 msgid "Controls which processors the process will be allowed to run on" -msgstr "控制各行程使用那個處理器" +msgstr "控制各處理程序可使用的處理器" #: programs/taskmgr/taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "將行程設為即時優先等級" +msgstr "將處理程序的優先類別設為即時" #: programs/taskmgr/taskmgr.rc:238 msgid "Sets process to the HIGH priority class" -msgstr "將行程設為高優先級" +msgstr "將處理程序的優先類別設為高" #: programs/taskmgr/taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "將行程設為中等以上優先級" +msgstr "將處理程序的優先類別設為中等以上" #: programs/taskmgr/taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "將行程設為中等優先級" +msgstr "將處理程序的優先類別設為中等" #: programs/taskmgr/taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "將行程設為中等以下優先級" +msgstr "將處理程序的優先類別設為中等以下" #: programs/taskmgr/taskmgr.rc:245 msgid "Sets process to the LOW priority class" -msgstr "將行程設為低優先級" +msgstr "將處理程序的優先類別設為低" #: programs/taskmgr/taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "控制項除錯頻道" +msgstr "除錯頻道控制項" #: programs/taskmgr/taskmgr.rc:264 msgid "Performance" @@ -17244,7 +17242,7 @@ msgstr "CPU 使用率: %3d%%" #: programs/taskmgr/taskmgr.rc:266 msgid "Processes: %d" -msgstr "行程：%d" +msgstr "處理程序: %d" #: programs/taskmgr/taskmgr.rc:267 msgid "Mem Usage: %1!u!kB / %2!u!kB" @@ -17304,15 +17302,15 @@ msgstr "虛擬機器大小" #: programs/taskmgr/taskmgr.rc:287 msgid "Paged Pool" -msgstr "置換頁池" +msgstr "分頁集區" #: programs/taskmgr/taskmgr.rc:288 msgid "NP Pool" -msgstr "非置換頁池" +msgstr "非分頁集區" #: programs/taskmgr/taskmgr.rc:289 msgid "Base Pri" -msgstr "基底優先權" +msgstr "基本優先順序" #: programs/taskmgr/taskmgr.rc:301 msgid "Task Manager Warning" @@ -17324,13 +17322,13 @@ msgid "" "cause undesired results including system instability. Are you\n" "sure you want to change the priority class?" msgstr "" -"警告：變更這個行程的優先權類別也許會\n" -"造成預料之外的結果像是系統的不穩定。\n" -"您確定要變更優先權類別嗎？" +"警告: 變更這個處理程序的優先類別可能會\n" +"造成預料之外的結果，像是系統變得不穩定。\n" +"您確定要變更優先類別嗎?" #: programs/taskmgr/taskmgr.rc:305 msgid "Unable to Change Priority" -msgstr "無法變更優先權" +msgstr "無法變更優先順序" #: programs/taskmgr/taskmgr.rc:310 msgid "" @@ -17340,30 +17338,30 @@ msgid "" "data before it is terminated. Are you sure you want to\n" "terminate the process?" msgstr "" -"警告：終止行程可能造成預料之外的\n" -"結果像是資料的漏失與系統的不穩定。\n" -"行程將無法有機會於終止之前能夠儲存\n" -"它的狀態或資料。您確定要終止行程嗎？" +"警告: 終止處理程序可能造成預料之外的結果，\n" +"像是資料遺失和系統的不穩定。\n" +"處理程序可能無法在終止前儲存它的狀態或資料。\n" +"您確定要終止處理程序嗎?" #: programs/taskmgr/taskmgr.rc:311 msgid "Unable to Terminate Process" -msgstr "無法終止行程" +msgstr "無法終止處理程序" #: programs/taskmgr/taskmgr.rc:313 msgid "" "WARNING: Debugging this process may result in loss of data.\n" "Are you sure you wish to attach the debugger?" msgstr "" -"警告：對這個行程偵錯也許會導致資料失真。\n" -"您確定希望要附加除錯程式？" +"警告：對這個處理程序進行除錯可能會導致資料遺失。\n" +"您確定要附加除錯程式嗎?" #: programs/taskmgr/taskmgr.rc:314 msgid "Unable to Debug Process" -msgstr "無法對行程進行除錯" +msgstr "無法對處理程序進行除錯" #: programs/taskmgr/taskmgr.rc:315 msgid "The process must have affinity with at least one processor" -msgstr "行程必須有具備至少一個處理器的近似者" +msgstr "處理程序必須至少有一個或處理器的親和性設定" #: programs/taskmgr/taskmgr.rc:316 msgid "Invalid Option" @@ -17371,11 +17369,11 @@ msgstr "無效的選項" #: programs/taskmgr/taskmgr.rc:317 msgid "Unable to Access or Set Process Affinity" -msgstr "無法存取或設定行程近似者" +msgstr "無法存取或設定處理器親和性" #: programs/taskmgr/taskmgr.rc:322 msgid "System Idle Process" -msgstr "系統閒置" +msgstr "系統閒置處理程序" #: programs/taskmgr/taskmgr.rc:323 msgid "Not Responding" @@ -17399,23 +17397,21 @@ msgid "" "executable.\n" "Do you want to remove the uninstall entry from the registry?" msgstr "" -"移除指令執行 %s 失敗，可能是找不到可執行程式。\n" -"您要將這項移除指令從註冊表中刪除嗎？" +"移除命令 '%s' 執行失敗，可能是找不到可執行程式。\n" +"您要將這項移除命令從註冊表中移除嗎?" #: programs/uninstaller/uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: 找不到 GUID 為 '%1' 的應用程式\n" #: programs/uninstaller/uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" -msgstr "" +msgstr "uninstaller: 選項 '--remove' 以後必須接著一個應用程式 GUID\n" #: programs/uninstaller/uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "錯誤：無效的選項 %c。\n" +msgstr "uninstaller: 無效的選項 [%1]\n" #: programs/uninstaller/uninstaller.rc:35 msgid "" @@ -17424,6 +17420,10 @@ msgid "" "Uninstall applications from the current Wine prefix.\n" "\n" msgstr "" +"Wine 應用程式解除安裝程式\n" +"\n" +"從目前的 Wine prefix 移除應用程式。\n" +"\n" #: programs/uninstaller/uninstaller.rc:43 msgid "" @@ -17438,6 +17438,16 @@ msgid "" " [no option] Launch the graphical version of this program.\n" "\n" msgstr "" +"用法:\n" +" uninstaller [選項]\n" +"選項:\n" +"\n" +" --help\t 顯示這個資訊。\n" +" --list\t 列出安裝在這個 Wine prefix 中的所有應用程式。\n" +" --remove {GUID} 解除安裝指定的應用程式。\n" +"\t\t 使用 '--list' 來取得應用程式的 GUID。\n" +" [沒有選項] 啟動本程式的圖形界面。\n" +"\n" #: programs/view/view.rc:36 msgid "&Pan" @@ -17461,15 +17471,15 @@ msgstr "普通 Metafile 閱讀器" #: programs/view/view.rc:50 msgid "Metafiles (*.wmf, *.emf)" -msgstr "" +msgstr "Metafile (*.wmf, *.emf)" #: programs/wineboot/wineboot.rc:31 msgid "Waiting for Program" -msgstr "等候程式" +msgstr "正在等候程式" #: programs/wineboot/wineboot.rc:35 msgid "Terminate Process" -msgstr "中斷" +msgstr "終止處理程序" #: programs/wineboot/wineboot.rc:36 msgid "" @@ -17480,7 +17490,7 @@ msgid "" msgstr "" "正在模擬關機，但此程式沒有反應。\n" "\n" -"如果您中斷行程，可能會遺失尚未儲存的資料。" +"如果您中斷處理程序，可能會遺失尚未儲存的資料。" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." @@ -17493,8 +17503,8 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"這個程式是自由軟體；您可以遵照自由軟體基金會所制定的 GNU LGPL 2.1 版或者更新" -"版本的許可條款，來修改和重新散布這個程式。" +"這個程式是自由軟體; 您可以遵照自由軟體基金會所制定的 GNU LGPL 2.1 版或者更新" +"版本的許可條款，來修改和重新散布這個程式。" #: programs/winecfg/winecfg.rc:142 msgid "Windows registration information" @@ -17502,11 +17512,11 @@ msgstr "Windows 註冊資訊" #: programs/winecfg/winecfg.rc:143 msgid "&Owner:" -msgstr "姓名(&O)：" +msgstr "姓名(&O):" #: programs/winecfg/winecfg.rc:145 msgid "Organi&zation:" -msgstr "組織(&Z)：" +msgstr "組織(&Z):" #: programs/winecfg/winecfg.rc:153 msgid "Application settings" @@ -17518,20 +17528,21 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine 可以對不同程式偽裝成不同版本的 Windows。「函式庫」與「顯示」分頁將連結" -"到這個分頁，除了調整預設設定，也能調整個別程式的設定。" +"針對不同程式，Wine 可以模仿為不同版本的 Windows。" +"「函式庫」與「顯示」分頁將連結到這個分頁，除了調整預設設定，" +"也能調整個別程式的設定。" #: programs/winecfg/winecfg.rc:158 msgid "Add appli&cation..." -msgstr "新增程式設定(&C)..." +msgstr "新增程式(&C)..." #: programs/winecfg/winecfg.rc:159 msgid "&Remove application" -msgstr "移除程式設定(&R)" +msgstr "移除程式(&R)" #: programs/winecfg/winecfg.rc:160 msgid "&Windows Version:" -msgstr "&Windows 版本：" +msgstr "Windows 版本(&W):" #: programs/winecfg/winecfg.rc:168 msgid "Window settings" @@ -17555,7 +17566,7 @@ msgstr "模擬一個虛擬桌面(&E)" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" -msgstr "桌面大小(&S)：" +msgstr "桌面大小(&S):" #: programs/winecfg/winecfg.rc:179 msgid "Screen resolution" @@ -17567,7 +17578,7 @@ msgstr "這是使用 10 點 Tahoma 字型的範例文字" #: programs/winecfg/winecfg.rc:190 msgid "DLL overrides" -msgstr "DLL 覆載" +msgstr "DLL 覆寫" #: programs/winecfg/winecfg.rc:191 msgid "" @@ -17575,12 +17586,12 @@ msgid "" "(provided by Wine) or native (taken from Windows or provided by the " "application)." msgstr "" -"動態連結函式庫可以個別設定，來指定要使用 Wine 提供的內建版本，還是使用取自 " -"Windows 或程式所提供的原生版本。" +"動態連結函式庫可以個別設定，來指定要使用 Wine 提供的內建版本，" +"還是使用取自 Windows 或程式所提供的原生版本。" #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:" -msgstr "新增函式庫覆載(&N)：" +msgstr "新增函式庫覆寫(&N):" #: programs/winecfg/winecfg.rc:195 msgid "A&dd" @@ -17588,7 +17599,7 @@ msgstr "新增(&D)" #: programs/winecfg/winecfg.rc:196 msgid "Existing &overrides:" -msgstr "已有的函式庫覆載(&O)：" +msgstr "已有的函式庫覆寫(&O):" #: programs/winecfg/winecfg.rc:198 msgid "&Edit..." @@ -17596,7 +17607,7 @@ msgstr "編輯(&E)..." #: programs/winecfg/winecfg.rc:204 msgid "Edit Override" -msgstr "編輯覆載設定" +msgstr "編輯覆寫設定" #: programs/winecfg/winecfg.rc:207 msgid "Load order" @@ -17604,11 +17615,11 @@ msgstr "載入順序" #: programs/winecfg/winecfg.rc:208 msgid "&Builtin (Wine)" -msgstr "內建(Wine)(&B)" +msgstr "內建 (Wine)(&B)" #: programs/winecfg/winecfg.rc:209 msgid "&Native (Windows)" -msgstr "原生(Windows)(&N)" +msgstr "原生 (Windows)(&N)" #: programs/winecfg/winecfg.rc:210 msgid "Buil&tin then Native" @@ -17623,28 +17634,22 @@ msgid "Select Drive Letter" msgstr "選擇儲存裝置代號" #: programs/winecfg/winecfg.rc:231 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine 設定" +msgstr "儲存裝置設定" #: programs/winecfg/winecfg.rc:232 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." -msgstr "連線到掛載管理員時失敗，無法編輯磁碟組態。" +msgstr "連線到掛載管理員時失敗; 無法編輯儲存裝置設定。" #: programs/winecfg/winecfg.rc:235 msgid "A&dd..." -msgstr "加入(&D)..." +msgstr "新增(&D)..." #: programs/winecfg/winecfg.rc:239 msgid "&Path:" -msgstr "路徑(&P)：" +msgstr "路徑(&P):" #: programs/winecfg/winecfg.rc:246 programs/winecfg/winecfg.rc:37 msgid "Show Advan&ced" @@ -17652,7 +17657,7 @@ msgstr "顯示進階選項(&C)" #: programs/winecfg/winecfg.rc:247 msgid "De&vice:" -msgstr "裝置(&V)：" +msgstr "裝置(&V):" #: programs/winecfg/winecfg.rc:249 msgid "Bro&wse..." @@ -17660,15 +17665,15 @@ msgstr "瀏覽(&W)..." #: programs/winecfg/winecfg.rc:251 msgid "&Label:" -msgstr "標貼(&L)：" +msgstr "標籤(&L):" #: programs/winecfg/winecfg.rc:253 msgid "S&erial:" -msgstr "序號(&E)：" +msgstr "序號(&E):" #: programs/winecfg/winecfg.rc:256 msgid "&Show dot files" -msgstr "顯示隱藏檔案(&S)" +msgstr "顯示點檔案(&S)" #: programs/winecfg/winecfg.rc:263 msgid "Driver diagnostics" @@ -17680,33 +17685,31 @@ msgstr "預設" #: programs/winecfg/winecfg.rc:266 msgid "Output device:" -msgstr "輸出裝置：" +msgstr "輸出裝置:" #: programs/winecfg/winecfg.rc:267 msgid "Voice output device:" -msgstr "語音輸出裝置：" +msgstr "語音輸出裝置:" #: programs/winecfg/winecfg.rc:268 msgid "Input device:" -msgstr "輸入裝置：" +msgstr "輸入裝置:" #: programs/winecfg/winecfg.rc:269 msgid "Voice input device:" -msgstr "語音輸入裝置：" +msgstr "語音輸入裝置:" #: programs/winecfg/winecfg.rc:274 msgid "&Test Sound" -msgstr "測試音效(&T)" +msgstr "測試音效(&T):" #: programs/winecfg/winecfg.rc:275 programs/winecfg/winecfg.rc:89 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine 設定" +msgstr "喇叭設定" #: programs/winecfg/winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "喇叭:" #: programs/winecfg/winecfg.rc:286 msgid "Appearance" @@ -17714,27 +17717,27 @@ msgstr "外觀" #: programs/winecfg/winecfg.rc:287 msgid "&Theme:" -msgstr "布景主題(&T)：" +msgstr "主題(&T):" #: programs/winecfg/winecfg.rc:289 msgid "&Install theme..." -msgstr "安裝布景主題(&I)..." +msgstr "安裝主題(&I)..." #: programs/winecfg/winecfg.rc:294 msgid "It&em:" -msgstr "項目(&E)：" +msgstr "項目(&E):" #: programs/winecfg/winecfg.rc:296 msgid "C&olor:" -msgstr "顏色(&O)：" +msgstr "顏色(&O):" #: programs/winecfg/winecfg.rc:302 msgid "MIME types" -msgstr "" +msgstr "MIME 類型" #: programs/winecfg/winecfg.rc:303 msgid "Manage file &associations" -msgstr "" +msgstr "管理檔案關聯(&A)" #: programs/winecfg/winecfg.rc:306 msgid "Folders" @@ -17742,7 +17745,7 @@ msgstr "資料夾" #: programs/winecfg/winecfg.rc:309 msgid "&Link to:" -msgstr "連結至(&L)：" +msgstr "連結至(&L):" #: programs/winecfg/winecfg.rc:33 msgid "Libraries" @@ -17762,7 +17765,7 @@ msgstr "隱藏進階選項(&C)" #: programs/winecfg/winecfg.rc:38 msgid "(No Theme)" -msgstr "(無布景主題)" +msgstr "(無主題)" #: programs/winecfg/winecfg.rc:39 msgid "Graphics" @@ -17786,15 +17789,15 @@ msgstr "Wine 設定" #: programs/winecfg/winecfg.rc:45 msgid "Theme files (*.msstyles; *.theme)" -msgstr "布景主題檔案 (*.msstyles; *.theme)" +msgstr "主題檔案 (*.msstyles; *.theme)" #: programs/winecfg/winecfg.rc:46 msgid "Select a theme file" -msgstr "選擇一個布景主題檔案" +msgstr "選擇一個主題檔案" #: programs/winecfg/winecfg.rc:47 msgid "Folder" -msgstr "特殊資料夾" +msgstr "資料夾" #: programs/winecfg/winecfg.rc:48 msgid "Links to" @@ -17806,7 +17809,7 @@ msgstr "Wine 於 %s 的設定" #: programs/winecfg/winecfg.rc:83 msgid "Selected driver: %s" -msgstr "選擇的驅動程式：%s" +msgstr "選擇的驅動程式: %s" #: programs/winecfg/winecfg.rc:84 msgid "(None)" @@ -17814,7 +17817,7 @@ msgstr "(無)" #: programs/winecfg/winecfg.rc:85 msgid "Audio test failed!" -msgstr "音效測試失敗！" +msgstr "音效測試失敗!" #: programs/winecfg/winecfg.rc:87 msgid "(System default)" @@ -17822,33 +17825,31 @@ msgstr "(系統預設值)" #: programs/winecfg/winecfg.rc:90 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 環場音效" #: programs/winecfg/winecfg.rc:91 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "圖形" +msgstr "四聲道" #: programs/winecfg/winecfg.rc:92 msgid "Stereo" -msgstr "" +msgstr "雙聲道" #: programs/winecfg/winecfg.rc:93 msgid "Mono" -msgstr "" +msgstr "單聲道" #: programs/winecfg/winecfg.rc:53 msgid "" "Changing the load order of this library is not recommended.\n" "Are you sure you want to do this?" msgstr "" -"不建議對這個函式庫更改載入順序。\n" -"您確定要如此嗎？" +"不建議更改這個函式庫的載入順序。\n" +"您確定要如此做嗎?" #: programs/winecfg/winecfg.rc:54 msgid "Warning: system library" -msgstr "警告：系統函式庫" +msgstr "警告: 系統函式庫" #: programs/winecfg/winecfg.rc:55 msgid "native" @@ -17864,7 +17865,7 @@ msgstr "原生，內建" #: programs/winecfg/winecfg.rc:58 msgid "builtin, native" -msgstr "內建、原生" +msgstr "內建，原生" #: programs/winecfg/winecfg.rc:59 msgid "disabled" @@ -17872,7 +17873,7 @@ msgstr "停用" #: programs/winecfg/winecfg.rc:60 msgid "Default Settings" -msgstr "預設組態" +msgstr "預設設定" #: programs/winecfg/winecfg.rc:61 msgid "Wine Programs (*.exe; *.exe.so)" @@ -17884,7 +17885,7 @@ msgstr "使用全域設定" #: programs/winecfg/winecfg.rc:63 msgid "Select an executable file" -msgstr "選擇一個可執行檔" +msgstr "選擇一個可執行檔案" #: programs/winecfg/winecfg.rc:68 msgid "Autodetect" @@ -17900,7 +17901,7 @@ msgstr "網路分享" #: programs/winecfg/winecfg.rc:71 msgid "Floppy disk" -msgstr "軟碟機" +msgstr "軟碟" #: programs/winecfg/winecfg.rc:72 msgid "CD-ROM" @@ -17914,30 +17915,23 @@ msgid "" msgstr "" "您無法再增加任何儲存裝置。\n" "\n" -"每個儲存裝置必須要有一個從 A 到 Z 之間的英文字母，所以您無法擁有超過 26 個裝" -"置。" +"每個儲存裝置必須有一個從 A 到 Z 之間的英文字母，所以您無法擁有超過 26 個裝置。" #: programs/winecfg/winecfg.rc:74 msgid "System drive" msgstr "系統儲存裝置" #: programs/winecfg/winecfg.rc:75 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" "Most Windows applications expect drive C to exist, and will die messily if " "it doesn't. If you proceed, remember to recreate it!" msgstr "" -"您確定要刪除 C 槽嗎？\n" +"您確定要刪除磁碟機 C 嗎?\n" "\n" -"大部分的 Windows 程式都假定 C 槽存在，而沒有 C 槽時就會死得很嚴重。如果您刪除" -"了它，請記得重新建立一個！" +"大部分的 Windows 應用程式都假定磁碟機 C 存在，而沒有磁碟機 C 時就會死得很嚴重。" +"如果您刪除了它，請記得重新建立一個!" #: programs/winecfg/winecfg.rc:76 msgctxt "Drive letter" @@ -17945,10 +17939,8 @@ msgid "Letter" msgstr "代號" #: programs/winecfg/winecfg.rc:77 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "新資料夾" +msgstr "目標資料夾" #: programs/winecfg/winecfg.rc:78 msgid "" @@ -17956,9 +17948,9 @@ msgid "" "\n" "Remember to click 'Add' in the Drives tab to create one!\n" msgstr "" -"您沒有 C 槽。這不是件好事。\n" +"您沒有磁碟機 C。這不是件好事。\n" "\n" -"請記得點選「儲存裝置」分頁的「加入」來建立一個新磁碟！\n" +"請記得按「儲存裝置」分頁的 [加入] 按鈕來建立一個新儲存裝置!\n" #: programs/winecfg/winecfg.rc:98 msgid "Controls Background" @@ -18066,7 +18058,7 @@ msgstr "按鈕替換背景" #: programs/winecfg/winecfg.rc:125 msgid "Hot Tracked Item" -msgstr "熱門軌段的項目" +msgstr "熱點追蹤項目" #: programs/winecfg/winecfg.rc:126 msgid "Active Title Bar Gradient" @@ -18089,7 +18081,7 @@ msgid "" "wineconsole: Starting program %s failed.\n" "The command is invalid.\n" msgstr "" -"wineconsole：啟始程式 %s 時失敗。\n" +"wineconsole: 啟動程式 %s 時失敗。\n" "命令無效。\n" #: programs/winedbg/winedbg.rc:50 programs/winedbg/winedbg.rc:38 @@ -18100,7 +18092,7 @@ msgstr "程式錯誤" msgid "" "The program %s has encountered a serious problem and needs to close. We are " "sorry for the inconvenience." -msgstr "程式 %s 遇到了嚴重的問題而需要關閉。我們對於造成的不便感到抱歉。" +msgstr "程式 %s 遇到了嚴重問題而需要關閉。我們對於造成的不便感到抱歉。" #: programs/winedbg/winedbg.rc:59 msgid "" @@ -18108,8 +18100,9 @@ msgid "" "may want to check the <a href=\"https://appdb.winehq.org\">Application " "Database</a> for tips about running this application." msgstr "" -"這個可能是由 Wine 中的程式問題或缺失所造成。您可能要檢查<a href=\"https://" -"appdb.winehq.org\">應用程式資料庫</a>以獲得關於執行這個應用程式的祕訣。" +"這個可能是由 Wine 中的程式問題或缺失所造成。" +"您可能要檢查<a href=\"https://appdb.winehq.org\">應用程式資料庫</a>" +"以取得關於執行這個應用程式的提示。" #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -18126,19 +18119,21 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"如果這個問題在 Windows 之下不會出現且未曾被報告，您可以使用「另存新檔」按鈕" -"將詳細的資訊儲存到檔案，然後<a href=\"https://wiki.winehq.org/Bugs\">發送錯誤" -"報告</a>並附加該檔案到報告中。" +"如果這個問題在 Windows 之下不會出現且未曾被報告，" +"您可以使用 [另存新檔] 按鈕將相關的詳細資訊儲存到檔案，" +"然後<a href=\"https://wiki.winehq.org/Bugs\">發送錯誤報告</a>" +"並附加該檔案到報告中。" #: programs/winedbg/winedbg.rc:40 msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"您的系統的程式崩潰了，但 WineDbg 無法附加到處理程序以取得回溯。" #: programs/winedbg/winedbg.rc:41 msgid "(unidentified)" -msgstr "(未經識別的)" +msgstr "(未識別)" #: programs/winedbg/winedbg.rc:44 msgid "Saving failed" @@ -18146,7 +18141,7 @@ msgstr "儲存失敗" #: programs/winedbg/winedbg.rc:45 msgid "Loading detailed information, please wait..." -msgstr "正在載入詳細資訊，請稍待..." +msgstr "正在載入詳細資訊，請稍候..." #: programs/winefile/winefile.rc:29 msgid "&Open\tEnter" @@ -18158,7 +18153,7 @@ msgstr "重新命名(&N)..." #: programs/winefile/winefile.rc:34 msgid "Propert&ies\tAlt+Enter" -msgstr "屬性(&I)\tAlt+Enter" +msgstr "內容(&I)\tAlt+Enter" #: programs/winefile/winefile.rc:38 msgid "Cr&eate Directory..." @@ -18178,7 +18173,7 @@ msgstr "從網路儲存裝置離線(&D)" #: programs/winefile/winefile.rc:51 msgid "&Name" -msgstr "檔案名稱(&N)" +msgstr "名稱(&N)" #: programs/winefile/winefile.rc:52 msgid "&All File Details" @@ -18262,19 +18257,19 @@ msgstr "顯示隱藏或系統檔(&S)" #: programs/winefile/winefile.rc:159 msgid "&File Name:" -msgstr "檔案名稱(&F)：" +msgstr "檔案名稱(&F):" #: programs/winefile/winefile.rc:161 msgid "Full &Path:" -msgstr "完整路徑(&P)：" +msgstr "完整路徑(&P):" #: programs/winefile/winefile.rc:163 msgid "Last Change:" -msgstr "最後修改：" +msgstr "最後修改:" #: programs/winefile/winefile.rc:167 msgid "Cop&yright:" -msgstr "著作權(&Y)：" +msgstr "著作權(&Y):" #: programs/winefile/winefile.rc:175 msgid "&System" @@ -18295,7 +18290,7 @@ msgstr "S" #: programs/winefile/winefile.rc:90 msgid "Applying font settings" -msgstr "字型設定套用中" +msgstr "正在套用字型設定" #: programs/winefile/winefile.rc:91 msgid "Error while selecting new font." @@ -18350,10 +18345,8 @@ msgid "&Beginner" msgstr "初學者(&B)" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "介面" +msgstr "中級(&I)" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -18384,24 +18377,20 @@ msgid "Beginner" msgstr "初學者" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "介面" +msgstr "中級" #: programs/winemine/winemine.rc:66 msgid "Expert" msgstr "專家" #: programs/winemine/winemine.rc:74 programs/winemine/winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "結果" +msgstr "重設成績" #: programs/winemine/winemine.rc:80 msgid "Congratulations!" -msgstr "恭喜！" +msgstr "恭喜!" #: programs/winemine/winemine.rc:82 msgid "Please enter your name" @@ -18425,7 +18414,7 @@ msgstr "地雷" #: programs/winemine/winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "所有成績都會消失。您確定嗎?" #: programs/winemine/winemine.rc:30 msgid "WineMine" @@ -18473,7 +18462,7 @@ msgstr "大" #: programs/winhlp32/winhlp32.rc:58 msgid "&Help on help\tF1" -msgstr "如何使用說明(&H)" +msgstr "如何使用說明(&H)\tF1" #: programs/winhlp32/winhlp32.rc:59 msgid "&About Wine Help" @@ -18501,7 +18490,7 @@ msgstr "Wine 說明" #: programs/winhlp32/winhlp32.rc:86 msgid "Error while reading the help file `%s'" -msgstr "載入說明檔案 %s 時發生錯誤" +msgstr "載入說明檔案 `%s' 時發生錯誤" #: programs/winhlp32/winhlp32.rc:88 msgid "Summary" @@ -18517,33 +18506,31 @@ msgstr "說明檔案 (*.hlp)" #: programs/winhlp32/winhlp32.rc:92 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "無法開啟檔案 %s。您想要自己搜尋這個檔案嗎？" +msgstr "無法開啟檔案 '%s'。您要自己搜尋這個檔案嗎?" #: programs/winhlp32/winhlp32.rc:93 msgid "Cannot find a richedit implementation... Aborting" -msgstr "找不到 richedit... 終止" +msgstr "找不到 richedit 實作... 正在終止" #: programs/winhlp32/winhlp32.rc:94 msgid "Help topics: " -msgstr "說明主題：" +msgstr "說明主題:" #: programs/wmic/wmic.rc:28 msgid "Error: Command line not supported\n" -msgstr "錯誤：不支援命令列\n" +msgstr "錯誤: 不支援命令列\n" #: programs/wmic/wmic.rc:29 msgid "Error: Alias not found\n" -msgstr "錯誤：找不到別名\n" +msgstr "錯誤: 找不到別名\n" #: programs/wmic/wmic.rc:30 msgid "Error: Invalid query\n" -msgstr "錯誤：無效的查詢\n" +msgstr "錯誤: 無效的查詢\n" #: programs/wmic/wmic.rc:31 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid syntax for PATH\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "錯誤: 無效的 PATH 語法\n" #: programs/wordpad/wordpad.rc:31 msgid "&New...\tCtrl+N" @@ -18571,7 +18558,7 @@ msgstr "唯讀(&O)" #: programs/wordpad/wordpad.rc:58 msgid "&Modified" -msgstr "已變更(&M)" +msgstr "已修改(&M)" #: programs/wordpad/wordpad.rc:60 msgid "E&xtras" @@ -18587,7 +18574,7 @@ msgstr "文字格式(&F)" #: programs/wordpad/wordpad.rc:64 msgid "&Def. char format" -msgstr "預設格式(&D)" +msgstr "預設文字格式(&D)" #: programs/wordpad/wordpad.rc:65 msgid "Paragrap&h format" @@ -18611,15 +18598,13 @@ msgstr "插入(&I)" #: programs/wordpad/wordpad.rc:80 msgid "&Date and time..." -msgstr "日期時間(&D)..." +msgstr "日期和時間(&D)..." #: programs/wordpad/wordpad.rc:82 msgid "F&ormat" msgstr "格式(&O)" #: programs/wordpad/wordpad.rc:85 -#, fuzzy -#| msgid "&List" msgid "&Lists" msgstr "清單(&L)" @@ -18628,26 +18613,24 @@ msgid "&Bullet points" msgstr "項目符號(&B)" #: programs/wordpad/wordpad.rc:88 -#, fuzzy -#| msgid "CRL Number" msgid "Numbers" -msgstr "CRL 數字" +msgstr "數字" #: programs/wordpad/wordpad.rc:89 msgid "Letters - lower case" -msgstr "" +msgstr "字母 - 小寫" #: programs/wordpad/wordpad.rc:90 msgid "Letters - upper case" -msgstr "" +msgstr "字母 - 大寫" #: programs/wordpad/wordpad.rc:91 msgid "Roman numerals - lower case" -msgstr "" +msgstr "羅馬數字 - 小寫" #: programs/wordpad/wordpad.rc:92 msgid "Roman numerals - upper case" -msgstr "" +msgstr "羅馬數字 - 大寫" #: programs/wordpad/wordpad.rc:94 programs/wordpad/wordpad.rc:117 msgid "&Paragraph..." @@ -18683,7 +18666,7 @@ msgstr "日期和時間" #: programs/wordpad/wordpad.rc:213 msgid "Available formats" -msgstr "可用格式" +msgstr "可用的格式" #: programs/wordpad/wordpad.rc:224 msgid "New document type" @@ -18719,7 +18702,7 @@ msgstr "分頁" #: programs/wordpad/wordpad.rc:253 msgid "Tab stops" -msgstr "定位停點" +msgstr "定位停駐點" #: programs/wordpad/wordpad.rc:255 msgid "&Add" @@ -18793,18 +18776,16 @@ msgid "Text documents (*.txt)" msgstr "純文字文件 (*.txt)" #: programs/wordpad/wordpad.rc:149 -#, fuzzy -#| msgid "Unicode text document (*.txt)" msgid "Unicode text documents (*.txt)" -msgstr "萬國碼文字文件 (*.txt)" +msgstr "Unicode 文字文件 (*.txt)" #: programs/wordpad/wordpad.rc:150 msgid "Rich text format (*.rtf)" -msgstr "豐富文字格式 (*.rtf)" +msgstr "富文字格式 (*.rtf)" #: programs/wordpad/wordpad.rc:151 msgid "Rich text document" -msgstr "豐富文字格式檔案" +msgstr "富文字格式文件" #: programs/wordpad/wordpad.rc:152 msgid "Text document" @@ -18812,7 +18793,7 @@ msgstr "純文字文件" #: programs/wordpad/wordpad.rc:153 msgid "Unicode text document" -msgstr "萬國碼文字文件" +msgstr "Unicode 文字文件" #: programs/wordpad/wordpad.rc:154 msgid "Printer files (*.prn)" @@ -18828,7 +18809,7 @@ msgstr "純文字" #: programs/wordpad/wordpad.rc:168 msgid "Rich text" -msgstr "豐富格式文字" +msgstr "RTF 文字" #: programs/wordpad/wordpad.rc:174 msgid "Next page" @@ -18887,29 +18868,31 @@ msgstr "文件" #: programs/wordpad/wordpad.rc:192 msgid "Save changes to '%s'?" -msgstr "儲存變更到 %s？" +msgstr "儲存變更到 '%s'?" #: programs/wordpad/wordpad.rc:193 msgid "Finished searching the document." -msgstr "檔案搜尋結束。" +msgstr "檔案搜尋完成。" #: programs/wordpad/wordpad.rc:194 msgid "Failed to load the RichEdit library." -msgstr "RichEdit 載入失敗。" +msgstr "RichEdit 庫載入失敗。" #: programs/wordpad/wordpad.rc:195 msgid "" "You have chosen to save in plain text format, which will cause all " "formatting to be lost. Are you sure that you wish to do this?" -msgstr "您已經選擇儲存為純文字格式, 這可能導致格式遺失。您確定要這麼做嗎？" +msgstr "" +"您已經選擇儲存為純文字格式, 這可能導致格式遺失。" +"您確定要這麼做嗎?" #: programs/wordpad/wordpad.rc:198 msgid "Invalid number format." -msgstr "無效的數字格式。" +msgstr "錯誤的數字格式。" #: programs/wordpad/wordpad.rc:199 msgid "OLE storage documents are not supported." -msgstr "OLE 儲存體文件未被支援。" +msgstr "不支援 OLE 儲存體文件。" #: programs/wordpad/wordpad.rc:200 msgid "Could not save the file." @@ -18937,7 +18920,7 @@ msgstr "無法加入超過 32 個定位停駐點。" #: programs/write/write.rc:30 msgid "Starting Wordpad failed" -msgstr "啟動 Wordpad 時失敗" +msgstr "Wordpad 啟動失敗" #: programs/xcopy/xcopy.rc:30 msgid "Invalid number of parameters - Use xcopy /? for help\n" @@ -18945,7 +18928,7 @@ msgstr "無效的參數數量 - 使用 xcopy /? 以獲得說明\n" #: programs/xcopy/xcopy.rc:31 msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "無效的參數 %1 - 使用 xcopy /? 以獲得說明\n" +msgstr "無效的參數 '%1' - 使用 xcopy /? 以獲得說明\n" #: programs/xcopy/xcopy.rc:32 msgid "Press <Enter> to begin copying\n" @@ -18965,25 +18948,25 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"%1 是一個在目標上的\n" -"檔名或目錄？\n" +"%1 是目標上的\n" +"一個檔案名稱還是目錄?\n" "(F - 檔案，D - 目錄)\n" #: programs/xcopy/xcopy.rc:38 msgid "%1? (Yes|No)\n" -msgstr "%1？ (Yes|No)\n" +msgstr "%1? (Yes|No)\n" #: programs/xcopy/xcopy.rc:39 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "是否覆蓋 %1？ (Yes|No|All)\n" +msgstr "是否覆寫 %1? (Yes|No|All)\n" #: programs/xcopy/xcopy.rc:40 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "將 %1 複製到 %2 時失敗並獲得 r/c %3!d!\n" +msgstr "將 '%1' 複製到 '%2' 時失敗，並獲得 r/c %3!d!\n" #: programs/xcopy/xcopy.rc:42 msgid "Failed during reading of '%1'\n" -msgstr "在讀取 %1 的期間發生了失敗\n" +msgstr "在讀取 '%1' 時發生了失敗\n" #: programs/xcopy/xcopy.rc:46 msgctxt "File key" @@ -18996,41 +18979,6 @@ msgid "D" msgstr "D" #: programs/xcopy/xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -19066,20 +19014,20 @@ msgid "" "\t\tthan source.\n" "\n" msgstr "" -"XCOPY - 將來源檔案或樹狀目錄複製到目的。\n" +"XCOPY - 將來源檔案或樹狀目錄複製到目的地。\n" "\n" -"語法：\n" -"XCOPY 來源 [目的] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" +"語法:\n" +"XCOPY 來源 [目的地] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" -"位置：\n" +"位置:\n" "\n" "[/I] 如果目的不存在且複製兩個或更多檔案時，\n" "\t將目的假設為目錄。\n" "[/S] 複製目錄和子目錄。\n" -"[/E] 複製目錄和子目錄，包含任何空目錄。\n" -"[/Q] 在複製期間不列出名稱，亦即安靜模式。\n" -"[/F] 在複製期間顯示完整的來源和目的名稱。\n" +"[/E] 複製目錄和子目錄，包括任何空目錄。\n" +"[/Q] 安靜模式，在複製期間不列出名稱。\n" +"[/F] 在複製期間顯示完整的來源和目的地名稱。\n" "[/L] 模擬操作，顯示會被複製的名稱。\n" "[/W] 在開始複製操作之前進行提示。\n" "[/T] 建立空的目錄結構但是不複製檔案。\n" @@ -19094,6 +19042,8 @@ msgstr "" "[/A] 只複製具有封存屬性的檔案。\n" "[/M] 只複製具有封存屬性的檔案，\n" "\t但會移除封存屬性。\n" +"[/K] 複製檔案的屬性; 不指定這個引數則不會儲存屬性。\n" "[/D | /D:m-d-y] 複製新檔案或是於給定日期之後修改的檔案。\n" -"\t\t如果沒有給定日期，只有當目的比來源舊時才複製。\n" +"\t\t如果沒有給定日期，則只有目的地檔案\n" +"\t\t比來源檔案舊時才複製。\n" "\n" -- 2.33.0.windows.2

2 1

[PATCH resend 1/2] wininet/tests: Test adding HTTP header with empty value.
by Ziqing Hui 22 Nov '21

22 Nov '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- Resend: Please take a look at this patch set. Don't ignore it for the test failure. I think the test failure is not caused by this patch. See HTTP tests with a empty patch: https://testbot.winehq.org/JobDetails.pl?Key=101700 https://testbot.winehq.org/JobDetails.pl?Key=101701 dlls/wininet/tests/http.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3b8f16a9fb2..c3f33b4e0b7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2063,6 +2063,32 @@ static void HttpHeaders_test(void) "header still present\n"); ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + /* Adding header with empty value should cause a failure */ + todo_wine + { + SetLastError(0xdeadbeef); + ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest1:", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %u.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(!HttpAddRequestHeadersA(hRequest, "EmptyTest2:\r\n", -1, HTTP_ADDREQ_FLAG_ADD), "Empty header should not be added.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error code %u.\n", GetLastError()); + + len = sizeof(buffer); + strcpy(buffer, "EmptyTest1"); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), + "Header with empty value is present.\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %u.\n", GetLastError()); + + len = sizeof(buffer); + strcpy(buffer, "EmptyTest2"); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfoA(hRequest, HTTP_QUERY_CUSTOM | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, NULL), + "Header with empty value is present.\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "Got unexpected error code %u.\n", GetLastError()); + } + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); -- 2.25.1

2 3

[PATCH] mf/tests: Attempt to fix test crashes on some test boxes.
by Nikolay Sivov 21 Nov '21

21 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index eb681a8b9a7..0d4cb05711a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4498,15 +4498,18 @@ todo_wine { hr = IMFMediaSink_AddStreamSink(sink, 1, NULL, &stream_sink2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, - (void **)&allocator); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFVideoSampleAllocator_Release(allocator); + if (SUCCEEDED(hr)) + { + hr = MFGetService((IUnknown *)stream_sink2, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, + (void **)&allocator); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoSampleAllocator_Release(allocator); - hr = IMFMediaSink_RemoveStreamSink(sink, 1); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_RemoveStreamSink(sink, 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFStreamSink_Release(stream_sink2); + IMFStreamSink_Release(stream_sink2); + } hr = IMFMediaSink_GetCharacteristics(sink, &flags); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -- 2.33.0

2 1

[PATCH] ucrtbase/tests: Don't test functions directly when reporting GetLastError()
by André Zwing 21 Nov '21

21 Nov '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/ucrtbase/tests/thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/thread.c b/dlls/ucrtbase/tests/thread.c index 7693304e612..940db8e4dbf 100644 --- a/dlls/ucrtbase/tests/thread.c +++ b/dlls/ucrtbase/tests/thread.c @@ -105,7 +105,8 @@ static void test_thread_library_reference(char *thread_dll, ok(thread_handle != -1 && thread_handle != 0, "Failed to begin thread: %u\n", errno); - ok(FreeLibrary(dll), "Failed to free the library: %u\n", GetLastError()); + ret = FreeLibrary(dll); + ok(ret, "Failed to free the library: %u\n", GetLastError()); ret = WaitForSingleObject(args.confirm_running, 200); ok(ret == WAIT_OBJECT_0, "Event was not signaled, ret: %u, err: %u\n", ret, GetLastError()); @@ -113,7 +114,8 @@ static void test_thread_library_reference(char *thread_dll, ret = WaitForSingleObject(detach_event, 0); ok(ret == WAIT_TIMEOUT, "Thread detach happened unexpectedly signaling an event, ret: %d, err: %u\n", ret, GetLastError()); - ok(SetEvent(args.past_free), "Failed to signal event: %d\n", GetLastError()); + ret = SetEvent(args.past_free); + ok(ret, "Failed to signal event: %d\n", GetLastError()); if (beginthread_method == use_beginthreadex) { -- 2.25.1

1 0

[PATCH v5] kernel32/tests: Add SetCurrentConsoleFontEx tests for the current window size
by Hugh McMaster 21 Nov '21

21 Nov '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v5: Remove unneeded todo_wine macros dlls/kernel32/tests/console.c | 271 +++++++++++++++++++++++++++++++++- 1 file changed, 269 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..7f546517573 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,10 +3554,17 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + unsigned int cp, font_family; + WCHAR face_name[] = L"Courier New"; + + font_family = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + + /* Save current console font information */ + cp = GetConsoleOutputCP(); orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3651,17 +3658,277 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + SetConsoleOutputCP(CP_UTF8); + + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + cfix.FontFamily = font_family; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, face_name); + + tmp.cbSize = sizeof(tmp); + + /* Courier New is available in the console by default from Windows 10 build 1607 */ + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + if (lstrcmpW(tmp.FaceName, face_name)) + { + SetConsoleOutputCP(cp); + skip("%s not available. Skipping SetCurrentConsoleFontEx tests.\n", wine_dbgstr_w(face_name)); + return; + } + + /* Test font size 8x16 */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20 */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 20; + SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 5x12. We pass in 10x12. */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 12; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20. We pass in 0x20. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 20; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 10, "got %u, expected font width of 10\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 20, "got %u, expected font height of 20\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test invalid font size 7x0 */ + cfix = tmp; + cfix.dwFontSize.X = 7; + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 13x24 */ + cfix.dwFontSize.X = 13; + cfix.dwFontSize.Y = 24; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 0x0 */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Reset to font size 8x16 */ + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font weight */ + cfix.FontWeight = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with invalid font face name */ + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"MissingFont"); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font face name */ + cfix.FaceName[0] = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X || tmp.dwFontSize.X == 9, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + /* Restore original console font parameters */ + SetConsoleOutputCP(cp); + SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); -- 2.33.1

1 0

Wine staging 6.22 release
by Alistair Leslie-Hughes 20 Nov '21

20 Nov '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Notes: dwarf4 debug information is now the default for wine-staging. Summary since last release * Rebased to current wine 6.22 (554 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * ntdll: Implement NtAlertThreadByThreadId and NtWaitForAlertByThreadId. * ntdll/tests: Add basic tests for thread-id alert functions. * ntdll: Implement thread-ID alerts using futexes if possible. * ntdll: Implement thread-ID alerts using Mach semaphores on Mac. * ntdll: Reimplement Win32 futexes on top of thread-ID alerts. * ntdll: Reimplement the critical section fast path on top of Win32 futexes. * ntdll: Get rid of the direct futex path for condition variables. * ntdll: Reimplement SRW locks on top of Win32 futexes. Added: * None Updated: * dinput-joy-mappings Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH v5 0/6] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang 20 Nov '21

20 Nov '21

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. v4 -> v5: - Fix pointer variable declaration style. - Synchronize to prior modified patches. - Split out XML escaping in a separate patch - Don't realloc/free when emptying - Drop reply_buffer_resize(), merge into reply_buffer_grow() - Remove "more" variables for now - Don't empty the reply buffer twice - Use two sscanf for alternative patterns - Don't always zero-initialise qxfer_object_annex - Use strcpy (I just did what I was told to do) - Use strcmp (I just did what I was told to do) Jinoh Kang (6): winedbg: Refactor out_{buf*,len} of gdb_context into reply_buffer. winedbg: Buffer output of GDB qXfer commands for proper slicing. winedbg: Escape XML special characters in qXfer reply. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 601 ++++++++++++++++++++++++------------ 1 file changed, 404 insertions(+), 197 deletions(-) -- 2.31.1

1 6

7.0 release plans
by Alexandre Julliard 20 Nov '21

20 Nov '21

Folks, With the end of the year approaching, it's time to start thinking about the code freeze towards Wine 7.0. My plan is to make one more development release (6.23) two weeks from now, and start the code freeze one week after that, with a 7.0-rc1 release on December 10. We'll then have the usual weekly rc releases, until the final 7.0 sometime in the second half of January. This means that if you have things that you'd like to see in 7.0, you still have 3 weeks to get them upstream... -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH v4 0/7] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang 20 Nov '21

20 Nov '21

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two v3 -> v4: - Fix pointer variable declaration style - Synchronize to prior modified patches. - Refactor the code a bit - Revert to scanf() when parsing Xfer packet lines - Fix indentation - s/buffer_realloc/realloc/g - s/vl_buffer/reply_buffer/g; s/vl_/reply_buffer_/g; s/vlbuf/reply/g - Rewrite reply_buffer_add_uinthex(): convert for loop into while loop - Rewrite reply_buffer_append_xmlstr(): convert for loop into while loop - Split packet_reply_add() into packet_reply_add_data() here - Rewrite packet_reply_add for clarity. - Update Wine version in comment. Jinoh Kang (7): winedbg: Replace packet_realloc() with realloc(). winedbg: Use unsigned int for offset/length in GDB qXfer handler. winedbg: Escape special characters in GDB packet reply. winedbg: Buffer and escape output of GDB qXfer commands. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 621 ++++++++++++++++++++++++++---------- 1 file changed, 456 insertions(+), 165 deletions(-) -- 2.31.1

3 20

[PATCH 1/2] gdi32/tests: Test whether D3DKMTDestroyDCFromMemory() frees the DC memory.
by Zebediah Figura 20 Nov '21

20 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/gdi32/tests/bitmap.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 0293d881fd9..a244414660b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5686,10 +5686,12 @@ static void test_D3DKMTCreateDCFromMemory( void ) { D3DKMT_DESTROYDCFROMMEMORY destroy_desc; D3DKMT_CREATEDCFROMMEMORY create_desc; + MEMORY_BASIC_INFORMATION memory_info; unsigned int width_bytes; unsigned int i, x, y, z; DWORD expected, colour; BYTE data[12][48]; + void *alloc_data; NTSTATUS status; HGDIOBJ *bitmap; DIBSECTION dib; @@ -5939,6 +5941,39 @@ static void test_D3DKMTCreateDCFromMemory( void ) DeleteObject( SelectObject( bmp_dc, bmp ) ); DeleteDC( bmp_dc ); } + + alloc_data = VirtualAlloc( NULL, 4096, MEM_COMMIT, PAGE_READWRITE ); + ok(!!alloc_data, "Failed to allocate memory, error %u.\n", GetLastError()); + + create_desc.pMemory = alloc_data; + create_desc.Format = D3DDDIFMT_A8R8G8B8; + create_desc.Width = 16; + create_desc.Height = 16; + create_desc.Pitch = 16 * 4; + create_desc.hDeviceDc = CreateCompatibleDC( NULL ); + create_desc.pColorTable = NULL; + + status = pD3DKMTCreateDCFromMemory( &create_desc ); + ok(!status, "Got unexpected status %#x.\n", status); + + size = VirtualQuery( alloc_data, &memory_info, sizeof(memory_info) ); + ok(size == sizeof(memory_info), "Got unexpected size %u.\n", size); + ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); + ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); + + destroy_desc.hDc = create_desc.hDc; + destroy_desc.hBitmap = create_desc.hBitmap; + + status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); + ok(!status, "Got unexpected status %#x.\n", status); + + size = VirtualQuery( alloc_data, &memory_info, sizeof(memory_info) ); + ok(size == sizeof(memory_info), "Got unexpected size %u.\n", size); + todo_wine ok(memory_info.State == MEM_COMMIT, "Got state %#x.\n", memory_info.State); + todo_wine ok(memory_info.Protect == PAGE_READWRITE, "Got protection %#x.\n", memory_info.Protect); + + ret = VirtualFree( alloc_data, 0, MEM_RELEASE ); + todo_wine ok(ret, "Failed to free memory, error %u.\n", GetLastError()); } START_TEST(bitmap) -- 2.33.0

1 1

[PATCH 1/3] gdiplus: Add pixel conversions to 4bpp indexed.
by Bernhard Kölbl 19 Nov '21

19 Nov '21

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/gdiplus/image.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ead76fc4b27..862f7fea111 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -726,6 +726,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppGrayScale, setpixel_8bppIndexed); case PixelFormat16bppRGB555: @@ -755,6 +757,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -784,6 +788,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppRGB565, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -813,6 +819,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_16bppARGB1555, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -842,6 +850,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_24bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -871,6 +881,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -900,6 +912,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -928,6 +942,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_32bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -957,6 +973,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_48bppRGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -986,6 +1004,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_64bppARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: @@ -1015,6 +1035,8 @@ GpStatus convert_pixels(INT width, INT height, { case PixelFormat1bppIndexed: convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_1bppIndexed); + case PixelFormat4bppIndexed: + convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_4bppIndexed); case PixelFormat8bppIndexed: convert_rgb_to_indexed(getpixel_64bppPARGB, setpixel_8bppIndexed); case PixelFormat16bppGrayScale: -- 2.33.0

2 4

[PATCH 2/2 v2] msvcp_win: Forward to msvcp140.
by Piotr Caban 19 Nov '21

19 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51415 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp_win/msvcp_win.spec | 6499 ++++++++++++++++----------------- tools/make_specfiles | 4 + 2 files changed, 3253 insertions(+), 3250 deletions(-)

1 0

[PATCH 1/2 v2] msvcp_win: Add stub dll.
by Piotr Caban 19 Nov '21

19 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 + dlls/msvcp_win/Makefile.in | 1 + dlls/msvcp_win/msvcp_win.spec | 3761 +++++++++++++++++++++++++++++++++ 3 files changed, 3763 insertions(+) create mode 100644 dlls/msvcp_win/Makefile.in create mode 100644 dlls/msvcp_win/msvcp_win.spec

1 0

[PATCH 2/2] msvcp_win: Forward to msvcp140.
by Piotr Caban 19 Nov '21

19 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51415 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp_win/msvcp_win.spec | 6500 ++++++++++++++++----------------- tools/make_specfiles | 4 + 2 files changed, 3254 insertions(+), 3250 deletions(-)

2 1

[PATCH 1/2] msvcp_win: Add stub dll.
by Piotr Caban 19 Nov '21

19 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 + dlls/msvcp_win/Makefile.in | 1 + dlls/msvcp_win/msvcp_win.spec | 3761 +++++++++++++++++++++++++++++++++ 3 files changed, 3763 insertions(+) create mode 100644 dlls/msvcp_win/Makefile.in create mode 100644 dlls/msvcp_win/msvcp_win.spec

1 0

[PATCH v4] server: implement vm counters on FreeBSD
by Damjan Jovanovic 19 Nov '21

19 Nov '21

Try 4 hides the duplicate 'struct thread' definition in sys/user.h by redefining 'thread' before inclusion. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/Makefile.in | 2 +- server/process.c | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] d3d10/effect: Parse through value expressions.
by Nikolay Sivov 19 Nov '21

19 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 35 +++++++++++++++++ dlls/d3d10/tests/effect.c | 78 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 7f83fb1182a..b35711b55e5 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -52,6 +52,7 @@ enum d3d10_effect_object_operation D3D10_EOO_CONST_INDEX = 3, D3D10_EOO_VAR_INDEX = 4, D3D10_EOO_INDEX_EXPRESSION = 5, + D3D10_EOO_VALUE_EXPRESSION = 6, D3D10_EOO_ANONYMOUS_SHADER = 7, }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3f35e9cc28a..9c2012768dd 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -289,6 +289,10 @@ struct d3d10_effect_prop_dependency struct d3d10_effect_variable *v; struct d3d10_effect_preshader index; } index_expr; + struct + { + struct d3d10_effect_preshader value; + } value_expr; }; }; @@ -392,6 +396,9 @@ static void d3d10_effect_clear_prop_dependencies(struct d3d10_effect_prop_depend case D3D10_EOO_INDEX_EXPRESSION: d3d10_effect_preshader_clear(&dep->index_expr.index); break; + case D3D10_EOO_VALUE_EXPRESSION: + d3d10_effect_preshader_clear(&dep->value_expr.value); + break; } } heap_free(d->entries); @@ -2632,6 +2639,34 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return d3d10_effect_add_prop_dependency(d, &dep); + case D3D10_EOO_VALUE_EXPRESSION: + + if (value_offset >= data_size || !require_space(value_offset, 1, sizeof(uint16_t), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", value_offset, (long)data_size); + return E_FAIL; + } + + data_ptr = data + value_offset; + read_dword(&data_ptr, &blob_size); + + if (!require_space(value_offset, 1, sizeof(uint16_t) + blob_size, data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", value_offset, (long)data_size); + return E_FAIL; + } + + dep.id = id; + dep.idx = idx; + dep.operation = operation; + if (FAILED(hr = parse_fx10_preshader(data_ptr, blob_size, effect, &dep.value_expr.value))) + { + WARN("Failed to parse preshader, hr %#x.\n", hr); + return hr; + } + + return d3d10_effect_add_prop_dependency(d, &dep); + case D3D10_EOO_ANONYMOUS_SHADER: /* Anonymous shader */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7c2bba6d818..eae0036c0b6 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -7947,6 +7947,83 @@ static void test_effect_index_expression(void) ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +float4 g_var; +float4 g_var2; +technique10 tech +{ + pass p0 + { + SetBlendState( NULL, g_var + 0.1f + g_var2, 0 ); + } + pass p1 + { + SetBlendState( NULL, g_var.x + g_var2 + g_var.y, 0 ); + } +} +#endif +static DWORD fx_test_value_expression[] = +{ + 0x43425844, 0xe517f17c, 0xe44eaede, 0xe4fd1240, 0xc67d5084, 0x00000001, 0x0000047c, 0x00000001, + 0x00000024, 0x30315846, 0x00000450, 0xfeff1001, 0x00000001, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, + 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, + 0x00000010, 0x0000210a, 0x61765f67, 0x5f670072, 0x32726176, 0x63657400, 0x30700068, 0x00016000, + 0x42584400, 0x312ce543, 0xc3ebc897, 0xea47c0a2, 0x8a710323, 0x000001d2, 0x00016000, 0x00000300, + 0x00002c00, 0x0000d400, 0x0000f000, 0x41544300, 0x0000a042, 0x00001c00, 0x00007700, 0x58040000, + 0x00000246, 0x00001c00, 0x00010000, 0x00007400, 0x00004400, 0x00000200, 0x00000100, 0x00004c00, + 0x00000000, 0x00005c00, 0x01000200, 0x00000100, 0x00006400, 0x00000000, 0x765f6700, 0xab007261, + 0x030001ab, 0x04000100, 0x00000100, 0x00000000, 0x765f6700, 0x00327261, 0x030001ab, 0x04000100, + 0x00000100, 0x00000000, 0x00787400, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, + 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, 0x494c43ab, 0x00001434, 0x00000400, + 0xcccccd00, 0x0000003d, 0x00000000, 0x00000000, 0x4c584600, 0x00006843, 0x00000200, 0x40000400, + 0x00000220, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000200, 0x00000400, 0x00000000, + 0x00000700, 0x00000000, 0x40000400, 0x000002a0, 0x00000000, 0x00000100, 0x00000000, 0x00000000, + 0x00000700, 0x00000000, 0x00000000, 0x00000400, 0x00000000, 0xf0f0f000, 0x0f0f0ff0, 0x00ffff0f, + 0x00000100, 0x00000200, 0x00000000, 0x00000100, 0x00000200, 0x00000000, 0x00317000, 0x00000150, + 0x43425844, 0xc6a29e4c, 0x6292ed35, 0xd90bb8cb, 0x50dcd25f, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x000000d4, 0x000000e0, 0x42415443, 0x000000a0, 0x0000001c, 0x00000077, 0x46580400, + 0x00000002, 0x0000001c, 0x00000100, 0x00000074, 0x00000044, 0x00000002, 0x00000001, 0x0000004c, + 0x00000000, 0x0000005c, 0x00010002, 0x00000001, 0x00000064, 0x00000000, 0x61765f67, 0xabab0072, + 0x00030001, 0x00040001, 0x00000001, 0x00000000, 0x61765f67, 0xab003272, 0x00030001, 0x00040001, + 0x00000001, 0x00000000, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x34494c43, 0x00000004, 0x00000000, + 0x434c5846, 0x00000068, 0x00000002, 0xa0400004, 0x00000002, 0x00000000, 0x00000002, 0x00000000, + 0x00000000, 0x00000002, 0x00000004, 0x00000000, 0x00000007, 0x00000000, 0xa0400004, 0x00000002, + 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000004, + 0x00000000, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, 0x00000001, 0x00000002, 0x00000000, 0x00000001, + 0x00000002, 0x00000000, 0x00000004, 0x00000020, 0x00000000, 0x00000002, 0xffffffff, 0x00000000, + 0x00000030, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000036, + 0x00000014, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x0000003d, 0x00000002, + 0x00000000, 0x00000042, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x00000045, + 0x0000000b, 0x00000000, 0x00000001, 0x000001a9, 0x00000002, 0x00000000, 0x00000001, 0x000001b5, + 0x000001c1, 0x00000003, 0x00000000, 0x0000000a, 0x00000000, 0x00000006, 0x000001c4, 0x0000000b, + 0x00000000, 0x00000001, 0x00000318, 0x00000002, 0x00000000, 0x00000001, 0x00000324, +}; + +static void test_effect_value_expression(void) +{ + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_value_expression, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -7972,4 +8049,5 @@ START_TEST(effect) test_effect_raw_value(); test_effect_dynamic_numeric_field(); test_effect_index_expression(); + test_effect_value_expression(); } -- 2.33.0

2 9

[PATCH] wined3d: Add WINED3DFMT_R16_FLOAT vertex format.
by Henri Verbeet 19 Nov '21

19 Nov '21

From: Andrey Gusev <andrey.goosev(a)gmail.com> Fixes rendering glitches in Batman: Arkham Knight. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Just require ARB_half_float_vertex. Upload conversion is not actually implemented for R16_FLOAT. However, the format can't be used by d3d9 and earlier, and GL implementations lacking ARB_half_float_vertex or equivalent are unlikely to work well with d3d10+, so not much could be gained by implementing it. - Add a test_format_support() test, as well as d3d10 tests. dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/wined3d/utils.c | 1 + 3 files changed, 5 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 73151f2296c..a4729f9d2d3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12373,6 +12373,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R8_UINT, @@ -13648,6 +13649,7 @@ static void test_format_support(void) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT}, + {DXGI_FORMAT_R16_FLOAT}, }; if (!(device = create_device())) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 140e7cc195c..53087684acf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18552,6 +18552,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R8G8_UNORM, @@ -20622,6 +20623,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; device_desc.feature_level = &feature_level; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b0d7cc6eba..b7afa721587 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -727,6 +727,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, {WINED3DFMT_R8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_BYTE}, + {WINED3DFMT_R16_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16_SINT, WINED3D_FFP_EMIT_INVALID, GL_SHORT}, {WINED3DFMT_R32_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT}, -- 2.30.2

2 1

[PATCH v4 01/12] jscript: Try to_primitive first when getting the default value.
by Gabriel Ivăncescu 19 Nov '21

19 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 9 +++++++-- dlls/jscript/tests/run.c | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..cc46ee0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1548,7 +1548,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc V_VT(pvarRes) = VT_EMPTY; prop = get_prop(This, id); - if(!prop || prop->type == PROP_DELETED) { + if((!prop || prop->type == PROP_DELETED) && (id != DISPID_VALUE || wFlags != DISPATCH_PROPERTYGET)) { TRACE("invalid id\n"); return DISP_E_MEMBERNOTFOUND; } @@ -1580,7 +1580,12 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYGET: { jsval_t r; - hres = prop_get(This, prop, &r); + hres = E_FAIL; + if(id == DISPID_VALUE) + hres = to_primitive(This->ctx, jsval_obj(This), &r, NO_HINT); + if(FAILED(hres)) + hres = prop_get(This, prop, &r); + if(SUCCEEDED(hres)) { hres = jsval_to_variant(r, pvarRes); jsval_release(r); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ef0f39f..c71e550 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2789,6 +2789,7 @@ static void test_retval(void) static void test_default_value(void) { + IActiveScript *script; DISPPARAMS dp = {0}; IDispatch *disp; VARIANT v; @@ -2806,9 +2807,49 @@ static void test_default_value(void) { ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); } + VariantClear(&v); + IDispatch_Release(disp); + + hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr.valueOf = function() {return 42;}; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"foo"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var arr = [5]; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"5"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IDispatch_Release(disp); + close_script(script); } static void test_script_exprs(void) -- 2.31.1

3 25

[PATCH] d3d10/effect: Fix a trace message.
by Nikolay Sivov 19 Nov '21

19 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 74ee4bf468c..a336d136609 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -4149,7 +4149,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB if ((v = d3d10_effect_get_variable_by_index(effect, index))) { - TRACE("Returning %svariable %s.\n", is_var_shared(v) ? "shared " : NULL, debugstr_a(v->name)); + TRACE("Returning %svariable %s.\n", is_var_shared(v) ? "shared " : "", debugstr_a(v->name)); return &v->ID3D10EffectVariable_iface; } -- 2.33.0

3 2

[PATCH v2 1/6] wined3d: Add a helper to calculate the vertex attribute address for a stream element.
by Zebediah Figura 19 Nov '21

19 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 58 +++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f7d4d9e8cb3..cec698d7a6b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5067,6 +5067,12 @@ void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *conte } } +static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_element *element, + const struct wined3d_state *state) +{ + return element->data.addr + state->load_base_vertex_index * element->stride; +} + void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) { @@ -5110,7 +5116,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context /* The coords to supply depend completely on the fvf/vertex shader. */ format_gl = wined3d_format_gl(e->format); gl_info->gl_ops.gl.p_glTexCoordPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + get_vertex_attrib_pointer(e, state)); gl_info->gl_ops.gl.p_glEnableClientState(GL_TEXTURE_COORD_ARRAY); state->streams[e->stream_idx].buffer->bo_user.valid = true; } @@ -5154,6 +5160,7 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; GLuint current_bo, bo; + const void *offset; TRACE("context_gl %p, si %p, state %p.\n", context_gl, si, state); @@ -5184,6 +5191,7 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte { e = &si->elements[WINED3D_FFP_POSITION]; format_gl = wined3d_format_gl(e->format); + offset = get_vertex_attrib_pointer(e, state); bo = wined3d_bo_gl_id(e->data.buffer_object); if (current_bo != bo) @@ -5193,11 +5201,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte current_bo = bo; } - TRACE("glVertexPointer(%#x, %#x, %#x, %p);\n", - format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glVertexPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + TRACE("glVertexPointer(%#x, %#x, %#x, %p);\n", format_gl->vtx_format, format_gl->vtx_type, e->stride, offset); + gl_info->gl_ops.gl.p_glVertexPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, offset); checkGLcall("glVertexPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_VERTEX_ARRAY); checkGLcall("glEnableClientState(GL_VERTEX_ARRAY)"); @@ -5209,6 +5214,7 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte { e = &si->elements[WINED3D_FFP_NORMAL]; format_gl = wined3d_format_gl(e->format); + offset = get_vertex_attrib_pointer(e, state); bo = wined3d_bo_gl_id(e->data.buffer_object); if (current_bo != bo) @@ -5218,10 +5224,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte current_bo = bo; } - TRACE("glNormalPointer(%#x, %#x, %p);\n", format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glNormalPointer(format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + TRACE("glNormalPointer(%#x, %#x, %p);\n", format_gl->vtx_type, e->stride, offset); + gl_info->gl_ops.gl.p_glNormalPointer(format_gl->vtx_type, e->stride, offset); checkGLcall("glNormalPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_NORMAL_ARRAY); checkGLcall("glEnableClientState(GL_NORMAL_ARRAY)"); @@ -5238,6 +5242,7 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte { e = &si->elements[WINED3D_FFP_DIFFUSE]; format_gl = wined3d_format_gl(e->format); + offset = get_vertex_attrib_pointer(e, state); bo = wined3d_bo_gl_id(e->data.buffer_object); if (current_bo != bo) @@ -5248,10 +5253,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte } TRACE("glColorPointer(%#x, %#x %#x, %p);\n", - format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glColorPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + format_gl->vtx_format, format_gl->vtx_type, e->stride, offset); + gl_info->gl_ops.gl.p_glColorPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, offset); checkGLcall("glColorPointer(4, GL_UNSIGNED_BYTE, ...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_COLOR_ARRAY); checkGLcall("glEnableClientState(GL_COLOR_ARRAY)"); @@ -5269,6 +5272,7 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte TRACE("Setting specular colour.\n"); e = &si->elements[WINED3D_FFP_SPECULAR]; + offset = get_vertex_attrib_pointer(e, state); if (gl_info->supported[EXT_SECONDARY_COLOR]) { @@ -5294,10 +5298,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte * vertex pipeline can pass the specular alpha through, and pixel shaders can read it. So it GL accepts * 4 component secondary colors use it */ - TRACE("glSecondaryColorPointer(%#x, %#x, %#x, %p);\n", format, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - GL_EXTCALL(glSecondaryColorPointerEXT(format, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); + TRACE("glSecondaryColorPointer(%#x, %#x, %#x, %p);\n", format, type, e->stride, offset); + GL_EXTCALL(glSecondaryColorPointerEXT(format, type, e->stride, offset)); checkGLcall("glSecondaryColorPointerEXT(format, type, ...)"); } else @@ -5305,20 +5307,16 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte switch (type) { case GL_UNSIGNED_BYTE: - TRACE("glSecondaryColorPointer(3, GL_UNSIGNED_BYTE, %#x, %p);\n", e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - GL_EXTCALL(glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); + TRACE("glSecondaryColorPointer(3, GL_UNSIGNED_BYTE, %#x, %p);\n", e->stride, offset); + GL_EXTCALL(glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, e->stride, offset)); checkGLcall("glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, ...)"); break; default: FIXME("Add 4 component specular colour pointers for type %#x.\n", type); /* Make sure that the right colour component is dropped. */ - TRACE("glSecondaryColorPointer(3, %#x, %#x, %p);\n", type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - GL_EXTCALL(glSecondaryColorPointerEXT(3, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); + TRACE("glSecondaryColorPointer(3, %#x, %#x, %p);\n", type, e->stride, offset); + GL_EXTCALL(glSecondaryColorPointerEXT(3, type, e->stride, offset)); checkGLcall("glSecondaryColorPointerEXT(3, type, ...)"); } } @@ -5388,6 +5386,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c for (i = 0; i < MAX_ATTRIBS; ++i) { const struct wined3d_stream_info_element *element = &stream_info->elements[i]; + const void *offset = get_vertex_attrib_pointer(element, state); const struct wined3d_stream_state *stream; const struct wined3d_format_gl *format_gl; @@ -5460,14 +5459,13 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c * won't be load converted attributes anyway. */ if (vs && vs->reg_maps.shader_version.major >= 4 && (format_flags & WINED3DFMT_FLAG_INTEGER)) { - GL_EXTCALL(glVertexAttribIPointer(i, format_gl->vtx_format, format_gl->vtx_type, - element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); + GL_EXTCALL(glVertexAttribIPointer(i, format_gl->vtx_format, + format_gl->vtx_type, element->stride, offset)); } else { GL_EXTCALL(glVertexAttribPointer(i, format_gl->vtx_format, format_gl->vtx_type, - !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, - element->data.addr + state->load_base_vertex_index * element->stride)); + !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, offset)); } if (!(context->numbered_array_mask & (1u << i))) -- 2.33.0

2 11

[PATCH vkd3d v4 2/4] vkd3d-shader/hlsl: Take writemask into account when emitting a SM4 constant.
by Matteo Bruni 19 Nov '21

19 Nov '21

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v4: Respun to apply properly on top of Francisco's patch 219568. libs/vkd3d-shader/hlsl_sm4.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 49ea0402..2a9c2d18 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1162,7 +1162,7 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, { const unsigned int dimx = constant->node.data_type->dimx; struct sm4_instruction instr; - unsigned int i; + struct sm4_register *reg = &instr.srcs[0].reg; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; @@ -1170,12 +1170,24 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, &constant->node); instr.dst_count = 1; - instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; - instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; instr.srcs[0].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + reg->type = VKD3D_SM4_RT_IMMCONST; + if (dimx == 1) + { + reg->dim = VKD3D_SM4_DIMENSION_SCALAR; + reg->immconst_uint[0] = constant->value[0].u; + } + else + { + unsigned int i, j = 0; - for (i = 0; i < dimx; ++i) - instr.srcs[0].reg.immconst_uint[i] = constant->value[i].u; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; + for (i = 0; i < 4; ++i) + { + if (instr.dsts[0].writemask & (1u << i)) + reg->immconst_uint[i] = constant->value[j++].u; + } + } instr.src_count = 1, write_sm4_instruction(buffer, &instr); -- 2.26.3

2 1

[PATCH vkd3d v3 1/4] vkd3d-shader/hlsl: Write the else block only if it isn't empty.
by Giovanni Mascellani 19 Nov '21

19 Nov '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index e597425a..c56a74d4 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1446,11 +1446,14 @@ static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf write_sm4_block(ctx, buffer, &iff->then_instrs); - instr.opcode = VKD3D_SM4_OP_ELSE; - instr.src_count = 0; - write_sm4_instruction(buffer, &instr); + if (!list_empty(&iff->else_instrs.instrs)) + { + instr.opcode = VKD3D_SM4_OP_ELSE; + instr.src_count = 0; + write_sm4_instruction(buffer, &instr); - write_sm4_block(ctx, buffer, &iff->else_instrs); + write_sm4_block(ctx, buffer, &iff->else_instrs); + } instr.opcode = VKD3D_SM4_OP_ENDIF; write_sm4_instruction(buffer, &instr); -- 2.33.1

4 11

[PATCH vkd3d v3] vkd3d-shader/hlsl: Explicitly specify the swizzle type for sm4 source registers.
by Francisco Casas 19 Nov '21

19 Nov '21

Some register types do not use a consistent swizzle type, so the sm4_swizzle_type() function is removed. The swizzle type now must be specified using the swizzle_type field. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 96 ++++++++++++++++---------------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index eae96232..ecf2121e 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -762,7 +762,7 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, bool output, D3D_NAME *usage); bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, bool *has_idx); + bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx); int hlsl_sm4_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out); int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..d6436464 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1082,7 +1082,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var "Invalid semantic '%s'.", var->semantic.name); return; } - if ((builtin = hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, &has_idx))) + if ((builtin = hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, NULL, &has_idx))) reg = has_idx ? var->semantic.index : 0; } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index e597425a..e857a681 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -26,7 +26,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_block *block); bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semantic *semantic, - bool output, enum vkd3d_sm4_register_type *type, bool *has_idx) + bool output, enum vkd3d_sm4_register_type *type, enum vkd3d_sm4_swizzle_type *swizzle_type, bool *has_idx) { unsigned int i; @@ -36,19 +36,20 @@ bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_sem bool output; enum vkd3d_shader_type shader_type; enum vkd3d_sm4_register_type type; + enum vkd3d_sm4_swizzle_type swizzle_type; bool has_idx; } register_table[] = { - {"sv_primitiveid", false, VKD3D_SHADER_TYPE_GEOMETRY, VKD3D_SM4_RT_PRIMID, false}, + {"sv_primitiveid", false, VKD3D_SHADER_TYPE_GEOMETRY, VKD3D_SM4_RT_PRIMID, VKD3D_SM4_SWIZZLE_NONE, false}, /* Put sv_target in this table, instead of letting it fall through to * default varying allocation, so that the register index matches the * usage index. */ - {"color", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_OUTPUT, true}, - {"depth", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_DEPTHOUT, false}, - {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_DEPTHOUT, false}, - {"sv_target", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_OUTPUT, true}, + {"color", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_OUTPUT, VKD3D_SM4_SWIZZLE_VEC4, true}, + {"depth", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_DEPTHOUT, VKD3D_SM4_SWIZZLE_VEC4, false}, + {"sv_depth", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_DEPTHOUT, VKD3D_SM4_SWIZZLE_VEC4, false}, + {"sv_target", true, VKD3D_SHADER_TYPE_PIXEL, VKD3D_SM4_RT_OUTPUT, VKD3D_SM4_SWIZZLE_VEC4, true}, }; for (i = 0; i < ARRAY_SIZE(register_table); ++i) @@ -58,6 +59,8 @@ bool hlsl_sm4_register_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_sem && ctx->profile->type == register_table[i].shader_type) { *type = register_table[i].type; + if (swizzle_type) + *swizzle_type = register_table[i].swizzle_type; *has_idx = register_table[i].has_idx; return true; } @@ -148,7 +151,7 @@ static void write_sm4_signature(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, assert(ret); usage_idx = var->semantic.index; - if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, &has_idx)) + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &type, NULL, &has_idx)) { reg_idx = has_idx ? var->semantic.index : ~0u; } @@ -748,6 +751,7 @@ struct sm4_instruction struct { struct sm4_register reg; + enum vkd3d_sm4_swizzle_type swizzle_type; unsigned int swizzle; } srcs[2]; unsigned int src_count; @@ -756,27 +760,9 @@ struct sm4_instruction unsigned int idx_count; }; -static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) -{ - switch (type) - { - case VKD3D_SM4_RT_IMMCONST: - return VKD3D_SM4_SWIZZLE_NONE; - - case VKD3D_SM4_RT_CONSTBUFFER: - case VKD3D_SM4_RT_INPUT: - case VKD3D_SM4_RT_RESOURCE: - case VKD3D_SM4_RT_TEMP: - return VKD3D_SM4_SWIZZLE_VEC4; - - default: - FIXME("Unhandled register type %#x.\n", type); - return VKD3D_SM4_SWIZZLE_VEC4; - } -} - static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *reg, - unsigned int *writemask, const struct hlsl_deref *deref, const struct hlsl_type *data_type) + unsigned int *writemask, enum vkd3d_sm4_swizzle_type *swizzle_type, + const struct hlsl_deref *deref, const struct hlsl_type *data_type) { const struct hlsl_ir_var *var = deref->var; @@ -797,6 +783,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r assert(data_type->type <= HLSL_CLASS_VECTOR); reg->type = VKD3D_SM4_RT_CONSTBUFFER; reg->dim = VKD3D_SM4_DIMENSION_VEC4; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; reg->idx[0] = var->buffer->reg.id; reg->idx[1] = offset / 4; reg->idx_count = 2; @@ -807,7 +795,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r { bool has_idx; - if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, &has_idx)) + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, false, &reg->type, swizzle_type, &has_idx)) { if (has_idx) { @@ -825,6 +813,8 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_INPUT; reg->dim = VKD3D_SM4_DIMENSION_VEC4; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; reg->idx[0] = hlsl_reg.id; reg->idx_count = 1; *writemask = hlsl_reg.writemask; @@ -834,7 +824,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r { bool has_idx; - if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, &has_idx)) + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, true, &reg->type, swizzle_type, &has_idx)) { if (has_idx) { @@ -867,17 +857,22 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r assert(hlsl_reg.allocated); reg->type = VKD3D_SM4_RT_TEMP; reg->dim = VKD3D_SM4_DIMENSION_VEC4; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; reg->idx[0] = hlsl_reg.id; reg->idx_count = 1; *writemask = hlsl_reg.writemask; } } -static void sm4_register_from_node(struct sm4_register *reg, unsigned int *writemask, const struct hlsl_ir_node *instr) +static void sm4_register_from_node(struct sm4_register *reg, unsigned int *writemask, + enum vkd3d_sm4_swizzle_type *swizzle_type, const struct hlsl_ir_node *instr) { assert(instr->reg.allocated); reg->type = VKD3D_SM4_RT_TEMP; reg->dim = VKD3D_SM4_DIMENSION_VEC4; + if (swizzle_type) + *swizzle_type = VKD3D_SM4_SWIZZLE_VEC4; reg->idx[0] = instr->reg.id; reg->idx_count = 1; *writemask = instr->reg.writemask; @@ -929,7 +924,7 @@ static void write_sm4_instruction(struct vkd3d_bytecode_buffer *buffer, const st for (i = 0; i < instr->src_count; ++i) { token = sm4_encode_register(&instr->srcs[i].reg); - token |= sm4_swizzle_type(instr->srcs[i].reg.type) << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; + token |= (uint32_t)instr->srcs[i].swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= instr->srcs[i].swizzle << VKD3D_SM4_SWIZZLE_SHIFT; if (instr->srcs[i].reg.mod) token |= VKD3D_SM4_EXTENDED_OPERAND; @@ -968,6 +963,7 @@ static void write_sm4_dcl_constant_buffer(struct vkd3d_bytecode_buffer *buffer, .srcs[0].reg.type = VKD3D_SM4_RT_CONSTBUFFER, .srcs[0].reg.idx = {cbuffer->reg.id, (cbuffer->used_size + 3) / 4}, .srcs[0].reg.idx_count = 2, + .srcs[0].swizzle_type = VKD3D_SM4_SWIZZLE_VEC4, .srcs[0].swizzle = HLSL_SWIZZLE(X, Y, Z, W), .src_count = 1, }; @@ -1019,7 +1015,7 @@ static void write_sm4_dcl_semantic(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b .dst_count = 1, }; - if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &instr.dsts[0].reg.type, &has_idx)) + if (hlsl_sm4_register_from_semantic(ctx, &var->semantic, output, &instr.dsts[0].reg.type, NULL, &has_idx)) { if (has_idx) { @@ -1129,10 +1125,10 @@ static void write_sm4_unary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_ memset(&instr, 0, sizeof(instr)); instr.opcode = opcode; - sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst); + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, src); + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, src); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.srcs[0].reg.mod = src_mod; instr.src_count = 1; @@ -1149,12 +1145,12 @@ static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d memset(&instr, 0, sizeof(instr)); instr.opcode = opcode; - sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst); + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, src1); + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, src1); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); - sm4_register_from_node(&instr.srcs[1].reg, &writemask, src2); + sm4_register_from_node(&instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, src2); instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.src_count = 2; @@ -1171,11 +1167,13 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &constant->node); + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, &constant->node); instr.dst_count = 1; instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; + instr.srcs[0].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + for (i = 0; i < dimx; ++i) instr.srcs[0].reg.immconst_uint[i] = constant->value[i].u; instr.src_count = 1, @@ -1193,10 +1191,10 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_LD; - sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst); + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, dst); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, coords); + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, coords); instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); /* Mipmap level is in the last component in the IR, but needs to be in the W @@ -1219,7 +1217,8 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf assert(0); } - sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, resource, resource_type); + sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, + resource, resource_type); instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.src_count = 2; @@ -1440,7 +1439,7 @@ static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf assert(iff->condition.node->data_type->dimx == 1); - sm4_register_from_node(&instr.srcs[0].reg, &writemask, iff->condition.node); + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, iff->condition.node); instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); write_sm4_instruction(buffer, &instr); @@ -1465,10 +1464,11 @@ static void write_sm4_load(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &load->node); + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, &load->node); instr.dst_count = 1; - sm4_register_from_deref(ctx, &instr.srcs[0].reg, &writemask, &load->src, load->node.data_type); + sm4_register_from_deref(ctx, &instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, + &load->src, load->node.data_type); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.src_count = 1; @@ -1531,11 +1531,11 @@ static void write_sm4_store(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_deref(ctx, &instr.dsts[0].reg, &writemask, &store->lhs, rhs->data_type); + sm4_register_from_deref(ctx, &instr.dsts[0].reg, &writemask, NULL, &store->lhs, rhs->data_type); instr.dsts[0].writemask = hlsl_combine_writemasks(writemask, store->writemask); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, rhs); + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, rhs); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); instr.src_count = 1; @@ -1551,10 +1551,10 @@ static void write_sm4_swizzle(struct hlsl_ctx *ctx, memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_MOV; - sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, &swizzle->node); + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, NULL, &swizzle->node); instr.dst_count = 1; - sm4_register_from_node(&instr.srcs[0].reg, &writemask, swizzle->val.node); + sm4_register_from_node(&instr.srcs[0].reg, &writemask, &instr.srcs[0].swizzle_type, swizzle->val.node); instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_combine_swizzles(hlsl_swizzle_from_writemask(writemask), swizzle->swizzle, swizzle->node.data_type->dimx), instr.dsts[0].writemask); instr.src_count = 1; -- 2.25.1

7 6

[PATCH 1/2] msvcp140: Fix _Winerror_message test failures.
by Piotr Caban 19 Nov '21

19 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 1

[PATCH] ucrtbase: Fix fma test failures.
by Piotr Caban 19 Nov '21

19 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 1

[PATCH] comctl32: Add semi-stub for ImageList_WriteEx.
by Dmitry Timoshkov 19 Nov '21

19 Nov '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/imagelist.c | 8 ++++++++ include/commctrl.h | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index e3b889b9bd3..73f25906205 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -188,6 +188,7 @@ @ stdcall ImageList_SetImageCount(ptr long) @ stdcall ImageList_SetOverlayImage(ptr long long) @ stdcall ImageList_Write(ptr ptr) +@ stdcall ImageList_WriteEx(ptr long ptr) @ stdcall InitCommonControlsEx(ptr) @ stdcall InitMUILanguage(long) @ stdcall InitializeFlatSB(long) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 307ccc0336c..8da8beec1e0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3058,6 +3058,14 @@ failed: return result; } +/************************************************************************* + * ImageList_WriteEx [COMCTL32.@] + */ +BOOL WINAPI ImageList_WriteEx(HIMAGELIST himl, DWORD flags, IStream *pstm) +{ + FIXME("%p %08x %p: semi-stub\n", himl, flags, pstm); + return ImageList_Write(himl, pstm); +} /************************************************************************* * ImageList_Write [COMCTL32.@] diff --git a/include/commctrl.h b/include/commctrl.h index 41abceb0138..025eb328c32 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -601,7 +601,8 @@ BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT); #ifdef __IStream_INTERFACE_DEFINED__ HIMAGELIST WINAPI ImageList_Read(LPSTREAM); -BOOL WINAPI ImageList_Write(HIMAGELIST, LPSTREAM); +BOOL WINAPI ImageList_Write(HIMAGELIST,IStream*); +BOOL WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*); #endif #define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon) -- 2.33.1

1 0

[PATCH v4] kernel32/tests: Add SetCurrentConsoleFontEx tests for the current window size
by Hugh McMaster 19 Nov '21

19 Nov '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v4: - Use CP_ACP code page due to Wine bug detecting DBCS. - Remove todo_wine. - Add extra tests. dlls/kernel32/tests/console.c | 271 +++++++++++++++++++++++++++++++++- 1 file changed, 269 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..ad98d9a7fbb 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,10 +3554,17 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + unsigned int cp, font_family; + WCHAR face_name[] = L"Courier New"; + + font_family = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + + /* Save current console font information */ + cp = GetConsoleOutputCP(); orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3651,17 +3658,277 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + SetConsoleOutputCP(CP_ACP); + + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + cfix.FontFamily = font_family; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, face_name); + + tmp.cbSize = sizeof(tmp); + + /* Courier New is available in the console by default from Windows 10 build 1607 */ + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + if (lstrcmpW(tmp.FaceName, face_name)) + { + SetConsoleOutputCP(cp); + skip("%s not available. Skipping SetCurrentConsoleFontEx tests.\n", wine_dbgstr_w(face_name)); + return; + } + + /* Test font size 8x16 */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20 */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 20; + SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 5x12. We pass in 10x12. */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 12; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20. We pass in 0x20. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 20; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 10, "got %u, expected font width of 10\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 20, "got %u, expected font height of 20\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test invalid font size 7x0 */ + cfix = tmp; + cfix.dwFontSize.X = 7; + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 13x24 */ + cfix.dwFontSize.X = 13; + cfix.dwFontSize.Y = 24; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 0x0 */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Reset to font size 8x16 */ + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font weight */ + cfix.FontWeight = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.Y); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with invalid font face name */ + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"MissingFont"); + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font face name */ + cfix.FaceName[0] = 0; + + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + + ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + /* Restore original console font parameters */ + SetConsoleOutputCP(cp); + SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); -- 2.33.1

2 1

[PATCH 1/2] win32u: Guard font unused_entry against race condition.
by Rémi Bernon 19 Nov '21

19 Nov '21

There is a race condition otherwise between release_gdi_font and find_cached_gdi_font, leading to invalid memory access: One thread calling release_gdi_font may decrement refcount to 0, then try to enter font_lock. At the same time, another thread may be calling find_cached_gdi_font through select_font, holding the font_lock. This second thread would find refcount set to 0, and then try to remove unused_entry from its list, although it hasn't been added yet to the unused list. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The crash can be easily reproduced by running a simple program which only creates a window then exits, in a loop, shutting down the prefix every time. It randomly causes a segmentation fault. For some reason, this race condition is only present after fd675485be8686ec5e3b4667d3f3e9739a4a07ce, possibly because of the regression described in next patch. dlls/win32u/font.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index d2f61526540..f9a0359e92c 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -2576,22 +2576,24 @@ static struct gdi_font *find_cached_gdi_font( const LOGFONTW *lf, const FMAT2 *m static void release_gdi_font( struct gdi_font *font ) { if (!font) return; - if (--font->refcount) return; TRACE( "font %p\n", font ); /* add it to the unused list */ pthread_mutex_lock( &font_lock ); - list_add_head( &unused_gdi_font_list, &font->unused_entry ); - if (unused_font_count > UNUSED_CACHE_SIZE) + if (!--font->refcount) { - font = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct gdi_font, unused_entry ); - TRACE( "freeing %p\n", font ); - list_remove( &font->entry ); - list_remove( &font->unused_entry ); - free_gdi_font( font ); + list_add_head( &unused_gdi_font_list, &font->unused_entry ); + if (unused_font_count > UNUSED_CACHE_SIZE) + { + font = LIST_ENTRY( list_tail( &unused_gdi_font_list ), struct gdi_font, unused_entry ); + TRACE( "freeing %p\n", font ); + list_remove( &font->entry ); + list_remove( &font->unused_entry ); + free_gdi_font( font ); + } + else unused_font_count++; } - else unused_font_count++; pthread_mutex_unlock( &font_lock ); } -- 2.33.1

3 5

[PATCH 2/2] user32: Move register_builtin_classes call to GetDesktopWindow.
by Jacek Caban 19 Nov '21

19 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- If graphics driver is loaded without using lazy loader, register_builtin_classes may be skipped. This may happen for example in explorer process. dlls/user32/driver.c | 1 - dlls/user32/win.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] msvcrt: Skip small-block heap tests if _set_sbh_threshold is not available.
by Piotr Caban 19 Nov '21

19 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49181 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/heap.c | 41 +++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-)

1 0

[PATCH 1/2] user32: Don't load cursor inside user lock in register_builtin.
by Jacek Caban 19 Nov '21

19 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- With the next patch, LoadCursor in register_builtin may trigger waiting for graphics driver, which is not possible inside the lock. dlls/user32/class.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[PATCH 2/2] msvcp140: Fix _Winerror_map test failures.
by Piotr Caban 19 Nov '21

19 Nov '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/tests/msvcp140.c | 5 +++-- dlls/msvcp90/misc.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[PATCH 1/4] dinput8/tests: Add tests for device managed effect creation.
by Rémi Bernon 19 Nov '21

19 Nov '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 587 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 587 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 9e21ccdb713..564ae7335e8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8029,6 +8029,591 @@ done: winetest_pop_context(); } +static void test_device_managed_effect(void) +{ +#include "psh_hid_macros.h" + const unsigned char report_descriptor[] = { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Report), + REPORT_ID(1, 1), + + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + USAGE(1, HID_USAGE_GENERIC_Z), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 3), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 2), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + REPORT_COUNT(1, 6), + INPUT(1, Cnst|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_PID), + USAGE(1, PID_USAGE_STATE_REPORT), + COLLECTION(1, Report), + REPORT_ID(1, 2), + + USAGE(1, PID_USAGE_DEVICE_PAUSED), + USAGE(1, PID_USAGE_ACTUATORS_ENABLED), + USAGE(1, PID_USAGE_SAFETY_SWITCH), + USAGE(1, PID_USAGE_ACTUATOR_OVERRIDE_SWITCH), + USAGE(1, PID_USAGE_ACTUATOR_POWER), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 5), + INPUT(1, Data|Var|Abs), + REPORT_COUNT(1, 3), + INPUT(1, Cnst|Var|Abs), + + USAGE(1, PID_USAGE_EFFECT_PLAYING), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MAXIMUM(1, 0x7f), + LOGICAL_MINIMUM(1, 0x00), + REPORT_SIZE(1, 7), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE_PAGE(1, HID_USAGE_PAGE_PID), + USAGE(1, PID_USAGE_DEVICE_CONTROL_REPORT), + COLLECTION(1, Report), + REPORT_ID(1, 1), + + USAGE(1, PID_USAGE_DEVICE_CONTROL), + COLLECTION(1, Logical), + USAGE(1, PID_USAGE_DC_DEVICE_RESET), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 2), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 2), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Ary|Abs), + END_COLLECTION, + END_COLLECTION, + + USAGE(1, PID_USAGE_EFFECT_OPERATION_REPORT), + COLLECTION(1, Report), + REPORT_ID(1, 2), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_EFFECT_OPERATION), + COLLECTION(1, NamedArray), + USAGE(1, PID_USAGE_OP_EFFECT_START), + USAGE(1, PID_USAGE_OP_EFFECT_START_SOLO), + USAGE(1, PID_USAGE_OP_EFFECT_STOP), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 3), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 3), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Ary|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_LOOP_COUNT), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_SET_EFFECT_REPORT), + COLLECTION(1, Report), + REPORT_ID(1, 3), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_EFFECT_TYPE), + COLLECTION(1, NamedArray), + USAGE(1, PID_USAGE_ET_SQUARE), + USAGE(1, PID_USAGE_ET_SINE), + USAGE(1, PID_USAGE_ET_SPRING), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 3), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 3), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Ary|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_AXES_ENABLE), + COLLECTION(1, Logical), + USAGE(4, (HID_USAGE_PAGE_GENERIC << 16)|HID_USAGE_GENERIC_X), + USAGE(4, (HID_USAGE_PAGE_GENERIC << 16)|HID_USAGE_GENERIC_Y), + USAGE(4, (HID_USAGE_PAGE_GENERIC << 16)|HID_USAGE_GENERIC_Z), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 3), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + USAGE(1, PID_USAGE_DIRECTION_ENABLE), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + REPORT_COUNT(1, 4), + OUTPUT(1, Cnst|Var|Abs), + + USAGE(1, PID_USAGE_DURATION), + USAGE(1, PID_USAGE_START_DELAY), + UNIT(2, 0x1003), /* Eng Lin:Time */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x7fff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + UNIT(1, 0), + UNIT_EXPONENT(1, 0), + + USAGE(1, PID_USAGE_TRIGGER_BUTTON), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 0x08), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 0x08), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_DIRECTION), + COLLECTION(1, Logical), + USAGE(4, (HID_USAGE_PAGE_ORDINAL << 16)|1), + USAGE(4, (HID_USAGE_PAGE_ORDINAL << 16)|2), + UNIT(1, 0x14), /* Eng Rot:Angular Pos */ + UNIT_EXPONENT(1, -2), /* 10^-2 */ + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(4, 0x00008ca0), + UNIT(1, 0), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + UNIT_EXPONENT(1, 0), + UNIT(1, 0), + END_COLLECTION, + END_COLLECTION, + + USAGE(1, PID_USAGE_SET_CONDITION_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 7), + + USAGE(1, PID_USAGE_TYPE_SPECIFIC_BLOCK_OFFSET), + COLLECTION(1, Logical), + USAGE(4, (HID_USAGE_PAGE_ORDINAL << 16)|1), + USAGE(4, (HID_USAGE_PAGE_ORDINAL << 16)|2), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 2), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 1), + OUTPUT(1, Cnst|Var|Abs), + + USAGE(1, PID_USAGE_CP_OFFSET), + LOGICAL_MINIMUM(1, 0x80), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(2, 0xd8f0), + PHYSICAL_MAXIMUM(2, 0x2710), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_POSITIVE_COEFFICIENT), + USAGE(1, PID_USAGE_NEGATIVE_COEFFICIENT), + LOGICAL_MINIMUM(1, 0x80), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(2, 0xd8f0), + PHYSICAL_MAXIMUM(2, 0x2710), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_POSITIVE_SATURATION), + USAGE(1, PID_USAGE_NEGATIVE_SATURATION), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x2710), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_DEAD_BAND), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x2710), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_CREATE_NEW_EFFECT_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 9), + + USAGE(1, PID_USAGE_EFFECT_TYPE), + COLLECTION(1, NamedArray), + USAGE(1, PID_USAGE_ET_SQUARE), + USAGE(1, PID_USAGE_ET_SINE), + USAGE(1, PID_USAGE_ET_SPRING), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 3), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 3), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Ary|Abs), + END_COLLECTION, + END_COLLECTION, + + USAGE(1, PID_USAGE_BLOCK_LOAD_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 10), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_BLOCK_LOAD_STATUS), + COLLECTION(1, NamedArray), + USAGE(1, PID_USAGE_BLOCK_LOAD_SUCCESS), + USAGE(1, PID_USAGE_BLOCK_LOAD_FULL), + USAGE(1, PID_USAGE_BLOCK_LOAD_ERROR), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 3), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 3), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + FEATURE(1, Data|Ary|Abs), + END_COLLECTION, + END_COLLECTION, + + USAGE(1, PID_USAGE_BLOCK_FREE_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 11), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_POOL_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, 12), + + USAGE(1, PID_USAGE_DEVICE_MANAGED_POOL), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + FEATURE(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 5, + }; + struct hid_expect expect_reset[] = + { + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 1, + .report_len = 2, + .report_buf = {1, 0x01}, + }, + }; + struct hid_expect expect_create[] = + { + /* create new effect */ + { + .code = IOCTL_HID_SET_FEATURE, + .report_id = 9, + .report_len = 2, + .report_buf = {9,0x03}, + .todo = TRUE, + }, + /* block load */ + { + .code = IOCTL_HID_GET_FEATURE, + .report_id = 10, + .report_len = 3, + .report_buf = {10,0x01,0x01}, + .todo = TRUE, + }, + /* set condition */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 7, + .report_len = 8, + .report_buf = {0x07,0x00,0xf9,0x19,0xd9,0xff,0xff,0x99}, + }, + /* set condition */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 7, + .report_len = 8, + .report_buf = {0x07,0x00,0x4c,0x3f,0xcc,0x4c,0x33,0x19}, + }, + /* update effect */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 3, + .report_len = 11, + .report_buf = {0x03,0x01,0x03,0x08,0x01,0x00,0x06,0x00,0x01,0x55,0x00}, + }, + }; + struct hid_expect expect_destroy[] = + { + /* effect operation */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 2, + .report_len = 4, + .report_buf = {0x02,0x01,0x03,0x00}, + }, + /* block free */ + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 11, + .report_len = 2, + .report_buf = {11,0x01}, + .todo = TRUE, + }, + }; + static const DWORD expect_axes[3] = + { + DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFACTUATOR, + DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 2 ) | DIDFT_FFACTUATOR, + DIDFT_ABSAXIS | DIDFT_MAKEINSTANCE( 1 ) | DIDFT_FFACTUATOR, + }; + static const LONG expect_directions[3] = { + +3000, + 0, + 0, + }; + static const DIENVELOPE expect_envelope = + { + .dwSize = sizeof(DIENVELOPE), + .dwAttackLevel = 1000, + .dwAttackTime = 2000, + .dwFadeLevel = 3000, + .dwFadeTime = 4000, + }; + static const DICONDITION expect_condition[3] = + { + { + .lOffset = -500, + .lPositiveCoefficient = 2000, + .lNegativeCoefficient = -3000, + .dwPositiveSaturation = -4000, + .dwNegativeSaturation = -5000, + .lDeadBand = 6000, + }, + { + .lOffset = 6000, + .lPositiveCoefficient = 5000, + .lNegativeCoefficient = -4000, + .dwPositiveSaturation = 3000, + .dwNegativeSaturation = 2000, + .lDeadBand = 1000, + }, + { + .lOffset = -7000, + .lPositiveCoefficient = -8000, + .lNegativeCoefficient = 9000, + .dwPositiveSaturation = 10000, + .dwNegativeSaturation = 11000, + .lDeadBand = -12000, + }, + }; + const DIEFFECT expect_desc = + { + .dwSize = sizeof(DIEFFECT_DX6), + .dwFlags = DIEFF_SPHERICAL | DIEFF_OBJECTIDS, + .dwDuration = 1000, + .dwSamplePeriod = 2000, + .dwGain = 3000, + .dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER, + .dwTriggerRepeatInterval = 5000, + .cAxes = 2, + .rgdwAxes = (void *)expect_axes, + .rglDirection = (void *)expect_directions, + .lpEnvelope = (void *)&expect_envelope, + .cbTypeSpecificParams = 2 * sizeof(DICONDITION), + .lpvTypeSpecificParams = (void *)expect_condition, + .dwStartDelay = 6000, + }; + DIPROPGUIDANDPATH prop_guid_path = + { + .diph = + { + .dwSize = sizeof(DIPROPGUIDANDPATH), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + DIPROPDWORD prop_dword = + { + .diph = + { + .dwSize = sizeof(DIPROPDWORD), + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwHow = DIPH_DEVICE, + }, + }; + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device; + IDirectInputEffect *effect; + HANDLE file; + DWORD flags; + HRESULT hr; + ULONG ref; + HWND hwnd; + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_descriptor, sizeof(report_descriptor), &hid_caps )) goto done; + if (FAILED(hr = create_dinput_device( DIRECTINPUT_VERSION, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); + ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); + file = CreateFileW( prop_guid_path.wszPath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL ); + ok( file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError() ); + + hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, + NULL, NULL, NULL, NULL ); + + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); + + hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); + todo_wine + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + + set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + hr = IDirectInputDevice8_CreateEffect( device, &GUID_Spring, NULL, &effect, NULL ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); + + flags = DIEP_ALLPARAMS; + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, flags | DIEP_NODOWNLOAD ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + + set_hid_expect( file, expect_create, sizeof(expect_create) ); + hr = IDirectInputEffect_Download( effect ); + ok( hr == DI_OK, "Download returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + set_hid_expect( file, expect_destroy, sizeof(expect_destroy) ); + hr = IDirectInputEffect_Unload( effect ); + ok( hr == DI_OK, "Unload returned %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + ref = IDirectInputEffect_Release( effect ); + ok( ref == 0, "Release returned %d\n", ref ); + + set_hid_expect( file, expect_reset, sizeof(expect_reset) ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + + DestroyWindow( hwnd ); + CloseHandle( file ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + winetest_pop_context(); +} + START_TEST( hid ) { HANDLE mapping; @@ -8078,6 +8663,8 @@ START_TEST( hid ) test_force_feedback_joystick( 0x500 ); test_force_feedback_joystick( 0x700 ); test_force_feedback_joystick( 0x800 ); + + test_device_managed_effect(); } CoUninitialize(); -- 2.33.1

1 4

[PATCH] ntoskrnl: Add IoCreateDeviceSecure semi-stub.
by Dmitry Timoshkov 19 Nov '21

19 Nov '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec297e7d64a..38a25bc5092 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1610,6 +1610,21 @@ static struct _OBJECT_TYPE device_type = POBJECT_TYPE IoDeviceObjectType = &device_type; +/*********************************************************************** + * IoCreateDeviceSecure (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateDeviceSecure( DRIVER_OBJECT *driver, ULONG ext_size, + UNICODE_STRING *name, DEVICE_TYPE type, + ULONG characteristics, BOOLEAN exclusive, + PCUNICODE_STRING sddl, LPCGUID guid, + DEVICE_OBJECT **ret_device ) +{ + FIXME( "(%p, %u, %s, %u, %x, %u, %s, %s, %p): semi-stub\n", + driver, ext_size, debugstr_us(name), type, characteristics, exclusive, + debugstr_us(sddl), wine_dbgstr_guid(guid), ret_device ); + + return IoCreateDevice( driver, ext_size, name, type, characteristics, exclusive, ret_device ); +} /*********************************************************************** * IoCreateDevice (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0208e2f633f..0cd50785ad6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -354,6 +354,7 @@ @ stub IoConnectInterrupt @ stub IoCreateController @ stdcall IoCreateDevice(ptr long ptr long long long ptr) +@ stdcall IoCreateDeviceSecure(ptr long ptr long long long ptr ptr ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) @ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 2c2bbf44632..b798d339561 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1701,6 +1701,7 @@ NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); BOOLEAN WINAPI IoCancelIrp(IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); +NTSTATUS WINAPI IoCreateDeviceSecure(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,PCUNICODE_STRING,LPCGUID,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*); PKEVENT WINAPI IoCreateSynchronizationEvent(UNICODE_STRING*,HANDLE*); -- 2.33.1

1 0

[PATCH v3] server: implement vm counters on FreeBSD
by Damjan Jovanovic 19 Nov '21

19 Nov '21

Try 3 uses libprocstat in a new file, procstat.c (just like Solaris's procfs.c), which allows greater control over the included headers, so the duplicate definition of 'struct thread' can be avoided. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/Makefile.in | 3 +- server/process.c | 7 ++-- server/process.h | 4 +++ server/procstat.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 server/procstat.c

2 1

[PATCH 1/8] winebus.sys: Add PID_USAGE_PARAMETER_BLOCK_OFFSET in the set condition report.
by Rémi Bernon 19 Nov '21

19 Nov '21

From: Ivo Ivanov <logos128(a)gmail.com> Fixes improper interpretation of the condition output reports. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/hid.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 6f22e0e81d8..d9523324ae1 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -625,6 +625,13 @@ static BOOL hid_descriptor_add_set_condition(struct unix_device *iface) REPORT_COUNT(1, 1), OUTPUT(1, Data|Var|Abs), + USAGE(1, PID_USAGE_PARAMETER_BLOCK_OFFSET), + LOGICAL_MINIMUM(1, 0x00), + LOGICAL_MAXIMUM(1, 0x01), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + USAGE(1, PID_USAGE_CP_OFFSET), USAGE(1, PID_USAGE_POSITIVE_COEFFICIENT), USAGE(1, PID_USAGE_NEGATIVE_COEFFICIENT), -- 2.33.1

1 7

[PATCH] comctl32/button: Use client rectangle as content rectangle for themed group boxes.
by Zhiyi Zhang 19 Nov '21

19 Nov '21

Themed group boxes always use client rectangle as content rectangle regardless of group box content margin specified by theme files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52028 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2e3d8912a66..d537629fa35 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2900,7 +2900,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } GetClientRect(infoPtr->hwnd, &clientRect); - GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &clientRect, &contentRect); + contentRect = clientRect; region = set_control_clipping(hDC, &clientRect); bgRect = contentRect; -- 2.32.0

1 0

[PATCH] uxtheme: Do not overwrite system metrics when loading the same theme.
by Zhiyi Zhang 19 Nov '21

19 Nov '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51986 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52025 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/system.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index bf72baccebb..37c484387ec 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -421,7 +421,7 @@ static void UXTHEME_SaveSystemMetrics(struct system_metrics *metrics, BOOL send_ */ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { - BOOL ret, loaded_before = FALSE; + BOOL ret, loaded_before = FALSE, same_theme = FALSE; struct system_metrics metrics; DWORD size; HKEY hKey; @@ -430,6 +430,9 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) if(tf) { bThemeActive = TRUE; + same_theme = !lstrcmpW(szCurrentTheme, tf->szThemeFile) + && !lstrcmpW(szCurrentColor, tf->pszSelectedColor) + && !lstrcmpW(szCurrentSize, tf->pszSelectedSize); lstrcpynW(szCurrentTheme, tf->szThemeFile, ARRAY_SIZE(szCurrentTheme)); lstrcpynW(szCurrentColor, tf->pszSelectedColor, ARRAY_SIZE(szCurrentColor)); lstrcpynW(szCurrentSize, tf->pszSelectedSize, ARRAY_SIZE(szCurrentSize)); @@ -446,6 +449,8 @@ HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) WARN("Failed to get LoadedBefore: %d\n", GetLastError()); RegCloseKey(hKey); } + if (loaded_before && same_theme) + return MSSTYLES_SetActiveTheme(tf, FALSE); if (!loaded_before && ret) UXTHEME_SaveUnthemedSystemMetrics(&metrics); -- 2.32.0

1 0

[PATCH 1/3] include: Add UI Automation Pattern ID definitions.
by Connor McAdams 19 Nov '21

19 Nov '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationclient.idl | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index a353a63816b..917d3456ebf 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -27,6 +27,49 @@ import "uiautomationcore.idl"; library UIAutomationClient { importlib ("stdole2.tlb"); + /* FIXME: Uncomment when properly supported in widl + [dllname("<no entry points>")] + module UIA_PatternIds + { + */ + const long UIA_InvokePatternId = 10000; + const long UIA_SelectionPatternId = 10001; + const long UIA_ValuePatternId = 10002; + const long UIA_RangeValuePatternId = 10003; + const long UIA_ScrollPatternId = 10004; + const long UIA_ExpandCollapsePatternId = 10005; + const long UIA_GridPatternId = 10006; + const long UIA_GridItemPatternId = 10007; + const long UIA_MultipleViewPatternId = 10008; + const long UIA_WindowPatternId = 10009; + const long UIA_SelectionItemPatternId = 10010; + const long UIA_DockPatternId = 10011; + const long UIA_TablePatternId = 10012; + const long UIA_TableItemPatternId = 10013; + const long UIA_TextPatternId = 10014; + const long UIA_TogglePatternId = 10015; + const long UIA_TransformPatternId = 10016; + const long UIA_ScrollItemPatternId = 10017; + const long UIA_LegacyIAccessiblePatternId = 10018; + const long UIA_ItemContainerPatternId = 10019; + const long UIA_VirtualizedItemPatternId = 10020; + const long UIA_SynchronizedInputPatternId = 10021; + const long UIA_ObjectModelPatternId = 10022; + const long UIA_AnnotationPatternId = 10023; + const long UIA_TextPattern2Id = 10024; + const long UIA_StylesPatternId = 10025; + const long UIA_SpreadsheetPatternId = 10026; + const long UIA_SpreadsheetItemPatternId = 10027; + const long UIA_TransformPattern2Id = 10028; + const long UIA_TextChildPatternId = 10029; + const long UIA_DragPatternId = 10030; + const long UIA_DropTargetPatternId = 10031; + const long UIA_TextEditPatternId = 10032; + const long UIA_CustomNavigationPatternId = 10033; + /* + } + */ + /* FIXME: Uncomment when properly supported in widl [dllname("<no entry points>")] module UIA_PropertyIds -- 2.25.1

2 5

[PATCH v3 01/12] jscript: Try to_primitive first when getting the default value.
by Gabriel Ivăncescu 19 Nov '21

19 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 9 +++++++-- dlls/jscript/tests/run.c | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a520..cc46ee0 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1548,7 +1548,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc V_VT(pvarRes) = VT_EMPTY; prop = get_prop(This, id); - if(!prop || prop->type == PROP_DELETED) { + if((!prop || prop->type == PROP_DELETED) && (id != DISPID_VALUE || wFlags != DISPATCH_PROPERTYGET)) { TRACE("invalid id\n"); return DISP_E_MEMBERNOTFOUND; } @@ -1580,7 +1580,12 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYGET: { jsval_t r; - hres = prop_get(This, prop, &r); + hres = E_FAIL; + if(id == DISPID_VALUE) + hres = to_primitive(This->ctx, jsval_obj(This), &r, NO_HINT); + if(FAILED(hres)) + hres = prop_get(This, prop, &r); + if(SUCCEEDED(hres)) { hres = jsval_to_variant(r, pvarRes); jsval_release(r); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ef0f39f..c71e550 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2789,6 +2789,7 @@ static void test_retval(void) static void test_default_value(void) { + IActiveScript *script; DISPPARAMS dp = {0}; IDispatch *disp; VARIANT v; @@ -2806,9 +2807,49 @@ static void test_default_value(void) { ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); } + VariantClear(&v); + IDispatch_Release(disp); + + hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr.valueOf = function() {return 42;}; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"foo"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var arr = [5]; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"5"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IDispatch_Release(disp); + close_script(script); } static void test_script_exprs(void) -- 2.31.1

2 20

[PATCH] dmloader: Drop ifdef'ed out dead code
by Michael Stefaniuc 18 Nov '21

18 Nov '21

--- dlls/dmloader/loader.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index b90584b09a0..00170f42937 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -538,13 +538,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetObject(IDirectMusicLoader8 *ifac return DMUS_E_LOADER_FAILEDOPEN; } - /* *sigh*... some ms objects have lousy implementation of ParseDescriptor that clears input descriptor :( */ -#ifdef NOW_WE_ARE_FREE - /* parse descriptor: we actually use input descriptor; fields that aren't available from stream remain, - otherwise real info is set */ - IDirectMusicObject_ParseDescriptor (pObject, pStream, pDesc); -#endif - /* hmph... due to some trouble I had with certain tests, we store current position and then set it back */ DM_STRUCT_INIT(&Desc); if (FAILED(IDirectMusicObject_ParseDescriptor (pObject, pStream, &Desc))) { IStream_Release(pStream); -- 2.31.1

1 0

[PATCH] winemac.drv: Remove workarounds for Mac OS X 10.6 and earlier.
by Brendan Shanks 18 Nov '21

18 Nov '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 15 ++++----- dlls/winemac.drv/cocoa_window.m | 59 ++++++++++----------------------- dlls/winemac.drv/opengl.c | 20 ----------- 3 files changed, 23 insertions(+), 71 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c4c745ff732..1bb752d20b7 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -299,15 +299,12 @@ - (void) transformProcessToForeground [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ZOOM) action:@selector(performZoom:) keyEquivalent:@""]; - if ([NSWindow instancesRespondToSelector:@selector(toggleFullScreen:)]) - { - item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) - action:@selector(toggleFullScreen:) - keyEquivalent:@"f"]; - [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | - NSEventModifierFlagOption | - NSEventModifierFlagControl]; - } + item = [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_ENTER_FULL_SCREEN) + action:@selector(toggleFullScreen:) + keyEquivalent:@"f"]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | + NSEventModifierFlagOption | + NSEventModifierFlagControl]; [submenu addItem:[NSMenuItem separatorItem]]; [submenu addItemWithTitle:WineLocalizedString(STRING_MENU_ITEM_BRING_ALL_TO_FRONT) action:@selector(arrangeInFront:) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 812b46bee2c..d0672b7fb06 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -36,20 +36,6 @@ #import "cocoa_opengl.h" -#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 -enum { - NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7, - NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8, - NSWindowFullScreenButton = 7, - NSWindowStyleMaskFullScreen = 1 << 14, -}; - -@interface NSWindow (WineFullScreenExtensions) - - (void) toggleFullScreen:(id)sender; -@end -#endif - - #if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */ enum { @@ -1091,11 +1077,8 @@ - (void) adjustFeaturesForState [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; if (style & NSWindowStyleMaskResizable) [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; - if ([self respondsToSelector:@selector(toggleFullScreen:)]) - { - if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) - [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; - } + if ([self collectionBehavior] & NSWindowCollectionBehaviorFullScreenPrimary) + [[self standardWindowButton:NSWindowFullScreenButton] setEnabled:!self.disabled]; if ([self preventResizing]) { @@ -1115,24 +1098,21 @@ - (void) adjustFeaturesForState - (void) adjustFullScreenBehavior:(NSWindowCollectionBehavior)behavior { - if ([self respondsToSelector:@selector(toggleFullScreen:)]) - { - NSUInteger style = [self styleMask]; + NSUInteger style = [self styleMask]; - if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && - style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && - !(self.parentWindow || self.latentParentWindow)) - { - behavior |= NSWindowCollectionBehaviorFullScreenPrimary; - behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; - } - else - { - behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; - behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; - if (style & NSWindowStyleMaskFullScreen) - [super toggleFullScreen:nil]; - } + if (behavior & NSWindowCollectionBehaviorParticipatesInCycle && + style & NSWindowStyleMaskResizable && !(style & NSWindowStyleMaskUtilityWindow) && !maximized && + !(self.parentWindow || self.latentParentWindow)) + { + behavior |= NSWindowCollectionBehaviorFullScreenPrimary; + behavior &= ~NSWindowCollectionBehaviorFullScreenAuxiliary; + } + else + { + behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary; + behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary; + if (style & NSWindowStyleMaskFullScreen) + [super toggleFullScreen:nil]; } if (behavior != [self collectionBehavior]) @@ -2480,12 +2460,7 @@ - (void) sendEvent:(NSEvent*)event for (i = 0; i < sizeof(buttons) / sizeof(buttons[0]); i++) { - NSButton* button; - - if (buttons[i] == NSWindowFullScreenButton && ![self respondsToSelector:@selector(toggleFullScreen:)]) - continue; - - button = [self standardWindowButton:buttons[i]]; + NSButton* button = [self standardWindowButton:buttons[i]]; if ([button hitTest:[button.superview convertPoint:event.locationInWindow fromView:nil]]) { hitButton = YES; diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 9f02e93d376..33132de7415 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1248,7 +1248,6 @@ static BOOL init_gl_info(void) kCGLPFADisplayMask, displayMask, 0 }; -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 CGLPixelFormatAttribute core_attribs[] = { kCGLPFADisplayMask, displayMask, @@ -1256,7 +1255,6 @@ static BOOL init_gl_info(void) kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core, 0 }; -#endif CGLPixelFormatObj pix; GLint virtualScreens; CGLError err; @@ -1308,7 +1306,6 @@ static BOOL init_gl_info(void) CGLSetCurrentContext(old_context); CGLReleaseContext(context); -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 err = CGLChoosePixelFormat(core_attribs, &pix, &virtualScreens); if (err != kCGLNoError || !pix) { @@ -1340,7 +1337,6 @@ static BOOL init_gl_info(void) sscanf(str, "%u.%u", &gl_info.max_major, &gl_info.max_minor); CGLSetCurrentContext(old_context); CGLReleaseContext(context); -#endif return TRUE; } @@ -1397,14 +1393,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns CGLError err; BOOL core = major >= 3; -#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7 - if (core) - { - WARN("OS X version >= 10.7 is required to be able to create core contexts\n"); - return FALSE; - } -#endif - pf = get_pixel_format(context->format, TRUE /* non-displayable */); if (!pf) { @@ -1480,7 +1468,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns if (pf->backing_store) attribs[n++] = kCGLPFABackingStore; -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 if (core) { attribs[n++] = kCGLPFAOpenGLProfile; @@ -1493,7 +1480,6 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns attribs[n++] = (int)kCGLOGLPVersion_3_2_Core; #endif } -#endif attribs[n] = 0; @@ -1856,12 +1842,8 @@ static CGLPixelFormatObj create_pixel_format_for_renderer(CGLRendererInfoObj ren if (core) { -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 attrs[3] = kCGLPFAOpenGLProfile; attrs[4] = (CGLPixelFormatAttribute)kCGLOGLPVersion_3_2_Core; -#else - return NULL; -#endif } if (!get_renderer_property(renderer_info, renderer, kCGLRPRendererID, &renderer_id)) @@ -2157,12 +2139,10 @@ static BOOL query_renderer_integer(CGLRendererInfoObj renderer_info, GLint rende } case WGL_RENDERER_VIDEO_MEMORY_WINE: -#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 err = CGLDescribeRenderer(renderer_info, renderer, kCGLRPVideoMemoryMegabytes, (GLint*)value); if (err != kCGLNoError && err != kCGLBadProperty) WARN("CGLDescribeRenderer(kCGLRPVideoMemoryMegabytes) failed: %d %s\n", err, CGLErrorString(err)); if (err != kCGLNoError) -#endif { if (get_renderer_property(renderer_info, renderer, kCGLRPVideoMemory, (GLint*)value)) *value /= 1024 * 1024; -- 2.30.1 (Apple Git-130)

1 0

[PATCH] ntdll: Only add a module dependency if import_dll() returned a modref.
by Henri Verbeet 18 Nov '21

18 Nov '21

In particular, if import_dll() skips an unused import, it will return TRUE, but set *pwm to NULL. This fixes a regression in 3DMark03 version 3.4.0, introduced by commit 0dd37b02f99f5090dd855343fcd8a99496047f3e. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 255d5afef79..a754579bf54 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1282,7 +1282,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) imp = NULL; status = STATUS_DLL_NOT_FOUND; } - else if (!is_import_dll_system( &wm->ldr, &imports[i] )) + else if (imp && !is_import_dll_system( &wm->ldr, &imports[i] )) { add_module_dependency_after( wm->ldr.DdagNode, imp->ldr.DdagNode, dep_after ); } -- 2.20.1

1 0

[PATCH] wined3d: Add WINED3DFMT_R16_FLOAT vertex format.
by Andrey Gusev 18 Nov '21

18 Nov '21

Fixes rendering glitches in Batman: Arkham Knight. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 1 + dlls/wined3d/utils.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 140e7cc195c..38cd1309e02 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18552,6 +18552,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R16_FLOAT, DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R8G8_UNORM, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1b0d7cc6eba..148bb39bafe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -715,6 +715,8 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, /* Without ARB_half_float_vertex we convert these on upload. */ + {WINED3DFMT_R16_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_FLOAT}, + {WINED3DFMT_R16_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_FLOAT}, {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_FLOAT}, -- 2.33.1

2 1

[PATCH vkd3d v4 1/2] vkd3d-shader/hlsl: Add round intrinsic function and test.
by Zebediah Figura 18 Nov '21

18 Nov '21

From: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: Move intrinsic_round() to be alphabetized with the other functions. Makefile.am | 1 + libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 ++++++++ libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/round.shader_test | 26 ++++++++++++++++++++++++++ 6 files changed, 41 insertions(+) create mode 100644 tests/round.shader_test diff --git a/Makefile.am b/Makefile.am index 3186cdbf0..915174422 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/round.shader_test \ tests/sampler.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278a..9824c56dc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1156,6 +1156,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_NEG] = "-", [HLSL_OP1_NRM] = "nrm", [HLSL_OP1_RCP] = "rcp", + [HLSL_OP1_ROUND] = "round", [HLSL_OP1_RSQ] = "rsq", [HLSL_OP1_SAT] = "sat", [HLSL_OP1_SIGN] = "sign", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f2a7a48d5..04f86cdd6 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -299,6 +299,7 @@ enum hlsl_ir_expr_op HLSL_OP1_NEG, HLSL_OP1_NRM, HLSL_OP1_RCP, + HLSL_OP1_ROUND, HLSL_OP1_RSQ, HLSL_OP1_SAT, HLSL_OP1_SIGN, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b7e0409da..abf5da916 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1611,6 +1611,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_round(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], &loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1626,10 +1632,12 @@ static const struct intrinsic_function } intrinsic_functions[] = { + /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, + {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 413f33651..cd237efe5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1341,6 +1341,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break; + case HLSL_OP1_ROUND: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NE, &expr->node, arg1, 0); + break; + case HLSL_OP1_SAT: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV | (VKD3D_SM4_INSTRUCTION_FLAG_SATURATE << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT), diff --git a/tests/round.shader_test b/tests/round.shader_test new file mode 100644 index 000000000..d8eb11b77 --- /dev/null +++ b/tests/round.shader_test @@ -0,0 +1,26 @@ +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (0.0, 6.0, 8.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float a = round(u.r); + int2 b = round(u.gb); + float4 res = float4(b, a, u.a); + return round(res); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (6.0, 8.0, 0.0, 3.0) 4 -- 2.33.1

1 1

[PATCH 1/5] wined3d: Respect the BO memory offset for vertex buffers.
by Zebediah Figura 18 Nov '21

18 Nov '21

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 89 ++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 686cd7dc548..d00c1ae2b0c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5100,8 +5100,8 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_format_gl *format_gl; unsigned int mapped_stage = 0; + struct wined3d_bo_gl *bo_gl; unsigned int texture_idx; - GLuint bo; for (texture_idx = 0; texture_idx < context_gl->c.d3d_info->limits.ffp_blend_stages; ++texture_idx) { @@ -5123,12 +5123,12 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context TRACE("Setting up texture %u, idx %u, coord_idx %u, data %s.\n", texture_idx, mapped_stage, coord_idx, debug_bo_address(&e->data)); - bo = wined3d_bo_gl_id(e->data.buffer_object); - if (*current_bo != bo) + bo_gl = wined3d_bo_gl(e->data.buffer_object); + if (*current_bo != bo_gl->id) { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo_gl->id)); checkGLcall("glBindBuffer"); - *current_bo = bo; + *current_bo = bo_gl->id; } GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); @@ -5137,7 +5137,7 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context /* The coords to supply depend completely on the fvf/vertex shader. */ format_gl = wined3d_format_gl(e->format); gl_info->gl_ops.gl.p_glTexCoordPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); gl_info->gl_ops.gl.p_glEnableClientState(GL_TEXTURE_COORD_ARRAY); state->streams[e->stream_idx].buffer->bo_user.valid = true; } @@ -5180,7 +5180,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_stream_info_element *e; const struct wined3d_format_gl *format_gl; - GLuint current_bo, bo; + struct wined3d_bo_gl *bo_gl; + GLuint current_bo; TRACE("context_gl %p, si %p, state %p.\n", context_gl, si, state); @@ -5212,19 +5213,19 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte e = &si->elements[WINED3D_FFP_POSITION]; format_gl = wined3d_format_gl(e->format); - bo = wined3d_bo_gl_id(e->data.buffer_object); - if (current_bo != bo) + bo_gl = wined3d_bo_gl(e->data.buffer_object); + if (current_bo != bo_gl->id) { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo_gl->id)); checkGLcall("glBindBuffer"); - current_bo = bo; + current_bo = bo_gl->id; } TRACE("glVertexPointer(%#x, %#x, %#x, %p);\n", format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); gl_info->gl_ops.gl.p_glVertexPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); checkGLcall("glVertexPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_VERTEX_ARRAY); checkGLcall("glEnableClientState(GL_VERTEX_ARRAY)"); @@ -5237,18 +5238,18 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte e = &si->elements[WINED3D_FFP_NORMAL]; format_gl = wined3d_format_gl(e->format); - bo = wined3d_bo_gl_id(e->data.buffer_object); - if (current_bo != bo) + bo_gl = wined3d_bo_gl(e->data.buffer_object); + if (current_bo != bo_gl->id) { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo_gl->id)); checkGLcall("glBindBuffer"); - current_bo = bo; + current_bo = bo_gl->id; } TRACE("glNormalPointer(%#x, %#x, %p);\n", format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); gl_info->gl_ops.gl.p_glNormalPointer(format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); checkGLcall("glNormalPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_NORMAL_ARRAY); checkGLcall("glEnableClientState(GL_NORMAL_ARRAY)"); @@ -5266,19 +5267,19 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte e = &si->elements[WINED3D_FFP_DIFFUSE]; format_gl = wined3d_format_gl(e->format); - bo = wined3d_bo_gl_id(e->data.buffer_object); - if (current_bo != bo) + bo_gl = wined3d_bo_gl(e->data.buffer_object); + if (current_bo != bo_gl->id) { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo_gl->id)); checkGLcall("glBindBuffer"); - current_bo = bo; + current_bo = bo_gl->id; } TRACE("glColorPointer(%#x, %#x %#x, %p);\n", format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); gl_info->gl_ops.gl.p_glColorPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); checkGLcall("glColorPointer(4, GL_UNSIGNED_BYTE, ...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_COLOR_ARRAY); checkGLcall("glEnableClientState(GL_COLOR_ARRAY)"); @@ -5306,12 +5307,12 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte type = format_gl->vtx_type; format = format_gl->vtx_format; - bo = wined3d_bo_gl_id(e->data.buffer_object); - if (current_bo != bo) + bo_gl = wined3d_bo_gl(e->data.buffer_object); + if (current_bo != bo_gl->id) { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo_gl->id)); checkGLcall("glBindBuffer"); - current_bo = bo; + current_bo = bo_gl->id; } if (format != 4 || (gl_info->quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) @@ -5322,9 +5323,9 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte * 4 component secondary colors use it */ TRACE("glSecondaryColorPointer(%#x, %#x, %#x, %p);\n", format, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); GL_EXTCALL(glSecondaryColorPointerEXT(format, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride)); checkGLcall("glSecondaryColorPointerEXT(format, type, ...)"); } else @@ -5333,9 +5334,9 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte { case GL_UNSIGNED_BYTE: TRACE("glSecondaryColorPointer(3, GL_UNSIGNED_BYTE, %#x, %p);\n", e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); GL_EXTCALL(glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride)); checkGLcall("glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, ...)"); break; @@ -5343,9 +5344,9 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte FIXME("Add 4 component specular colour pointers for type %#x.\n", type); /* Make sure that the right colour component is dropped. */ TRACE("glSecondaryColorPointer(3, %#x, %#x, %p);\n", type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride); GL_EXTCALL(glSecondaryColorPointerEXT(3, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); + bo_gl->b.memory_offset + e->data.addr + state->load_base_vertex_index * e->stride)); checkGLcall("glSecondaryColorPointerEXT(3, type, ...)"); } } @@ -5405,7 +5406,8 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c struct wined3d_context *context = &context_gl->c; const struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLuint current_bo, bo; + struct wined3d_bo_gl *bo_gl; + GLuint current_bo; unsigned int i; /* Default to no instancing. */ @@ -5474,27 +5476,28 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c { DWORD format_flags = format_gl->f.flags[WINED3D_GL_RES_TYPE_BUFFER]; - bo = wined3d_bo_gl_id(element->data.buffer_object); - if (current_bo != bo) + bo_gl = wined3d_bo_gl(element->data.buffer_object); + if (current_bo != bo_gl->id) { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, bo_gl->id)); checkGLcall("glBindBuffer"); - current_bo = bo; + current_bo = bo_gl->id; } + /* Use the VBO to find out if a vertex buffer exists, not the vb * pointer. vb can point to a user pointer data blob. In that case * current_bo will be 0. If there is a vertex buffer but no vbo we * won't be load converted attributes anyway. */ if (vs && vs->reg_maps.shader_version.major >= 4 && (format_flags & WINED3DFMT_FLAG_INTEGER)) { - GL_EXTCALL(glVertexAttribIPointer(i, format_gl->vtx_format, format_gl->vtx_type, - element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); + GL_EXTCALL(glVertexAttribIPointer(i, format_gl->vtx_format, format_gl->vtx_type, element->stride, + bo_gl->b.memory_offset + element->data.addr + state->load_base_vertex_index * element->stride)); } else { GL_EXTCALL(glVertexAttribPointer(i, format_gl->vtx_format, format_gl->vtx_type, !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, - element->data.addr + state->load_base_vertex_index * element->stride)); + bo_gl->b.memory_offset + element->data.addr + state->load_base_vertex_index * element->stride)); } if (!(context->numbered_array_mask & (1u << i))) -- 2.33.0

2 5

[PATCH vkd3d v3] vkd3d-shader/hlsl: Add cross() intrinsic function and test.
by Francisco Casas 18 Nov '21

18 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 56 ++++++++++++++++++++++++++++++++++++++++ tests/cross.shader_test | 29 +++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 tests/cross.shader_test diff --git a/Makefile.am b/Makefile.am index d6e14cf1..307c32a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ vkd3d_shader_tests = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/cross.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ @@ -285,6 +286,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/cross.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2120b26f..e3bd366f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1611,6 +1611,61 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_cross(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_swizzle *arg1_swzl1, *arg1_swzl2, *arg2_swzl1, *arg2_swzl2; + struct hlsl_ir_node *arg1 = params->args[0], *arg2 = params->args[1]; + struct hlsl_ir_node *arg1_cast, *arg2_cast, *mul1_neg; + struct hlsl_ir_expr *mul1, *mul2; + struct hlsl_type *cast_type; + enum hlsl_base_type base; + + if (arg1->data_type->base_type == HLSL_TYPE_HALF && arg2->data_type->base_type == HLSL_TYPE_HALF){ + base = HLSL_TYPE_HALF; + } else { + base = HLSL_TYPE_FLOAT; + } + + cast_type = hlsl_get_vector_type(ctx, base, 3); + + if (!(arg1_cast = add_implicit_conversion(ctx, params->instrs, arg1, cast_type, &loc))) + return false; + + if (!(arg2_cast = add_implicit_conversion(ctx, params->instrs, arg2, cast_type, &loc))) + return false; + + if (!(arg1_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl1->node.entry); + + if (!(arg2_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl1->node.entry); + + if (!(mul1 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl1->node, &arg2_swzl1->node, &loc))) + return false; + + if (!(mul1_neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &mul1->node, loc))) + return false; + list_add_tail(params->instrs, &mul1_neg->entry); + + if (!(arg1_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl2->node.entry); + + if (!(arg2_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl2->node.entry); + + if (!(mul2 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl2->node, &arg2_swzl2->node, &loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, &mul2->node, mul1_neg, &loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1628,6 +1683,7 @@ intrinsic_functions[] = { {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, + {"cross", 2, true, intrinsic_cross}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/cross.shader_test b/tests/cross.shader_test new file mode 100644 index 00000000..29c811a2 --- /dev/null +++ b/tests/cross.shader_test @@ -0,0 +1,29 @@ +[pixel shader] +float4 main(uniform float4 u, uniform float4 v) : sv_target +{ + float4 res = float4(0, 0, 0, 0); + res.xyz = cross(u, v); + return res; +} + +[test] +uniform 0 float4 1 -2 3 4 +uniform 4 float4 10 100 1000 10000 +draw quad +probe all rgba (-2300, -970, 120, 0) + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float4 res = float4(0, 0, 0, 3.5); + res.xyz = cross(u, 4); + return res; +} + +[test] +uniform 0 float4 1 -2 3 4 +draw quad +probe all rgba (-20, 8, 12, 3.5) + -- 2.25.1

1 0

[PATCH resend] win32u: Make elfFullName from family name in the font replacement.
by Akihiro Sagawa 18 Nov '21

18 Nov '21

The original Kusanagi code, commit eab02574929d, was implemented in this way. However, commit abc8f2c6c270 and f360057e2f99 made it from face->full_name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/win32u/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH resend] win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Akihiro Sagawa 18 Nov '21

18 Nov '21

Some visual novel games verify that otmpFamilyName matches the desired font name. That prevents us from using replacement fonts. This commit allows to make otmpFamilyName from the replacement name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/win32u/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

1 0

[PATCH vkd3d v2] vkd3d-shader/hlsl: Add round intrinsic function and test.
by Francisco Casas 18 Nov '21

18 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 ++++++++ libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/round.shader_test | 26 ++++++++++++++++++++++++++ 6 files changed, 41 insertions(+) create mode 100644 tests/round.shader_test diff --git a/Makefile.am b/Makefile.am index d6e14cf1..a33790ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/round.shader_test \ tests/sampler.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278..9824c56d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1156,6 +1156,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_NEG] = "-", [HLSL_OP1_NRM] = "nrm", [HLSL_OP1_RCP] = "rcp", + [HLSL_OP1_ROUND] = "round", [HLSL_OP1_RSQ] = "rsq", [HLSL_OP1_SAT] = "sat", [HLSL_OP1_SIGN] = "sign", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index eae96232..adfa9c30 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -299,6 +299,7 @@ enum hlsl_ir_expr_op HLSL_OP1_NEG, HLSL_OP1_NRM, HLSL_OP1_RCP, + HLSL_OP1_ROUND, HLSL_OP1_RSQ, HLSL_OP1_SAT, HLSL_OP1_SIGN, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2120b26f..858d3bbd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1575,6 +1575,12 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ABS, params->args[0], &loc); } +static bool intrinsic_round(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], &loc); +} + static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1626,10 +1632,12 @@ static const struct intrinsic_function } intrinsic_functions[] = { + /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, + {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index e597425a..abe52b2f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1294,6 +1294,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break; + case HLSL_OP1_ROUND: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NE, &expr->node, arg1, 0); + break; + case HLSL_OP1_SAT: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV | (VKD3D_SM4_INSTRUCTION_FLAG_SATURATE << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT), diff --git a/tests/round.shader_test b/tests/round.shader_test new file mode 100644 index 00000000..d8eb11b7 --- /dev/null +++ b/tests/round.shader_test @@ -0,0 +1,26 @@ +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (0.0, 6.0, 8.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float a = round(u.r); + int2 b = round(u.gb); + float4 res = float4(b, a, u.a); + return round(res); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (6.0, 8.0, 0.0, 3.0) 4 -- 2.25.1

1 0

[PATCH v2 01/10] include: Declare DIPROP_(PHYSICAL|LOGICAL)RANGE properties.
by Rémi Bernon 18 Nov '21

18 Nov '21

From: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix dinput:device test failure, set dwObj to 0 in SetActionMap when setting device properties, check for dwObj == 0 in SetProperty for device properties. include/dinput.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index a073054b388..71cc55aece5 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -917,6 +917,9 @@ typedef const DIPROPPOINTER *LPCDIPROPPOINTER; #define DIPROP_PRODUCTNAME MAKEDIPROP(14) #define DIPROP_JOYSTICKID MAKEDIPROP(15) +#define DIPROP_PHYSICALRANGE MAKEDIPROP(18) +#define DIPROP_LOGICALRANGE MAKEDIPROP(19) + #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_CPOINTS MAKEDIPROP(21) #define DIPROP_APPDATA MAKEDIPROP(22) -- 2.33.1

2 10

[PATCH vkd3d] vkd3d-shader/hlsl: Add round intrinsic function and test.
by Francisco Casas 18 Nov '21

18 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 9 ++++++++- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/round.shader_test | 26 ++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 tests/round.shader_test diff --git a/Makefile.am b/Makefile.am index d6e14cf1..a33790ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,6 +90,7 @@ vkd3d_shader_tests = \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/preproc-misc.shader_test \ + tests/round.shader_test \ tests/sampler.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 1eee4278..9824c56d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1156,6 +1156,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_NEG] = "-", [HLSL_OP1_NRM] = "nrm", [HLSL_OP1_RCP] = "rcp", + [HLSL_OP1_ROUND] = "round", [HLSL_OP1_RSQ] = "rsq", [HLSL_OP1_SAT] = "sat", [HLSL_OP1_SIGN] = "sign", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index eae96232..adfa9c30 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -299,6 +299,7 @@ enum hlsl_ir_expr_op HLSL_OP1_NEG, HLSL_OP1_NRM, HLSL_OP1_RCP, + HLSL_OP1_ROUND, HLSL_OP1_RSQ, HLSL_OP1_SAT, HLSL_OP1_SIGN, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2120b26f..acef42e2 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1575,6 +1575,12 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ABS, params->args[0], &loc); } +static bool intrinsic_round(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], &loc); +} + static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1625,11 +1631,12 @@ static const struct intrinsic_function bool (*handler)(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc); } intrinsic_functions[] = -{ +{ /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, + {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index e597425a..abe52b2f 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1294,6 +1294,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break; + case HLSL_OP1_ROUND: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NE, &expr->node, arg1, 0); + break; + case HLSL_OP1_SAT: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV | (VKD3D_SM4_INSTRUCTION_FLAG_SATURATE << VKD3D_SM4_INSTRUCTION_FLAGS_SHIFT), diff --git a/tests/round.shader_test b/tests/round.shader_test new file mode 100644 index 00000000..9576dbb0 --- /dev/null +++ b/tests/round.shader_test @@ -0,0 +1,26 @@ +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (0.0, 6.0, 8.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform float4 u) : sv_target +{ + float a = round(u.r); + int2 b = round(u.gb); + float4 res = float4(b,a,u.a); + return round(res); +} + +[test] +uniform 0 float4 -0.5 6.5 7.5 3.4 +draw quad +probe all rgba (6.0, 8.0, 0.0, 3.0) 4 -- 2.25.1

3 2

[PATCH 01/10] include: Declare DIPROP_(PHYSICAL|LOGICAL)RANGE properties.
by Rémi Bernon 18 Nov '21

18 Nov '21

From: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/dinput.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dinput.h b/include/dinput.h index a073054b388..71cc55aece5 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -917,6 +917,9 @@ typedef const DIPROPPOINTER *LPCDIPROPPOINTER; #define DIPROP_PRODUCTNAME MAKEDIPROP(14) #define DIPROP_JOYSTICKID MAKEDIPROP(15) +#define DIPROP_PHYSICALRANGE MAKEDIPROP(18) +#define DIPROP_LOGICALRANGE MAKEDIPROP(19) + #define DIPROP_KEYNAME MAKEDIPROP(20) #define DIPROP_CPOINTS MAKEDIPROP(21) #define DIPROP_APPDATA MAKEDIPROP(22) -- 2.33.1

2 15

[PATCH 3/3] msdasql: Implement IColumnsRowset GetAvailableColumns
by Alistair Leslie-Hughes 18 Nov '21

18 Nov '21

The functions returns a series of custom columns to make a row unique. For us, it's safe to return no extra columns. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index f9538e5d4d9..7ce19b5ad73 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -819,8 +819,16 @@ static ULONG WINAPI column_rs_Release(IColumnsRowset *iface) static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORDINAL *count, DBID **columns) { struct msdasql_rowset *rowset = impl_from_IColumnsRowset( iface ); - FIXME("%p, %p, %p\n", rowset, count, columns); - return E_NOTIMPL; + + TRACE("%p, %p, %p\n", rowset, count, columns); + + if (!count || !columns) + return E_INVALIDARG; + + *count = 0; + *columns = NULL; + + return S_OK; } static HRESULT WINAPI column_rs_GetColumnsRowset(IColumnsRowset *iface, IUnknown *outer, DBORDINAL count, -- 2.33.0

1 0

[PATCH 2/3] msdasql: Implement ICommandProperties SetProperties.
by Alistair Leslie-Hughes 18 Nov '21

18 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 9cd41eedfd8..f9538e5d4d9 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1098,7 +1098,29 @@ static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULON DBPROPSET propertyset[]) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %p\n", command, propertyset); + int i, j, k; + + TRACE("%p %d, %p\n", command, count, propertyset); + + for(i=0; i < count; i++) + { + TRACE("set %s, count %d\n", debugstr_guid(&propertyset[i].guidPropertySet), propertyset[i].cProperties); + for(j=0; j < propertyset[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].id == propertyset[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property 0x%08x\n", command->properties[k].id); + if (command->properties[k].readonly) + WARN("Attempting to set Readonly property\n"); + else + VariantCopy(&command->properties[k].value, &propertyset[i].rgProperties[j].vValue); + break; + } + } + } + } return S_OK; } -- 2.33.0

1 0

[PATCH 1/3] msdasql: Implement ICommandProperties GetProperties
by Alistair Leslie-Hughes 18 Nov '21

18 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 1 + dlls/msdasql/session.c | 242 +++++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 146 ++++++++++++++++++++ 3 files changed, 387 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index bc208a74cc5..84afdb06145 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b4239c59037..9cd41eedfd8 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -35,6 +35,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdasql); +static DWORD propsid[79] = { + DBPROP_ABORTPRESERVE, DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROP_BOOKMARKS, DBPROP_BOOKMARKSKIPPED, + DBPROP_BOOKMARKTYPE, DBPROP_CANFETCHBACKWARDS, DBPROP_CANHOLDROWS, DBPROP_CANSCROLLBACKWARDS, + DBPROP_COLUMNRESTRICT, DBPROP_COMMITPRESERVE, DBPROP_DELAYSTORAGEOBJECTS, DBPROP_IMMOBILEROWS, + DBPROP_LITERALBOOKMARKS, DBPROP_LITERALIDENTITY, DBPROP_MAXOPENROWS, DBPROP_MAXPENDINGROWS, + DBPROP_MAXROWS, DBPROP_NOTIFICATIONPHASES, DBPROP_OTHERUPDATEDELETE, DBPROP_OWNINSERT, + DBPROP_OWNUPDATEDELETE, DBPROP_QUICKRESTART, DBPROP_REENTRANTEVENTS, DBPROP_REMOVEDELETED, + DBPROP_REPORTMULTIPLECHANGES, DBPROP_ROWRESTRICT, DBPROP_ROWTHREADMODEL, DBPROP_TRANSACTEDOBJECT, + DBPROP_UPDATABILITY, DBPROP_STRONGIDENTITY, DBPROP_IAccessor, DBPROP_IColumnsInfo, + DBPROP_IColumnsRowset, DBPROP_IConnectionPointContainer, DBPROP_IRowset, DBPROP_IRowsetChange, + DBPROP_IRowsetIdentity, DBPROP_IRowsetInfo, DBPROP_IRowsetLocate, DBPROP_IRowsetResynch, + DBPROP_IRowsetUpdate, DBPROP_ISupportErrorInfo, DBPROP_ISequentialStream, DBPROP_NOTIFYCOLUMNSET, + DBPROP_NOTIFYROWDELETE, DBPROP_NOTIFYROWFIRSTCHANGE, DBPROP_NOTIFYROWINSERT, DBPROP_NOTIFYROWRESYNCH, + DBPROP_NOTIFYROWSETRELEASE, DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE, DBPROP_NOTIFYROWUNDOCHANGE, DBPROP_NOTIFYROWUNDODELETE, + DBPROP_NOTIFYROWUNDOINSERT, DBPROP_NOTIFYROWUPDATE, DBPROP_CHANGEINSERTEDROWS, DBPROP_RETURNPENDINGINSERTS, + DBPROP_IConvertType, DBPROP_NOTIFICATIONGRANULARITY, DBPROP_IMultipleResults, DBPROP_ACCESSORDER, + DBPROP_BOOKMARKINFO, DBPROP_UNIQUEROWS, DBPROP_IRowsetFind, DBPROP_IRowsetScroll, + DBPROP_IRowsetRefresh, DBPROP_FINDCOMPAREOPS, DBPROP_ORDEREDBOOKMARKS, DBPROP_CLIENTCURSOR, + DBPROP_ACTIVESESSIONS, DBPROP_ASYNCTXNCOMMIT, DBPROP_AUTH_CACHE_AUTHINFO, DBPROP_AUTH_ENCRYPT_PASSWORD, + DBPROP_AUTH_INTEGRATED, DBPROP_AUTH_MASK_PASSWORD, DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_ENCRYPTED, + DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, DBPROP_BLOCKINGSTORAGEOBJECTS +}; + struct msdasql_session { IUnknown session_iface; @@ -294,6 +317,13 @@ static ULONG WINAPI createcommand_Release(IDBCreateCommand *iface) return IUnknown_Release(&session->session_iface); } +struct command_props +{ + DWORD id; + BOOL readonly; + VARIANT value; +}; + struct command { ICommandText ICommandText_iface; @@ -305,6 +335,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + + struct command_props properties[79]; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -933,8 +965,133 @@ static HRESULT WINAPI command_prop_GetProperties(ICommandProperties *iface, ULON const DBPROPIDSET propertyidsets[], ULONG *sets_cnt, DBPROPSET **propertyset) { struct command *command = impl_from_ICommandProperties( iface ); - FIXME("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); - return E_NOTIMPL; + DBPROPSET *propset = NULL; + int i, j, k; + + DWORD row_props[68] = { + DBPROP_ABORTPRESERVE, DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROP_BOOKMARKS, DBPROP_BOOKMARKSKIPPED, + DBPROP_BOOKMARKTYPE, DBPROP_CANFETCHBACKWARDS, DBPROP_CANHOLDROWS, DBPROP_CANSCROLLBACKWARDS, + DBPROP_COLUMNRESTRICT, DBPROP_COMMITPRESERVE, DBPROP_DELAYSTORAGEOBJECTS, DBPROP_IMMOBILEROWS, + DBPROP_LITERALBOOKMARKS, DBPROP_LITERALIDENTITY, DBPROP_MAXOPENROWS, DBPROP_MAXPENDINGROWS, + DBPROP_MAXROWS, DBPROP_NOTIFICATIONPHASES, DBPROP_OTHERUPDATEDELETE, DBPROP_OWNINSERT, + DBPROP_OWNUPDATEDELETE, DBPROP_QUICKRESTART, DBPROP_REENTRANTEVENTS, DBPROP_REMOVEDELETED, + DBPROP_REPORTMULTIPLECHANGES, DBPROP_ROWRESTRICT, DBPROP_ROWTHREADMODEL, DBPROP_TRANSACTEDOBJECT, + DBPROP_UPDATABILITY, DBPROP_STRONGIDENTITY, DBPROP_IAccessor, DBPROP_IColumnsInfo, + DBPROP_IColumnsRowset, DBPROP_IConnectionPointContainer, DBPROP_IRowset, DBPROP_IRowsetChange, + DBPROP_IRowsetIdentity, DBPROP_IRowsetInfo, DBPROP_IRowsetLocate, DBPROP_IRowsetResynch, + DBPROP_IRowsetUpdate, DBPROP_ISupportErrorInfo, DBPROP_ISequentialStream, DBPROP_NOTIFYCOLUMNSET, + DBPROP_NOTIFYROWDELETE, DBPROP_NOTIFYROWFIRSTCHANGE, DBPROP_NOTIFYROWINSERT, DBPROP_NOTIFYROWRESYNCH, + DBPROP_NOTIFYROWSETRELEASE, DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE, DBPROP_NOTIFYROWUNDOCHANGE, DBPROP_NOTIFYROWUNDODELETE, + DBPROP_NOTIFYROWUNDOINSERT, DBPROP_NOTIFYROWUPDATE, DBPROP_CHANGEINSERTEDROWS, DBPROP_RETURNPENDINGINSERTS, + DBPROP_IConvertType, DBPROP_NOTIFICATIONGRANULARITY, DBPROP_IMultipleResults, DBPROP_ACCESSORDER, + DBPROP_BOOKMARKINFO, DBPROP_UNIQUEROWS, DBPROP_IRowsetFind, DBPROP_IRowsetScroll, + DBPROP_IRowsetRefresh, DBPROP_FINDCOMPAREOPS, DBPROP_ORDEREDBOOKMARKS, DBPROP_CLIENTCURSOR + }; + + DWORD prov_props[12] = { + DBPROP_ABORTPRESERVE, DBPROP_ACTIVESESSIONS, DBPROP_ASYNCTXNCOMMIT, DBPROP_AUTH_CACHE_AUTHINFO, + DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROP_AUTH_INTEGRATED, DBPROP_AUTH_MASK_PASSWORD, DBPROP_AUTH_PASSWORD, + DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, DBPROP_BLOCKINGSTORAGEOBJECTS + }; + + TRACE("%p %d %p %p %p\n", command, count, propertyidsets, sets_cnt, propertyset); + + /* All Properties */ + if (count == 0) + { + propset = CoTaskMemAlloc(2 * sizeof(DBPROPSET)); + if (!propset) + return E_OUTOFMEMORY; + + propset[0].guidPropertySet = DBPROPSET_ROWSET; + propset[0].cProperties = ARRAY_SIZE(row_props); + propset[0].rgProperties = CoTaskMemAlloc(propset[0].cProperties * sizeof(DBPROP)); + if (!propset[0].rgProperties) + { + CoTaskMemFree(propset); + return E_OUTOFMEMORY; + } + + for (j=0; j < propset[0].cProperties; j++) + { + propset[0].rgProperties[j].dwPropertyID = row_props[j]; + + for(k = 0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].id == row_props[j]) + { + V_VT(&propset[0].rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset[0].rgProperties[j].vValue, &command->properties[k].value); + break; + } + } + } + + propset[1].guidPropertySet = DBPROPSET_PROVIDERROWSET; + + propset[1].cProperties = ARRAY_SIZE(prov_props); + propset[1].rgProperties = CoTaskMemAlloc(propset[1].cProperties * sizeof(DBPROP)); + if (!propset[1].rgProperties) + { + CoTaskMemFree(propset[0].rgProperties); + CoTaskMemFree(propset); + return E_OUTOFMEMORY; + } + for (j=0; j < propset[1].cProperties; j++) + { + propset[1].rgProperties[j].dwPropertyID = prov_props[j]; + + for(k = 0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].id == prov_props[j]) + { + V_VT(&propset[1].rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset[1].rgProperties[j].vValue, &command->properties[k].value); + break; + } + } + } + + *sets_cnt = 2; + } + else + { + propset = CoTaskMemAlloc(count * sizeof(DBPROPSET)); + if (!propset) + return E_OUTOFMEMORY; + + for (i=0; i < count; i++) + { + TRACE("Property id %d (count %d, set %s)\n", i, propertyidsets[i].cPropertyIDs, + debugstr_guid(&propertyidsets[i].guidPropertySet)); + + propset[i].cProperties = propertyidsets[i].cPropertyIDs; + propset[i].rgProperties = CoTaskMemAlloc(propset[i].cProperties * sizeof(DBPROP)); + + for (j=0; j < propset[i].cProperties; j++) + { + propset[i].rgProperties[j].dwPropertyID = propertyidsets[i].rgPropertyIDs[j]; + + for(k = 0; k < ARRAY_SIZE(command->properties); k++) + { + if (command->properties[k].id == propertyidsets[i].rgPropertyIDs[j]) + { + V_VT(&propset[i].rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset[i].rgProperties[j].vValue, &command->properties[k].value); + break; + } + } + } + + + } + + *sets_cnt = count; + } + + *propertyset = propset; + + return S_OK; } static HRESULT WINAPI command_prop_SetProperties(ICommandProperties *iface, ULONG count, @@ -1129,6 +1286,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn struct msdasql_session *session = impl_from_IDBCreateCommand( iface ); struct command *command; HRESULT hr; + int i; TRACE("%p, %p, %s, %p\n", session, outer, debugstr_guid(riid), out); @@ -1148,6 +1306,86 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->refs = 1; command->query = NULL; + for(i = 0; i < ARRAY_SIZE(command->properties); i++) + { + command->properties[i].id = propsid[i]; + VariantInit(&command->properties[i].value); + + switch(propsid[i]) + { + case DBPROP_BOOKMARKTYPE: + case DBPROP_NOTIFICATIONGRANULARITY: + case DBPROP_ACCESSORDER: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 1; + break; + case DBPROP_MAXOPENROWS: + case DBPROP_MAXPENDINGROWS: + case DBPROP_MAXROWS: + case DBPROP_UPDATABILITY: + case DBPROP_BOOKMARKINFO: + case DBPROP_AUTH_ENCRYPT_PASSWORD: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 0; + break; + case DBPROP_FINDCOMPAREOPS: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 27; + break; + case DBPROP_NOTIFICATIONPHASES: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 31; + break; + case DBPROP_ROWTHREADMODEL: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 2; + break; + case DBPROP_NOTIFYCOLUMNSET: + case DBPROP_NOTIFYROWDELETE: + case DBPROP_NOTIFYROWFIRSTCHANGE: + case DBPROP_NOTIFYROWINSERT: + case DBPROP_NOTIFYROWRESYNCH: + case DBPROP_NOTIFYROWSETRELEASE: + case DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE: + case DBPROP_NOTIFYROWUNDOCHANGE: + case DBPROP_NOTIFYROWUNDODELETE: + case DBPROP_NOTIFYROWUNDOINSERT: + case DBPROP_NOTIFYROWUPDATE: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 3; + break; + case DBPROP_IAccessor: + case DBPROP_IColumnsInfo: + case DBPROP_IColumnsRowset: + case DBPROP_IRowset: + case DBPROP_IRowsetInfo: + case DBPROP_ISupportErrorInfo: + case DBPROP_IConvertType: + case DBPROP_IRowsetScroll: + case DBPROP_IRowsetRefresh: + command->properties[i].readonly = TRUE; + /* Fall through */ + case DBPROP_BLOCKINGSTORAGEOBJECTS: + case DBPROP_IMMOBILEROWS: + case DBPROP_LITERALIDENTITY: + case DBPROP_REENTRANTEVENTS: + case DBPROP_CHANGEINSERTEDROWS: + case DBPROP_ORDEREDBOOKMARKS: + case DBPROP_CLIENTCURSOR: + V_VT(&command->properties[i].value) = VT_BOOL; + V_BOOL(&command->properties[i].value) = VARIANT_TRUE; + break; + case DBPROP_AUTH_INTEGRATED: + V_VT(&command->properties[i].value) = VT_I4; + V_I4(&command->properties[i].value) = 14; + break; + default: + V_VT(&command->properties[i].value) = VT_BOOL; + V_BOOL(&command->properties[i].value) = VARIANT_FALSE; + break; + } + } + IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); hr = ICommandText_QueryInterface(&command->ICommandText_iface, riid, (void**)out); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b520b127d67..c40f92a273b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -34,9 +34,11 @@ DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + static BOOL db_created; static char mdbpath[MAX_PATH]; @@ -183,6 +185,149 @@ static void test_Properties(void) IDBProperties_Release(props); } +static void test_command_properties(ICommandProperties *props) +{ + HRESULT hr; + ULONG count; + DBPROPSET *propset; + int i; + + DWORD row_props[68] = { + DBPROP_ABORTPRESERVE, DBPROP_BLOCKINGSTORAGEOBJECTS, DBPROP_BOOKMARKS, DBPROP_BOOKMARKSKIPPED, + DBPROP_BOOKMARKTYPE, DBPROP_CANFETCHBACKWARDS, DBPROP_CANHOLDROWS, DBPROP_CANSCROLLBACKWARDS, + DBPROP_COLUMNRESTRICT, DBPROP_COMMITPRESERVE, DBPROP_DELAYSTORAGEOBJECTS, DBPROP_IMMOBILEROWS, + DBPROP_LITERALBOOKMARKS, DBPROP_LITERALIDENTITY, DBPROP_MAXOPENROWS, DBPROP_MAXPENDINGROWS, + DBPROP_MAXROWS, DBPROP_NOTIFICATIONPHASES, DBPROP_OTHERUPDATEDELETE, DBPROP_OWNINSERT, + DBPROP_OWNUPDATEDELETE, DBPROP_QUICKRESTART, DBPROP_REENTRANTEVENTS, DBPROP_REMOVEDELETED, + DBPROP_REPORTMULTIPLECHANGES, DBPROP_ROWRESTRICT, DBPROP_ROWTHREADMODEL, DBPROP_TRANSACTEDOBJECT, + DBPROP_UPDATABILITY, DBPROP_STRONGIDENTITY, DBPROP_IAccessor, DBPROP_IColumnsInfo, + DBPROP_IColumnsRowset, DBPROP_IConnectionPointContainer, DBPROP_IRowset, DBPROP_IRowsetChange, + DBPROP_IRowsetIdentity, DBPROP_IRowsetInfo, DBPROP_IRowsetLocate, DBPROP_IRowsetResynch, + DBPROP_IRowsetUpdate, DBPROP_ISupportErrorInfo, DBPROP_ISequentialStream, DBPROP_NOTIFYCOLUMNSET, + DBPROP_NOTIFYROWDELETE, DBPROP_NOTIFYROWFIRSTCHANGE, DBPROP_NOTIFYROWINSERT, DBPROP_NOTIFYROWRESYNCH, + DBPROP_NOTIFYROWSETRELEASE, DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE, DBPROP_NOTIFYROWUNDOCHANGE, DBPROP_NOTIFYROWUNDODELETE, + DBPROP_NOTIFYROWUNDOINSERT, DBPROP_NOTIFYROWUPDATE, DBPROP_CHANGEINSERTEDROWS, DBPROP_RETURNPENDINGINSERTS, + DBPROP_IConvertType, DBPROP_NOTIFICATIONGRANULARITY, DBPROP_IMultipleResults, DBPROP_ACCESSORDER, + DBPROP_BOOKMARKINFO, DBPROP_UNIQUEROWS, DBPROP_IRowsetFind, DBPROP_IRowsetScroll, + DBPROP_IRowsetRefresh, DBPROP_FINDCOMPAREOPS, DBPROP_ORDEREDBOOKMARKS, DBPROP_CLIENTCURSOR + }; + + DWORD prov_props[12] = { + DBPROP_ABORTPRESERVE, DBPROP_ACTIVESESSIONS, DBPROP_ASYNCTXNCOMMIT, DBPROP_AUTH_CACHE_AUTHINFO, + DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROP_AUTH_INTEGRATED, DBPROP_AUTH_MASK_PASSWORD, DBPROP_AUTH_PASSWORD, + DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, DBPROP_BLOCKINGSTORAGEOBJECTS + }; + + hr = ICommandProperties_GetProperties(props, 0, NULL, &count, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 2, "got %d\n", count); + ok(propset[0].cProperties == 68, "got %d\n", propset[0].cProperties); + ok(propset[1].cProperties == 12, "got %d\n", propset[1].cProperties); + + ok(IsEqualGUID(&DBPROPSET_ROWSET, &propset[0].guidPropertySet), "got %s\n", + debugstr_guid(&propset[0].guidPropertySet)); + for (i = 0; i < propset[0].cProperties; i++) + { + ok(propset[0].rgProperties[i].dwPropertyID == row_props[i], "%d: got 0x%08x\n", i, propset[0].rgProperties[i].dwPropertyID); + + switch(propset[0].rgProperties[i].dwPropertyID ) + { + case DBPROP_BOOKMARKTYPE: + case DBPROP_NOTIFICATIONGRANULARITY: + case DBPROP_ACCESSORDER: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 1, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_MAXOPENROWS: + case DBPROP_MAXPENDINGROWS: + case DBPROP_MAXROWS: + case DBPROP_UPDATABILITY: + case DBPROP_BOOKMARKINFO: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 0, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_FINDCOMPAREOPS: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 27, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_NOTIFICATIONPHASES: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 31, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_ROWTHREADMODEL: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 2, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_NOTIFYCOLUMNSET: + case DBPROP_NOTIFYROWDELETE: + case DBPROP_NOTIFYROWFIRSTCHANGE: + case DBPROP_NOTIFYROWINSERT: + case DBPROP_NOTIFYROWRESYNCH: + case DBPROP_NOTIFYROWSETRELEASE: + case DBPROP_NOTIFYROWSETFETCHPOSITIONCHANGE: + case DBPROP_NOTIFYROWUNDOCHANGE: + case DBPROP_NOTIFYROWUNDODELETE: + case DBPROP_NOTIFYROWUNDOINSERT: + case DBPROP_NOTIFYROWUPDATE: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_I4(&propset[0].rgProperties[i].vValue) == 3, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + case DBPROP_BLOCKINGSTORAGEOBJECTS: + case DBPROP_IMMOBILEROWS: + case DBPROP_LITERALIDENTITY: + case DBPROP_REENTRANTEVENTS: + case DBPROP_IAccessor: + case DBPROP_IColumnsInfo: + case DBPROP_IColumnsRowset: + case DBPROP_IRowset: + case DBPROP_IRowsetInfo: + case DBPROP_ISupportErrorInfo: + case DBPROP_CHANGEINSERTEDROWS: + case DBPROP_IConvertType: + case DBPROP_IRowsetScroll: + case DBPROP_IRowsetRefresh: + case DBPROP_ORDEREDBOOKMARKS: + case DBPROP_CLIENTCURSOR: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_BOOL(&propset[0].rgProperties[i].vValue) == VARIANT_TRUE, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + default: + ok(V_VT(&propset[0].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[0].rgProperties[i].vValue)); + ok(V_BOOL(&propset[0].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[0].rgProperties[i].vValue)); + break; + } + } + + ok(IsEqualGUID(&DBPROPSET_PROVIDERROWSET, &propset[1].guidPropertySet), "got %s\n", + debugstr_guid(&propset[1].guidPropertySet)); + for (i = 0; i < propset[1].cProperties; i++) + { + ok(propset[1].rgProperties[i].dwPropertyID == prov_props[i], "%d: got 0x%08x\n", i, propset[1].rgProperties[i].dwPropertyID); + + switch(propset[1].rgProperties[i].dwPropertyID ) + { + case DBPROP_AUTH_ENCRYPT_PASSWORD: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_I4(&propset[1].rgProperties[i].vValue) == 0, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + case DBPROP_AUTH_INTEGRATED: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_I4, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_I4(&propset[1].rgProperties[i].vValue) == 14, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + case DBPROP_BLOCKINGSTORAGEOBJECTS: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + todo_wine ok(V_BOOL(&propset[1].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + default: + ok(V_VT(&propset[1].rgProperties[i].vValue) == VT_BOOL, "%d: got %d\n", i, V_VT(&propset[1].rgProperties[i].vValue)); + ok(V_BOOL(&propset[1].rgProperties[i].vValue) == VARIANT_FALSE, "%d: got %d\n", i, V_I4(&propset[1].rgProperties[i].vValue)); + break; + } + } + + CoTaskMemFree(propset); +} + static void test_command_interfaces(IUnknown *cmd) { HRESULT hr; @@ -198,6 +343,7 @@ static void test_command_interfaces(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); ok(hr == S_OK, "got 0x%08x\n", hr); + test_command_properties(commandProp); ICommandProperties_Release(commandProp); hr = IUnknown_QueryInterface(cmd, &IID_ICommandWithParameters, (void**)&cmdwithparams); -- 2.33.0

1 0

[PATCH vkd3d v2] vkd3d-shader/hlsl: Add cross() intrinsic function and test.
by Francisco Casas 18 Nov '21

18 Nov '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + libs/vkd3d-shader/hlsl.y | 79 ++++++++++++++++++++++++++++++++++++++++ tests/cross.shader_test | 13 +++++++ 3 files changed, 94 insertions(+) create mode 100644 tests/cross.shader_test diff --git a/Makefile.am b/Makefile.am index d6e14cf1..307c32a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ vkd3d_shader_tests = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/cross.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-clamp.shader_test \ @@ -285,6 +286,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ + tests/cross.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-comma.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2120b26f..e04b9ef0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1611,6 +1611,84 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_cross(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_swizzle *arg1_swzl1, *arg1_swzl2, *arg2_swzl1, *arg2_swzl2; + struct hlsl_ir_node *arg1 = params->args[0], *arg2 = params->args[1]; + struct hlsl_ir_node *arg1_cast, *arg2_cast, *mul1_neg; + struct hlsl_ir_expr *mul1, *mul2; + struct hlsl_type *cast_type; + enum hlsl_base_type base; + int wrong_arg = -1; + + if (arg2->data_type->type != HLSL_CLASS_VECTOR) + wrong_arg = 1; + if(arg2->data_type->dimx != 3 && arg2->data_type->dimx != 4) + wrong_arg = 1; + + if (arg1->data_type->type != HLSL_CLASS_VECTOR) + wrong_arg = 0; + if (arg1->data_type->dimx != 3 && arg1->data_type->dimx != 4) + wrong_arg = 0; + + if (wrong_arg != -1) + { + struct vkd3d_string_buffer *string; + if ((string = hlsl_type_to_string(ctx, params->args[wrong_arg]->data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument %d of 'cross': '%s'.", wrong_arg, string->buffer); + hlsl_release_string_buffer(ctx, string); + return false; + } + + if (arg1->data_type->base_type == HLSL_TYPE_HALF && arg2->data_type->base_type == HLSL_TYPE_HALF){ + base = HLSL_TYPE_HALF; + } else { + base = HLSL_TYPE_FLOAT; + } + base = expr_common_base_type(base, arg1->data_type->base_type); + base = expr_common_base_type(base, arg2->data_type->base_type); + + cast_type = hlsl_get_vector_type(ctx, base, 3); + + if (!(arg1_cast = add_implicit_conversion(ctx, params->instrs, arg1, cast_type, &loc))) + return false; + + if (!(arg2_cast = add_implicit_conversion(ctx, params->instrs, arg2, cast_type, &loc))) + return false; + + if (!(arg1_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl1->node.entry); + + if (!(arg2_swzl1 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl1->node.entry); + + if (!(mul1 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl1->node, &arg2_swzl1->node, &loc))) + return false; + + if (!(mul1_neg = hlsl_new_unary_expr(ctx, HLSL_OP1_NEG, &mul1->node, loc))) + return false; + list_add_tail(params->instrs, &mul1_neg->entry); + + if (!(arg1_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Y, Z, X, Y), 3, arg1_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg1_swzl2->node.entry); + + if (!(arg2_swzl2 = hlsl_new_swizzle(ctx, HLSL_SWIZZLE(Z, X, Y, Z), 3, arg2_cast, &loc))) + return false; + list_add_tail(params->instrs, &arg2_swzl2->node.entry); + + if (!(mul2 = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, + &arg1_swzl2->node, &arg2_swzl2->node, &loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_ADD, &mul2->node, mul1_neg, &loc); +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1628,6 +1706,7 @@ intrinsic_functions[] = { {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, + {"cross", 2, true, intrinsic_cross}, {"max", 2, true, intrinsic_max}, {"pow", 2, true, intrinsic_pow}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/cross.shader_test b/tests/cross.shader_test new file mode 100644 index 00000000..59197db0 --- /dev/null +++ b/tests/cross.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main(uniform float4 u, uniform float4 v) : sv_target +{ + float4 res = float4(0,0,0,0); + res.xyz = cross(u,v); + return res; +} + +[test] +uniform 0 float4 1 -2 3 4 +uniform 4 float4 10 100 1000 10000 +draw quad +probe all rgba (-2300, -970, 120, 0) -- 2.25.1

2 1

[PATCH 1/4] ntdll: Implement NtAlertThreadByThreadId and NtWaitForAlertByThreadId.
by Zebediah Figura 18 Nov '21

18 Nov '21

These will be used to implement RtlWaitOnAddress() and other in-process synchronization primitives, as they are on Windows. These patches went through quite a few revisions in order to ensure that they had sufficient performance and correctness compared to the current implementation. I am particularly grateful to Etienne Juvigny and Dmitry Skvortsov for performing extensive testing. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 4 ++ dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/sync.c | 93 ++++++++++++++++++++++++++++++++++++++++ dlls/wow64/sync.c | 23 ++++++++++ dlls/wow64/syscall.h | 2 + include/winternl.h | 2 + 6 files changed, 126 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e7c1fa1dcf3..e5a49ba1a1f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -140,6 +140,7 @@ @ stdcall -syscall NtAdjustPrivilegesToken(long long ptr long ptr ptr) @ stdcall -syscall NtAlertResumeThread(long ptr) @ stdcall -syscall NtAlertThread(long) +@ stdcall -syscall NtAlertThreadByThreadId(ptr) @ stdcall -syscall NtAllocateLocallyUniqueId(ptr) # @ stub NtAllocateUserPhysicalPages @ stdcall -syscall NtAllocateUuids(ptr ptr ptr ptr) @@ -424,6 +425,7 @@ @ stdcall -syscall NtUnmapViewOfSection(long ptr) # @ stub NtVdmControl # @ stub NtW32Call +@ stdcall -syscall NtWaitForAlertByThreadId(ptr ptr) @ stdcall -syscall NtWaitForDebugEvent(long long ptr ptr) @ stdcall -syscall NtWaitForKeyedEvent(long ptr long ptr) @ stdcall -syscall NtWaitForMultipleObjects(long ptr long long ptr) @@ -1161,6 +1163,7 @@ @ stdcall -private -syscall ZwAdjustPrivilegesToken(long long ptr long ptr ptr) NtAdjustPrivilegesToken @ stdcall -private -syscall ZwAlertResumeThread(long ptr) NtAlertResumeThread @ stdcall -private -syscall ZwAlertThread(long) NtAlertThread +@ stdcall -private -syscall ZwAlertThreadByThreadId(ptr) NtAlertThreadByThreadId @ stdcall -private -syscall ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId # @ stub ZwAllocateUserPhysicalPages @ stdcall -private -syscall ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @@ -1443,6 +1446,7 @@ @ stdcall -private -syscall ZwUnmapViewOfSection(long ptr) NtUnmapViewOfSection # @ stub ZwVdmControl # @ stub ZwW32Call +@ stdcall -private -syscall ZwWaitForAlertByThreadId(ptr ptr) NtWaitForAlertByThreadId @ stdcall -private -syscall ZwWaitForDebugEvent(long long ptr ptr) NtWaitForDebugEvent @ stdcall -private -syscall ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent @ stdcall -private -syscall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 426d18e52d6..a411b01a389 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -133,6 +133,7 @@ static void * const syscalls[] = NtAdjustPrivilegesToken, NtAlertResumeThread, NtAlertThread, + NtAlertThreadByThreadId, NtAllocateLocallyUniqueId, NtAllocateUuids, NtAllocateVirtualMemory, @@ -335,6 +336,7 @@ static void * const syscalls[] = NtUnlockFile, NtUnlockVirtualMemory, NtUnmapViewOfSection, + NtWaitForAlertByThreadId, NtWaitForDebugEvent, NtWaitForKeyedEvent, NtWaitForMultipleObjects, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 964458a28a2..e58f3bd9261 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -33,6 +33,9 @@ #include <limits.h> #include <signal.h> #include <sys/types.h> +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif #ifdef HAVE_SYS_SYSCALL_H #include <sys/syscall.h> #endif @@ -75,6 +78,12 @@ static const LARGE_INTEGER zero_timeout; static pthread_mutex_t addr_mutex = PTHREAD_MUTEX_INITIALIZER; +static const char *debugstr_timeout( const LARGE_INTEGER *timeout ) +{ + if (!timeout) return "(infinite)"; + return wine_dbgstr_longlong( timeout->QuadPart ); +} + /* return a monotonic time counter, in Win32 ticks */ static inline ULONGLONG monotonic_counter(void) { @@ -2388,6 +2397,90 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl } +union tid_alert_entry +{ + HANDLE event; +}; + +#define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) +static union tid_alert_entry *tid_alert_blocks[4096]; + +static unsigned int handle_to_index( HANDLE handle, unsigned int *block_idx ) +{ + unsigned int idx = (wine_server_obj_handle(handle) >> 2) - 1; + *block_idx = idx / TID_ALERT_BLOCK_SIZE; + return idx % TID_ALERT_BLOCK_SIZE; +} + +static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) +{ + unsigned int block_idx, idx = handle_to_index( tid, &block_idx ); + union tid_alert_entry *entry; + + if (block_idx > ARRAY_SIZE(tid_alert_blocks)) + { + FIXME( "tid %p is too high\n", tid ); + return NULL; + } + + if (!tid_alert_blocks[block_idx]) + { + static const size_t size = TID_ALERT_BLOCK_SIZE * sizeof(union tid_alert_entry); + void *ptr = anon_mmap_alloc( size, PROT_READ | PROT_WRITE ); + if (ptr == MAP_FAILED) return NULL; + if (InterlockedCompareExchangePointer( (void **)&tid_alert_blocks[block_idx], ptr, NULL )) + munmap( ptr, size ); /* someone beat us to it */ + } + + entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; + + if (!entry->event) + { + HANDLE event; + + if (NtCreateEvent( &event, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE )) + return NULL; + if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) + NtClose( event ); + } + + return entry; +} + + +/*********************************************************************** + * NtAlertThreadByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( tid ); + + TRACE( "%p\n", tid ); + + if (!entry) return STATUS_INVALID_CID; + + return NtSetEvent( entry->event, NULL ); +} + + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + NTSTATUS status; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + + status = NtWaitForSingleObject( entry->event, FALSE, timeout ); + if (!status) return STATUS_ALERTED; + return status; +} + + #ifdef __linux__ NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index e2e9468a727..fbd039f644c 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -1587,3 +1587,26 @@ NTSTATUS WINAPI wow64_NtYieldExecution( UINT *args ) { return NtYieldExecution(); } + + +/********************************************************************** + * wow64_NtAlertThreadByThreadId + */ +NTSTATUS WINAPI wow64_NtAlertThreadByThreadId( UINT *args ) +{ + HANDLE tid = get_handle( &args ); + + return NtAlertThreadByThreadId( tid ); +} + + +/********************************************************************** + * wow64_NtWaitForAlertByThreadId + */ +NTSTATUS WINAPI wow64_NtWaitForAlertByThreadId( UINT *args ) +{ + const void *address = get_ptr( &args ); + const LARGE_INTEGER *timeout = get_ptr( &args ); + + return NtWaitForAlertByThreadId( address, timeout ); +} diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index bc403dd6d31..112711875f7 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -30,6 +30,7 @@ SYSCALL_ENTRY( NtAdjustPrivilegesToken ) \ SYSCALL_ENTRY( NtAlertResumeThread ) \ SYSCALL_ENTRY( NtAlertThread ) \ + SYSCALL_ENTRY( NtAlertThreadByThreadId ) \ SYSCALL_ENTRY( NtAllocateLocallyUniqueId ) \ SYSCALL_ENTRY( NtAllocateUuids ) \ SYSCALL_ENTRY( NtAllocateVirtualMemory ) \ @@ -231,6 +232,7 @@ SYSCALL_ENTRY( NtUnlockFile ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ SYSCALL_ENTRY( NtUnmapViewOfSection ) \ + SYSCALL_ENTRY( NtWaitForAlertByThreadId ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ diff --git a/include/winternl.h b/include/winternl.h index eea97f1238b..cfd83f16337 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3858,6 +3858,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); +NTSYSAPI NTSTATUS WINAPI NtAlertThreadByThreadId(HANDLE); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); @@ -4097,6 +4098,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PL NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); +NTSYSAPI NTSTATUS WINAPI NtWaitForAlertByThreadId(const void*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*); NTSYSAPI NTSTATUS WINAPI NtWaitForKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*); -- 2.33.0

3 10

[PATCH 1/5] ntdll: Implement thread-ID alerts using Mach semaphores on Mac.
by Zebediah Figura 18 Nov '21

18 Nov '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 75 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 59fe6bea8f5..cdc63c8a6ef 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2341,10 +2341,14 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { +#ifdef __APPLE__ + semaphore_t sem; +#else HANDLE event; #ifdef __linux__ int futex; #endif +#endif }; #define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) @@ -2379,6 +2383,17 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; +#ifdef __APPLE__ + if (!entry->sem) + { + semaphore_t sem; + + if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) + return NULL; + if (InterlockedCompareExchange( (int *)&entry->sem, sem, NULL )) + semaphore_destroy( mach_task_self(), sem ); + } +#else #ifdef __linux__ if (use_futexes()) return entry; @@ -2393,6 +2408,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) NtClose( event ); } +#endif return entry; } @@ -2409,6 +2425,10 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; +#ifdef __APPLE__ + semaphore_signal( entry->sem ); + return STATUS_SUCCESS; +#else #ifdef __linux__ if (use_futexes()) { @@ -2420,10 +2440,11 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) #endif return NtSetEvent( entry->event, NULL ); +#endif } -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2446,6 +2467,57 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif +#ifdef __APPLE__ + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + semaphore_t sem; + ULONGLONG end; + kern_return_t ret; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + sem = entry->sem; + + if (timeout) + { + if (timeout->QuadPart == TIMEOUT_INFINITE) + timeout = NULL; + else + end = get_absolute_timeout( timeout ); + } + + for (;;) + { + if (timeout) + { + LONGLONG timeleft = update_timeout( end ); + mach_timespec_t timespec; + + timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + ret = semaphore_timedwait( sem, timespec ); + } + else + ret = semaphore_wait( sem ); + + switch (ret) + { + case KERN_SUCCESS: return STATUS_ALERTED; + case KERN_ABORTED: continue; + case KERN_OPERATION_TIMED_OUT: return STATUS_TIMEOUT; + default: return STATUS_INVALID_HANDLE; + } + } +} + +#else + /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) */ @@ -2498,6 +2570,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG return status; } +#endif #ifdef __linux__ -- 2.33.0

1 4

[PATCH] include: Add wine/unixlib.h to the list of public includes.
by Dmitry Timoshkov 17 Nov '21

17 Nov '21

To allow creating 3rd party modules that use wine unix call interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/include/Makefile.in b/include/Makefile.in index df049fd284f..c722ac79562 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -787,6 +787,7 @@ SOURCES = \ wine/itss.idl \ wine/orpc.idl \ wine/svcctl.idl \ + wine/unixlib.h \ wine/winedxgi.idl \ winerror.h \ winevt.h \ -- 2.33.1

2 1

[PATCH] crypt32: Avoid truncating unicode chars.
by Dmitry Timoshkov 17 Nov '21

17 Nov '21

So that strings containing Cyrillic Capital Letter ER (0x420) won't be quoted when not needed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/str.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 0ab4c7c6e85..0e75a674b55 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -156,7 +156,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, return ret; } -static inline BOOL is_quotable_char(char c) +static inline BOOL is_quotable_char(WCHAR c) { switch(c) { -- 2.33.1

2 1

[PATCH v2 01/12] mshtml: Clear the string dprop associated with the builtin attribute when removing it.
by Gabriel Ivăncescu 17 Nov '21

17 Nov '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 13 ++++--- dlls/mshtml/tests/documentmode.js | 56 +++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 96a776d..4605fda 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1463,13 +1463,18 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) *success = VARIANT_TRUE; return S_OK; } + *success = VARIANT_TRUE; V_VT(&var) = VT_EMPTY; hres = builtin_propput(This, func, &dp, NULL); - if(FAILED(hres)) - return hres; - - *success = VARIANT_TRUE; + if(FAILED(hres)) { + VARIANT *ref; + hres = dispex_get_dprop_ref(This, func->name, FALSE, &ref); + if(FAILED(hres) || V_VT(ref) != VT_BSTR) + *success = VARIANT_FALSE; + else + VariantClear(ref); + } return S_OK; } default: diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d566223..9db1b4f 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1087,6 +1087,62 @@ sync_test("elem_attr", function() { ok(r === "cls2", "class attr = " + r); r = elem.getAttribute("className"); ok(r === "cls3", "className attr = " + r); + + var func = function() { }; + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + ok(r === (v < 8 ? func : null), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? false : undefined), "removeAttribute returned " + r); + todo_wine_if(v === 8). + ok(elem.onclick === (v != 8 ? func : null), "removed onclick = " + elem.onclick); + + elem.onclick_test = func; + ok(elem.onclick_test === func, "onclick_test = " + elem.onclick_test); + r = elem.getAttribute("onclick_test"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? func.toString() : null)), "onclick_test attr = " + r); + + elem.setAttribute("onclick", "test"); + r = elem.getAttribute("onclick"); + ok(r === "test", "onclick attr after setAttribute = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute after setAttribute returned " + r); + + /* IE11 returns an empty function, which we can't check directly */ + todo_wine_if(v >= 8). + ok((v < 11) ? (elem.onclick === null) : (elem.onclick !== func), "removed onclick after setAttribute = " + elem.onclick); + + r = Object.prototype.toString.call(elem.onclick); + todo_wine_if(v >= 8 && v < 11). + ok(r === (v < 9 ? "[object Object]" : (v < 11 ? "[object Null]" : "[object Function]")), + "removed onclick after setAttribute Object.toString returned " + r); + + elem.setAttribute("onclick", "string"); + r = elem.getAttribute("onclick"); + ok(r === "string", "onclick attr after setAttribute = " + r); + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? null : "string")), "onclick attr = " + r); + elem.onclick = "test"; + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? "test" : "string"), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute returned " + r); + todo_wine_if(v >= 8). + ok(elem.onclick === null, "removed onclick = " + elem.onclick); + + elem.setAttribute("ondblclick", "string"); + r = elem.getAttribute("ondblclick"); + ok(r === "string", "ondblclick string = " + r); + r = elem.removeAttribute("ondblclick"); + ok(r === (v < 9 ? true : undefined), "ondblclick string removeAttribute returned " + r); + ok(elem.ondblclick === null, "removed ondblclick string = " + elem.ondblclick); }); sync_test("__proto__", function() { -- 2.31.1

3 23

[PATCH] avicap32: Fix typo in comment
by André Zwing 17 Nov '21

17 Nov '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/avicap32/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index ef41b7e281b..4b285d94c3c 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -143,4 +143,4 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = #endif /* _WIN64 */ -#endif /* HAVE_LINUX_VIDEODEV_2 */ +#endif /* HAVE_LINUX_VIDEODEV2_H */ -- 2.25.1

1 0

[PATCH] avicap32: Fix typo in comment
by André Zwing 17 Nov '21

17 Nov '21

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/avicap32/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index ef41b7e281b..4b285d94c3c 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -143,4 +143,4 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = #endif /* _WIN64 */ -#endif /* HAVE_LINUX_VIDEODEV_2 */ +#endif /* HAVE_LINUX_VIDEODEV2_H */ -- 2.25.1

2 1

[PATCH v2] winecfg: Add the command line options to the man page.
by Floris Renaud 17 Nov '21

17 Nov '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- programs/winecfg/winecfg.man.in | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in index 522d2a0e812..fc624504388 100644 --- a/programs/winecfg/winecfg.man.in +++ b/programs/winecfg/winecfg.man.in @@ -1,14 +1,32 @@ -.TH WINECFG 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.TH WINECFG 1 "November 2021" "@PACKAGE_STRING@" "Wine Programs" .SH NAME winecfg \- Wine Configuration Editor .SH SYNOPSIS -.BR "winecfg" +.B winecfg +.RI [ options ] .SH DESCRIPTION .B winecfg is the Wine configuration editor. It allows you to change several settings, such as DLL load order (native versus builtin), enable a virtual desktop, setup disk drives, and change the Wine audio driver, among others. Many of these settings can be made on a per application basis, for example, preferring native riched20.dll for wordpad.exe, but not for notepad.exe. + +If no option is given launch the graphical version of +.BR winecfg . +.SH OPTIONS +.TP +\fB\-v \fR[\fIversion\fR], \fB/v \fR[\fB\fIversion\fR] +Set global Windows version to +.I version +and exit. +If +.I version +is not specified, display the current global Windows version and exit. +.TP +.BR \-? ", " /? +Display help, valid versions for +.I version +and exit. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org -- 2.33.1

1 0

[PATCH v2] dsound: Correctly report hardware audio buffers as unsupported.
by Eduard Permyakov 17 Nov '21

17 Nov '21

Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/dsound/dsound.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 3085d86e5b5..bcff0d8642a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -373,12 +373,12 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; - device->drvcaps.dwMaxHwMixingAllBuffers = 16; + device->drvcaps.dwMaxHwMixingAllBuffers = 1; device->drvcaps.dwMaxHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwMaxHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; - device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; - device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers; - device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers; + device->drvcaps.dwFreeHwMixingAllBuffers = 0; + device->drvcaps.dwFreeHwMixingStaticBuffers = 0; + device->drvcaps.dwFreeHwMixingStreamingBuffers = 0; ZeroMemory(&device->volpan, sizeof(device->volpan)); @@ -435,11 +435,10 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( } if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) && - dsbd->dwFlags & DSBCAPS_LOCHARDWARE && - device->drvcaps.dwFreeHwMixingAllBuffers == 0) + dsbd->dwFlags & DSBCAPS_LOCHARDWARE) { - WARN("ran out of emulated hardware buffers\n"); - return DSERR_ALLOCATED; + WARN("unable to create hardware buffer\n"); + return DSERR_UNSUPPORTED; } if (dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) { -- 2.25.1

3 2

[PATCH v2 6/6] winecoreaudio: Store the channel count and period_ms directly in the audio client.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 41 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ebab18df75b..1e37a2a9026 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -124,6 +124,7 @@ struct ACImpl { IUnknown *pUnkFTMarshal; EDataFlow dataflow; + UINT32 channel_count, period_ms; DWORD flags; HANDLE event; float *vols; @@ -1179,7 +1180,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); HRESULT hr; OSStatus sc; - int i; + UINT32 i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); @@ -1342,20 +1343,22 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign); } - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); - if(!This->vols){ - CoTaskMemFree(This->stream->fmt); - This->stream->fmt = NULL; - OSSpinLockUnlock(&This->stream->lock); - LeaveCriticalSection(&g_sessions_lock); - return E_OUTOFMEMORY; - } - - for(i = 0; i < fmt->nChannels; ++i) - This->vols[i] = 1.f; - This->stream->share = mode; This->flags = flags; + This->channel_count = fmt->nChannels; + This->period_ms = period / 10000; + + This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float)); + if(!This->vols){ + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); + return E_OUTOFMEMORY; + } + + for(i = 0; i < This->channel_count; ++i) + This->vols[i] = 1.f; hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); @@ -1906,7 +1909,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(This->event && !This->timer) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->stream->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ This->timer = NULL; OSSpinLockUnlock(&This->stream->lock); WARN("Unable to create timer: %u\n", GetLastError()); @@ -3173,7 +3176,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->stream->fmt->nChannels; + *out = This->channel_count; return S_OK; } @@ -3189,7 +3192,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->stream->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; EnterCriticalSection(&g_sessions_lock); @@ -3214,7 +3217,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->stream->fmt->nChannels) + if(index >= This->channel_count) return E_INVALIDARG; *level = This->vols[index]; @@ -3234,7 +3237,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->stream->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&g_sessions_lock); @@ -3260,7 +3263,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->stream->fmt->nChannels) + if(count != This->channel_count) return E_INVALIDARG; EnterCriticalSection(&g_sessions_lock); -- 2.33.1

1 0

[PATCH v2 5/6] winecoreaudio: Use the global lock to protect the audio client.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 115 +++++++++++++++--------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index e82962db1ba..ebab18df75b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1234,16 +1234,19 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); if(This->initted){ - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; } + OSSpinLockLock(&This->stream->lock); + This->stream->fmt = clone_format(fmt); if(!This->stream->fmt){ OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1259,6 +1262,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return hr; } @@ -1278,6 +1282,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } }else{ @@ -1294,6 +1299,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } } @@ -1308,6 +1314,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } @@ -1323,6 +1330,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return osstatus_to_hresult(sc); } @@ -1339,6 +1347,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return E_OUTOFMEMORY; } @@ -1348,29 +1357,26 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->stream->share = mode; This->flags = flags; - EnterCriticalSection(&g_sessions_lock); - hr = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session); if(FAILED(hr)){ - LeaveCriticalSection(&g_sessions_lock); CoTaskMemFree(This->stream->fmt); This->stream->fmt = NULL; HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return E_INVALIDARG; } list_add_tail(&This->session->clients, &This->entry); - LeaveCriticalSection(&g_sessions_lock); - ca_setvol(This, -1); This->initted = TRUE; OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -1983,41 +1989,35 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, HANDLE event) { ACImpl *This = impl_from_IAudioClient3(iface); + HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", This, event); if(!event) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); - if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_INITIALIZED; - } - - if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; - } - - if (This->event){ - OSSpinLockUnlock(&This->stream->lock); + if(!This->initted) + hr = AUDCLNT_E_NOT_INITIALIZED; + else if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)) + hr = AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; + else if(This->event){ FIXME("called twice\n"); - return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - } + hr = HRESULT_FROM_WIN32(ERROR_INVALID_NAME); + }else + This->event = event; - This->event = event; + LeaveCriticalSection(&g_sessions_lock); - OSSpinLockUnlock(&This->stream->lock); - - return S_OK; + return hr; } static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, void **ppv) { ACImpl *This = impl_from_IAudioClient3(iface); + HRESULT hr; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); @@ -2025,24 +2025,24 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); if(!This->initted){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_NOT_INITIALIZED; + hr = AUDCLNT_E_NOT_INITIALIZED; + goto end; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto end; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - OSSpinLockUnlock(&This->stream->lock); - return AUDCLNT_E_WRONG_ENDPOINT_TYPE; + hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE; + goto end; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; @@ -2056,8 +2056,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } }else IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); @@ -2067,8 +2067,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } }else IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); @@ -2078,8 +2078,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->stream->lock); - return E_OUTOFMEMORY; + hr = E_OUTOFMEMORY; + goto end; } }else ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); @@ -2087,15 +2087,15 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } - if(*ppv){ - OSSpinLockUnlock(&This->stream->lock); - return S_OK; + if(*ppv) hr = S_OK; + else{ + return E_NOINTERFACE; + FIXME("stub %s\n", debugstr_guid(riid)); } - OSSpinLockUnlock(&This->stream->lock); - - FIXME("stub %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; +end: + LeaveCriticalSection(&g_sessions_lock); + return hr; } static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient3 *iface, @@ -2749,17 +2749,20 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) { AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; + + EnterCriticalSection(&g_sessions_lock); + ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - OSSpinLockLock(&This->client->stream->lock); This->client->session_wrapper = NULL; - OSSpinLockUnlock(&This->client->stream->lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } + + LeaveCriticalSection(&g_sessions_lock); return ref; } @@ -3189,14 +3192,14 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); ret = ca_setvol(This, index); - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3223,7 +3226,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( IAudioStreamVolume *iface, UINT32 count, const float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + UINT32 i; HRESULT ret; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3234,14 +3237,14 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; ret = ca_setvol(This, -1); - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3250,7 +3253,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( IAudioStreamVolume *iface, UINT32 count, float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + UINT32 i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3260,12 +3263,12 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->stream->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - OSSpinLockUnlock(&This->stream->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } -- 2.33.1

1 0

[PATCH v2 4/6] winecoreaudio: Use the global lock to lock the session.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Mainly just for simplicity. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 11be188d110..e82962db1ba 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -96,8 +96,6 @@ typedef struct _AudioSession { float *channel_vols; BOOL mute; - CRITICAL_SECTION lock; - struct list entry; } AudioSession; @@ -827,9 +825,6 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); - InitializeCriticalSection(&ret->lock); - ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); - session_init_vols(ret, num_channels); ret->master_vol = 1.f; @@ -3056,13 +3051,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->master_vol = level; ret = ca_session_setvol(session, -1); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3094,13 +3089,13 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->mute = mute; ca_session_setvol(session, -1); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return S_OK; } @@ -3356,14 +3351,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); session->channel_vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); ret = ca_session_setvol(session, index); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } @@ -3408,14 +3403,14 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( if(context) FIXME("Notifications not supported yet\n"); - EnterCriticalSection(&session->lock); + EnterCriticalSection(&g_sessions_lock); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; ret = ca_session_setvol(session, -1); - LeaveCriticalSection(&session->lock); + LeaveCriticalSection(&g_sessions_lock); return ret; } -- 2.33.1

1 0

[PATCH v2 3/6] winecoreaudio: Introduce a stream structure.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/mmdevdrv.c | 633 +++++++++++++++--------------- dlls/winecoreaudio.drv/unixlib.h | 23 ++ 2 files changed, 337 insertions(+), 319 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f8b538971f2..11be188d110 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -125,35 +125,21 @@ struct ACImpl { IMMDevice *parent; IUnknown *pUnkFTMarshal; - WAVEFORMATEX *fmt; - EDataFlow dataflow; DWORD flags; - AUDCLNT_SHAREMODE share; HANDLE event; float *vols; BOOL initted; AudioDeviceID adevid; AudioObjectPropertyScope scope; - AudioConverterRef converter; - AudioComponentInstance unit; - AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ HANDLE timer; - UINT32 period_ms, bufsize_frames, period_frames; - UINT64 written_frames; - UINT32 lcl_offs_frames, wri_offs_frames, held_frames, tmp_buffer_frames; - UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames, wrap_bufsize_frames, resamp_bufsize_frames; - INT32 getbuf_last; - BOOL playing; - BYTE *cap_buffer, *wrap_buffer, *resamp_buffer, *local_buffer, *tmp_buffer; AudioSession *session; AudioSessionWrapper *session_wrapper; + struct coreaudio_stream *stream; struct list entry; - - OSSpinLock lock; }; static const IAudioClient3Vtbl AudioClient3_Vtbl; @@ -556,6 +542,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; + This->stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!This->stream){ + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } This->IAudioClient3_iface.lpVtbl = &AudioClient3_Vtbl; This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl; @@ -571,14 +562,16 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient else if(dataflow == eCapture) This->scope = kAudioDevicePropertyScopeInput; else{ + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return E_INVALIDARG; } - This->lock = 0; + This->stream->lock = 0; hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient3_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return hr; } @@ -588,7 +581,8 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->adevid = adevid; - if(!(This->unit = get_audiounit(This->dataflow, This->adevid))){ + if(!(This->stream->unit = get_audiounit(This->dataflow, This->adevid))){ + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); return AUDCLNT_E_DEVICE_INVALIDATED; } @@ -650,24 +644,25 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) WaitForSingleObject(event, INFINITE); CloseHandle(event); } - AudioOutputUnitStop(This->unit); - AudioComponentInstanceDispose(This->unit); - if(This->converter) - AudioConverterDispose(This->converter); + AudioOutputUnitStop(This->stream->unit); + AudioComponentInstanceDispose(This->stream->unit); + if(This->stream->converter) + AudioConverterDispose(This->stream->converter); if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - HeapFree(GetProcessHeap(), 0, This->cap_buffer); - HeapFree(GetProcessHeap(), 0, This->local_buffer); - free(This->wrap_buffer); - HeapFree(GetProcessHeap(), 0, This->resamp_buffer); - CoTaskMemFree(This->fmt); + HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->cap_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->local_buffer); + free(This->stream->wrap_buffer); + HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); + CoTaskMemFree(This->stream->fmt); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); + HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -890,14 +885,14 @@ static void ca_wrap_buffer(BYTE *dst, UINT32 dst_offs, UINT32 dst_bytes, static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) { - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->stream->fmt; + if((This->stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) - memset(buffer, 128, frames * This->fmt->nBlockAlign); + This->stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->stream->fmt->nBlockAlign); else - memset(buffer, 0, frames * This->fmt->nBlockAlign); + memset(buffer, 0, frames * This->stream->fmt->nBlockAlign); } /* CA is pulling data from us */ @@ -908,31 +903,31 @@ static OSStatus ca_render_cb(void *user, AudioUnitRenderActionFlags *flags, ACImpl *This = user; UINT32 to_copy_bytes, to_copy_frames, chunk_bytes, lcl_offs_bytes; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->playing){ - lcl_offs_bytes = This->lcl_offs_frames * This->fmt->nBlockAlign; - to_copy_frames = min(nframes, This->held_frames); - to_copy_bytes = to_copy_frames * This->fmt->nBlockAlign; + if(This->stream->playing){ + lcl_offs_bytes = This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; + to_copy_frames = min(nframes, This->stream->held_frames); + to_copy_bytes = to_copy_frames * This->stream->fmt->nBlockAlign; - chunk_bytes = (This->bufsize_frames - This->lcl_offs_frames) * This->fmt->nBlockAlign; + chunk_bytes = (This->stream->bufsize_frames - This->stream->lcl_offs_frames) * This->stream->fmt->nBlockAlign; if(to_copy_bytes > chunk_bytes){ - memcpy(data->mBuffers[0].mData, This->local_buffer + lcl_offs_bytes, chunk_bytes); - memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, This->local_buffer, to_copy_bytes - chunk_bytes); + memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, chunk_bytes); + memcpy(((BYTE *)data->mBuffers[0].mData) + chunk_bytes, This->stream->local_buffer, to_copy_bytes - chunk_bytes); }else - memcpy(data->mBuffers[0].mData, This->local_buffer + lcl_offs_bytes, to_copy_bytes); + memcpy(data->mBuffers[0].mData, This->stream->local_buffer + lcl_offs_bytes, to_copy_bytes); - This->lcl_offs_frames += to_copy_frames; - This->lcl_offs_frames %= This->bufsize_frames; - This->held_frames -= to_copy_frames; + This->stream->lcl_offs_frames += to_copy_frames; + This->stream->lcl_offs_frames %= This->stream->bufsize_frames; + This->stream->held_frames -= to_copy_frames; }else to_copy_bytes = to_copy_frames = 0; if(nframes > to_copy_frames) silence_buffer(This, ((BYTE *)data->mBuffers[0].mData) + to_copy_bytes, nframes - to_copy_frames); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return noErr; } @@ -950,38 +945,38 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe { ACImpl *This = user; - *nframes = min(*nframes, This->cap_held_frames); + *nframes = min(*nframes, This->stream->cap_held_frames); if(!*nframes){ data->mBuffers[0].mData = NULL; data->mBuffers[0].mDataByteSize = 0; - data->mBuffers[0].mNumberChannels = This->fmt->nChannels; + data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; return noErr; } - data->mBuffers[0].mDataByteSize = *nframes * This->fmt->nBlockAlign; - data->mBuffers[0].mNumberChannels = This->fmt->nChannels; + data->mBuffers[0].mDataByteSize = *nframes * This->stream->fmt->nBlockAlign; + data->mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; - if(This->cap_offs_frames + *nframes > This->cap_bufsize_frames){ - UINT32 chunk_frames = This->cap_bufsize_frames - This->cap_offs_frames; + if(This->stream->cap_offs_frames + *nframes > This->stream->cap_bufsize_frames){ + UINT32 chunk_frames = This->stream->cap_bufsize_frames - This->stream->cap_offs_frames; - if(This->wrap_bufsize_frames < *nframes){ - free(This->wrap_buffer); - This->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); - This->wrap_bufsize_frames = *nframes; + if(This->stream->wrap_bufsize_frames < *nframes){ + free(This->stream->wrap_buffer); + This->stream->wrap_buffer = malloc(data->mBuffers[0].mDataByteSize); + This->stream->wrap_bufsize_frames = *nframes; } - memcpy(This->wrap_buffer, This->cap_buffer + This->cap_offs_frames * This->fmt->nBlockAlign, - chunk_frames * This->fmt->nBlockAlign); - memcpy(This->wrap_buffer + chunk_frames * This->fmt->nBlockAlign, This->cap_buffer, - (*nframes - chunk_frames) * This->fmt->nBlockAlign); + memcpy(This->stream->wrap_buffer, This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign, + chunk_frames * This->stream->fmt->nBlockAlign); + memcpy(This->stream->wrap_buffer + chunk_frames * This->stream->fmt->nBlockAlign, This->stream->cap_buffer, + (*nframes - chunk_frames) * This->stream->fmt->nBlockAlign); - data->mBuffers[0].mData = This->wrap_buffer; + data->mBuffers[0].mData = This->stream->wrap_buffer; }else - data->mBuffers[0].mData = This->cap_buffer + This->cap_offs_frames * This->fmt->nBlockAlign; + data->mBuffers[0].mData = This->stream->cap_buffer + This->stream->cap_offs_frames * This->stream->fmt->nBlockAlign; - This->cap_offs_frames += *nframes; - This->cap_offs_frames %= This->cap_bufsize_frames; - This->cap_held_frames -= *nframes; + This->stream->cap_offs_frames += *nframes; + This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; + This->stream->cap_held_frames -= *nframes; if(packets) *packets = NULL; @@ -991,48 +986,48 @@ static OSStatus feed_cb(AudioConverterRef converter, UInt32 *nframes, AudioBuffe static void capture_resample(ACImpl *This) { - UINT32 resamp_period_frames = MulDiv(This->period_frames, This->dev_desc.mSampleRate, This->fmt->nSamplesPerSec); + UINT32 resamp_period_frames = MulDiv(This->stream->period_frames, This->stream->dev_desc.mSampleRate, This->stream->fmt->nSamplesPerSec); OSStatus sc; /* the resampling process often needs more source frames than we'd * guess from a straight conversion using the sample rate ratio. so * only convert if we have extra source data. */ - while(This->cap_held_frames > resamp_period_frames * 2){ + while(This->stream->cap_held_frames > resamp_period_frames * 2){ AudioBufferList converted_list; - UInt32 wanted_frames = This->period_frames; + UInt32 wanted_frames = This->stream->period_frames; converted_list.mNumberBuffers = 1; - converted_list.mBuffers[0].mNumberChannels = This->fmt->nChannels; - converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->fmt->nBlockAlign; + converted_list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; + converted_list.mBuffers[0].mDataByteSize = wanted_frames * This->stream->fmt->nBlockAlign; - if(This->resamp_bufsize_frames < wanted_frames){ - HeapFree(GetProcessHeap(), 0, This->resamp_buffer); - This->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); - This->resamp_bufsize_frames = wanted_frames; + if(This->stream->resamp_bufsize_frames < wanted_frames){ + HeapFree(GetProcessHeap(), 0, This->stream->resamp_buffer); + This->stream->resamp_buffer = HeapAlloc(GetProcessHeap(), 0, converted_list.mBuffers[0].mDataByteSize); + This->stream->resamp_bufsize_frames = wanted_frames; } - converted_list.mBuffers[0].mData = This->resamp_buffer; + converted_list.mBuffers[0].mData = This->stream->resamp_buffer; - sc = AudioConverterFillComplexBuffer(This->converter, feed_cb, + sc = AudioConverterFillComplexBuffer(This->stream->converter, feed_cb, This, &wanted_frames, &converted_list, NULL); if(sc != noErr){ WARN("AudioConverterFillComplexBuffer failed: %x\n", (int)sc); break; } - ca_wrap_buffer(This->local_buffer, - This->wri_offs_frames * This->fmt->nBlockAlign, - This->bufsize_frames * This->fmt->nBlockAlign, - This->resamp_buffer, wanted_frames * This->fmt->nBlockAlign); + ca_wrap_buffer(This->stream->local_buffer, + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, + This->stream->resamp_buffer, wanted_frames * This->stream->fmt->nBlockAlign); - This->wri_offs_frames += wanted_frames; - This->wri_offs_frames %= This->bufsize_frames; - if(This->held_frames + wanted_frames > This->bufsize_frames){ - This->lcl_offs_frames += buf_ptr_diff(This->lcl_offs_frames, - This->wri_offs_frames, This->bufsize_frames); - This->held_frames = This->bufsize_frames; + This->stream->wri_offs_frames += wanted_frames; + This->stream->wri_offs_frames %= This->stream->bufsize_frames; + if(This->stream->held_frames + wanted_frames > This->stream->bufsize_frames){ + This->stream->lcl_offs_frames += buf_ptr_diff(This->stream->lcl_offs_frames, + This->stream->wri_offs_frames, This->stream->bufsize_frames); + This->stream->held_frames = This->stream->bufsize_frames; }else - This->held_frames += wanted_frames; + This->stream->held_frames += wanted_frames; } } @@ -1052,48 +1047,48 @@ static OSStatus ca_capture_cb(void *user, AudioUnitRenderActionFlags *flags, OSStatus sc; UINT32 cap_wri_offs_frames; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - cap_wri_offs_frames = (This->cap_offs_frames + This->cap_held_frames) % This->cap_bufsize_frames; + cap_wri_offs_frames = (This->stream->cap_offs_frames + This->stream->cap_held_frames) % This->stream->cap_bufsize_frames; list.mNumberBuffers = 1; - list.mBuffers[0].mNumberChannels = This->fmt->nChannels; - list.mBuffers[0].mDataByteSize = nframes * This->fmt->nBlockAlign; + list.mBuffers[0].mNumberChannels = This->stream->fmt->nChannels; + list.mBuffers[0].mDataByteSize = nframes * This->stream->fmt->nBlockAlign; - if(!This->playing || cap_wri_offs_frames + nframes > This->cap_bufsize_frames){ - if(This->wrap_bufsize_frames < nframes){ - free(This->wrap_buffer); - This->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); - This->wrap_bufsize_frames = nframes; + if(!This->stream->playing || cap_wri_offs_frames + nframes > This->stream->cap_bufsize_frames){ + if(This->stream->wrap_bufsize_frames < nframes){ + free(This->stream->wrap_buffer); + This->stream->wrap_buffer = malloc(list.mBuffers[0].mDataByteSize); + This->stream->wrap_bufsize_frames = nframes; } - list.mBuffers[0].mData = This->wrap_buffer; + list.mBuffers[0].mData = This->stream->wrap_buffer; }else - list.mBuffers[0].mData = This->cap_buffer + cap_wri_offs_frames * This->fmt->nBlockAlign; + list.mBuffers[0].mData = This->stream->cap_buffer + cap_wri_offs_frames * This->stream->fmt->nBlockAlign; - sc = AudioUnitRender(This->unit, flags, ts, bus, nframes, &list); + sc = AudioUnitRender(This->stream->unit, flags, ts, bus, nframes, &list); if(sc != noErr){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return sc; } - if(This->playing){ - if(list.mBuffers[0].mData == This->wrap_buffer){ - ca_wrap_buffer(This->cap_buffer, - cap_wri_offs_frames * This->fmt->nBlockAlign, - This->cap_bufsize_frames * This->fmt->nBlockAlign, - This->wrap_buffer, list.mBuffers[0].mDataByteSize); + if(This->stream->playing){ + if(list.mBuffers[0].mData == This->stream->wrap_buffer){ + ca_wrap_buffer(This->stream->cap_buffer, + cap_wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign, + This->stream->wrap_buffer, list.mBuffers[0].mDataByteSize); } - This->cap_held_frames += list.mBuffers[0].mDataByteSize / This->fmt->nBlockAlign; - if(This->cap_held_frames > This->cap_bufsize_frames){ - This->cap_offs_frames += This->cap_held_frames % This->cap_bufsize_frames; - This->cap_offs_frames %= This->cap_bufsize_frames; - This->cap_held_frames = This->cap_bufsize_frames; + This->stream->cap_held_frames += list.mBuffers[0].mDataByteSize / This->stream->fmt->nBlockAlign; + if(This->stream->cap_held_frames > This->stream->cap_bufsize_frames){ + This->stream->cap_offs_frames += This->stream->cap_held_frames % This->stream->cap_bufsize_frames; + This->stream->cap_offs_frames %= This->stream->cap_bufsize_frames; + This->stream->cap_held_frames = This->stream->cap_bufsize_frames; } } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return noErr; } @@ -1244,31 +1239,31 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, } } - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_ALREADY_INITIALIZED; } - This->fmt = clone_format(fmt); - if(!This->fmt){ - OSSpinLockUnlock(&This->lock); + This->stream->fmt = clone_format(fmt); + if(!This->stream->fmt){ + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } - This->period_ms = period / 10000; - This->period_frames = MulDiv(period, This->fmt->nSamplesPerSec, 10000000); + This->stream->period_ms = period / 10000; + This->stream->period_frames = MulDiv(period, This->stream->fmt->nSamplesPerSec, 10000000); - This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); + This->stream->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE) - This->bufsize_frames -= This->bufsize_frames % This->period_frames; + This->stream->bufsize_frames -= This->stream->bufsize_frames % This->stream->period_frames; - hr = ca_setup_audiounit(This->dataflow, This->unit, This->fmt, &This->dev_desc, &This->converter); + hr = ca_setup_audiounit(This->dataflow, This->stream->unit, This->stream->fmt, &This->stream->dev_desc, &This->stream->converter); if(FAILED(hr)){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -1279,15 +1274,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_capture_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->unit, kAudioOutputUnitProperty_SetInputCallback, + sc = AudioUnitSetProperty(This->stream->unit, kAudioOutputUnitProperty_SetInputCallback, kAudioUnitScope_Output, 1, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - AudioConverterDispose(This->converter); - This->converter = NULL; - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } }else{ @@ -1297,65 +1292,65 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, input.inputProc = &ca_render_cb; input.inputProcRefCon = This; - sc = AudioUnitSetProperty(This->unit, kAudioUnitProperty_SetRenderCallback, + sc = AudioUnitSetProperty(This->stream->unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, &input, sizeof(input)); if(sc != noErr){ WARN("Couldn't set callback: %x\n", (int)sc); - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } } - sc = AudioUnitInitialize(This->unit); + sc = AudioUnitInitialize(This->stream->unit); if(sc != noErr){ WARN("Couldn't initialize: %x\n", (int)sc); - if(This->converter){ - AudioConverterDispose(This->converter); - This->converter = NULL; + if(This->stream->converter){ + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; } - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } /* we play audio continuously because AudioOutputUnitStart sometimes takes * a while to return */ - sc = AudioOutputUnitStart(This->unit); + sc = AudioOutputUnitStart(This->stream->unit); if(sc != noErr){ WARN("Unit failed to start: %x\n", (int)sc); - if(This->converter){ - AudioConverterDispose(This->converter); - This->converter = NULL; + if(This->stream->converter){ + AudioConverterDispose(This->stream->converter); + This->stream->converter = NULL; } - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } - This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); - silence_buffer(This, This->local_buffer, This->bufsize_frames); + This->stream->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->bufsize_frames * fmt->nBlockAlign); + silence_buffer(This, This->stream->local_buffer, This->stream->bufsize_frames); if(This->dataflow == eCapture){ - This->cap_bufsize_frames = MulDiv(duration, This->dev_desc.mSampleRate, 10000000); - This->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->cap_bufsize_frames * This->fmt->nBlockAlign); + This->stream->cap_bufsize_frames = MulDiv(duration, This->stream->dev_desc.mSampleRate, 10000000); + This->stream->cap_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->cap_bufsize_frames * This->stream->fmt->nBlockAlign); } This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); if(!This->vols){ - CoTaskMemFree(This->fmt); - This->fmt = NULL; - OSSpinLockUnlock(&This->lock); + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } for(i = 0; i < fmt->nChannels; ++i) This->vols[i] = 1.f; - This->share = mode; + This->stream->share = mode; This->flags = flags; EnterCriticalSection(&g_sessions_lock); @@ -1364,11 +1359,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, &This->session); if(FAILED(hr)){ LeaveCriticalSection(&g_sessions_lock); - CoTaskMemFree(This->fmt); - This->fmt = NULL; + CoTaskMemFree(This->stream->fmt); + This->stream->fmt = NULL; HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_INVALIDARG; } @@ -1380,7 +1375,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, This->initted = TRUE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1395,16 +1390,16 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, if(!frames) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - *frames = This->bufsize_frames; + *frames = This->stream->bufsize_frames; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1477,10 +1472,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!out) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1493,23 +1488,23 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, &size, &latency); if(sc != noErr){ WARN("Couldn't get _Latency property: %x\n", (int)sc); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return osstatus_to_hresult(sc); } hr = ca_get_max_stream_latency(This, &stream_latency); if(FAILED(hr)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } latency += stream_latency; /* pretend we process audio in Period chunks, so max latency includes * the period time */ - *out = MulDiv(latency, 10000000, This->fmt->nSamplesPerSec) - + This->period_ms * 10000; + *out = MulDiv(latency, 10000000, This->stream->fmt->nSamplesPerSec) + + This->stream->period_ms * 10000; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1523,7 +1518,7 @@ static HRESULT AudioClient_GetCurrentPadding_nolock(ACImpl *This, if(This->dataflow == eCapture) capture_resample(This); - *numpad = This->held_frames; + *numpad = This->stream->held_frames; return S_OK; } @@ -1539,11 +1534,11 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!numpad) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); hr = AudioClient_GetCurrentPadding_nolock(This, numpad); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -1891,35 +1886,35 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(This->playing){ - OSSpinLockUnlock(&This->lock); + if(This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_STOPPED; } if((This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !This->event){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_EVENTHANDLE_NOT_SET; } if(This->event && !This->timer) if(!CreateTimerQueueTimer(&This->timer, g_timer_q, ca_period_cb, - This, 0, This->period_ms, WT_EXECUTEINTIMERTHREAD)){ + This, 0, This->stream->period_ms, WT_EXECUTEINTIMERTHREAD)){ This->timer = NULL; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); WARN("Unable to create timer: %u\n", GetLastError()); return E_OUTOFMEMORY; } - This->playing = TRUE; + This->stream->playing = TRUE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1930,21 +1925,21 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(!This->playing){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return S_FALSE; } - This->playing = FALSE; + This->stream->playing = FALSE; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1955,36 +1950,36 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) TRACE("(%p)\n", This); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } - if(This->playing){ - OSSpinLockUnlock(&This->lock); + if(This->stream->playing){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_STOPPED; } - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } if(This->dataflow == eRender){ - This->written_frames = 0; + This->stream->written_frames = 0; }else{ - This->written_frames += This->held_frames; + This->stream->written_frames += This->stream->held_frames; } - This->held_frames = 0; - This->lcl_offs_frames = 0; - This->wri_offs_frames = 0; - This->cap_offs_frames = 0; - This->cap_held_frames = 0; + This->stream->held_frames = 0; + This->stream->lcl_offs_frames = 0; + This->stream->wri_offs_frames = 0; + This->stream->cap_offs_frames = 0; + This->stream->cap_held_frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -1999,27 +1994,27 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, if(!event) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } if(!(This->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED; } if (This->event){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); FIXME("called twice\n"); return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); } This->event = event; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2035,23 +2030,23 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, return E_POINTER; *ppv = NULL; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!This->initted){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_NOT_INITIALIZED; } if(IsEqualIID(riid, &IID_IAudioRenderClient)){ if(This->dataflow != eRender){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); @@ -2066,7 +2061,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2077,7 +2072,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2088,7 +2083,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, if(!This->session_wrapper){ This->session_wrapper = AudioSessionWrapper_Create(This); if(!This->session_wrapper){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } }else @@ -2098,11 +2093,11 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, } if(*ppv){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); FIXME("stub %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -2274,49 +2269,49 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return E_POINTER; *data = NULL; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } hr = AudioClient_GetCurrentPadding_nolock(This, &pad); if(FAILED(hr)){ - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } - if(pad + frames > This->bufsize_frames){ - OSSpinLockUnlock(&This->lock); + if(pad + frames > This->stream->bufsize_frames){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } - if(This->wri_offs_frames + frames > This->bufsize_frames){ - if(This->tmp_buffer_frames < frames){ - HeapFree(GetProcessHeap(), 0, This->tmp_buffer); - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->fmt->nBlockAlign); - if(!This->tmp_buffer){ - OSSpinLockUnlock(&This->lock); + if(This->stream->wri_offs_frames + frames > This->stream->bufsize_frames){ + if(This->stream->tmp_buffer_frames < frames){ + HeapFree(GetProcessHeap(), 0, This->stream->tmp_buffer); + This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, frames * This->stream->fmt->nBlockAlign); + if(!This->stream->tmp_buffer){ + OSSpinLockUnlock(&This->stream->lock); return E_OUTOFMEMORY; } - This->tmp_buffer_frames = frames; + This->stream->tmp_buffer_frames = frames; } - *data = This->tmp_buffer; - This->getbuf_last = -frames; + *data = This->stream->tmp_buffer; + This->stream->getbuf_last = -frames; }else{ - *data = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; - This->getbuf_last = frames; + *data = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; + This->stream->getbuf_last = frames; } silence_buffer(This, *data, frames); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2329,46 +2324,46 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( TRACE("(%p)->(%u, %x)\n", This, frames, flags); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!frames){ - This->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + This->stream->getbuf_last = 0; + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - if(!This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ - OSSpinLockUnlock(&This->lock); + if(frames > (This->stream->getbuf_last >= 0 ? This->stream->getbuf_last : -This->stream->getbuf_last)){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_INVALID_SIZE; } - if(This->getbuf_last >= 0) - buffer = This->local_buffer + This->wri_offs_frames * This->fmt->nBlockAlign; + if(This->stream->getbuf_last >= 0) + buffer = This->stream->local_buffer + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign; else - buffer = This->tmp_buffer; + buffer = This->stream->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) silence_buffer(This, buffer, frames); - if(This->getbuf_last < 0) - ca_wrap_buffer(This->local_buffer, - This->wri_offs_frames * This->fmt->nBlockAlign, - This->bufsize_frames * This->fmt->nBlockAlign, - buffer, frames * This->fmt->nBlockAlign); + if(This->stream->getbuf_last < 0) + ca_wrap_buffer(This->stream->local_buffer, + This->stream->wri_offs_frames * This->stream->fmt->nBlockAlign, + This->stream->bufsize_frames * This->stream->fmt->nBlockAlign, + buffer, frames * This->stream->fmt->nBlockAlign); - This->wri_offs_frames += frames; - This->wri_offs_frames %= This->bufsize_frames; - This->held_frames += frames; - This->written_frames += frames; - This->getbuf_last = 0; + This->stream->wri_offs_frames += frames; + This->stream->wri_offs_frames %= This->stream->bufsize_frames; + This->stream->held_frames += frames; + This->stream->written_frames += frames; + This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2436,38 +2431,38 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, if(!frames || !flags) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); - if(This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } capture_resample(This); - if(This->held_frames < This->period_frames){ + if(This->stream->held_frames < This->stream->period_frames){ *frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_S_BUFFER_EMPTY; } *flags = 0; - chunk_frames = This->bufsize_frames - This->lcl_offs_frames; - if(chunk_frames < This->period_frames){ - chunk_bytes = chunk_frames * This->fmt->nBlockAlign; - if(!This->tmp_buffer) - This->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->period_frames * This->fmt->nBlockAlign); - *data = This->tmp_buffer; - memcpy(*data, This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign, chunk_bytes); - memcpy((*data) + chunk_bytes, This->local_buffer, This->period_frames * This->fmt->nBlockAlign - chunk_bytes); + chunk_frames = This->stream->bufsize_frames - This->stream->lcl_offs_frames; + if(chunk_frames < This->stream->period_frames){ + chunk_bytes = chunk_frames * This->stream->fmt->nBlockAlign; + if(!This->stream->tmp_buffer) + This->stream->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, This->stream->period_frames * This->stream->fmt->nBlockAlign); + *data = This->stream->tmp_buffer; + memcpy(*data, This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign, chunk_bytes); + memcpy((*data) + chunk_bytes, This->stream->local_buffer, This->stream->period_frames * This->stream->fmt->nBlockAlign - chunk_bytes); }else - *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = This->stream->local_buffer + This->stream->lcl_offs_frames * This->stream->fmt->nBlockAlign; - This->getbuf_last = *frames = This->period_frames; + This->stream->getbuf_last = *frames = This->stream->period_frames; if(devpos) - *devpos = This->written_frames; + *devpos = This->stream->written_frames; if(qpcpos){ /* fixme: qpc of recording time */ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp); @@ -2475,7 +2470,7 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; } - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2487,31 +2482,31 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( TRACE("(%p)->(%u)\n", This, done); - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); if(!done){ - This->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + This->stream->getbuf_last = 0; + OSSpinLockUnlock(&This->stream->lock); return S_OK; } - if(!This->getbuf_last){ - OSSpinLockUnlock(&This->lock); + if(!This->stream->getbuf_last){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_OUT_OF_ORDER; } - if(This->getbuf_last != done){ - OSSpinLockUnlock(&This->lock); + if(This->stream->getbuf_last != done){ + OSSpinLockUnlock(&This->stream->lock); return AUDCLNT_E_INVALID_SIZE; } - This->written_frames += done; - This->held_frames -= done; - This->lcl_offs_frames += done; - This->lcl_offs_frames %= This->bufsize_frames; - This->getbuf_last = 0; + This->stream->written_frames += done; + This->stream->held_frames -= done; + This->stream->lcl_offs_frames += done; + This->stream->lcl_offs_frames %= This->stream->bufsize_frames; + This->stream->getbuf_last = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2526,16 +2521,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( if(!frames) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); capture_resample(This); - if(This->held_frames >= This->period_frames) - *frames = This->period_frames; + if(This->stream->held_frames >= This->stream->period_frames) + *frames = This->stream->period_frames; else *frames = 0; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } @@ -2592,10 +2587,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->fmt->nSamplesPerSec * This->fmt->nBlockAlign; + if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) + *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; else - *freq = This->fmt->nSamplesPerSec; + *freq = This->stream->fmt->nSamplesPerSec; return S_OK; } @@ -2603,10 +2598,10 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, UINT64 *pos, UINT64 *qpctime) { - *pos = This->written_frames - This->held_frames; + *pos = This->stream->written_frames - This->stream->held_frames; - if(This->share == AUDCLNT_SHAREMODE_SHARED) - *pos *= This->fmt->nBlockAlign; + if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) + *pos *= This->stream->fmt->nBlockAlign; if(qpctime){ LARGE_INTEGER stamp, freq; @@ -2629,11 +2624,11 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, if(!pos) return E_POINTER; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); hr = AudioClock_GetPosition_nolock(This, pos, qpctime); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return hr; } @@ -2763,9 +2758,9 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ if(This->client){ - OSSpinLockLock(&This->client->lock); + OSSpinLockLock(&This->client->stream->lock); This->client->session_wrapper = NULL; - OSSpinLockUnlock(&This->client->lock); + OSSpinLockUnlock(&This->client->stream->lock); AudioClient_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); @@ -2793,14 +2788,14 @@ static HRESULT WINAPI AudioSessionControl_GetState(IAudioSessionControl2 *iface, } LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry){ - OSSpinLockLock(&client->lock); - if(client->playing){ + OSSpinLockLock(&client->stream->lock); + if(client->stream->playing){ *state = AudioSessionStateActive; - OSSpinLockUnlock(&client->lock); + OSSpinLockUnlock(&client->stream->lock); LeaveCriticalSection(&g_sessions_lock); return S_OK; } - OSSpinLockUnlock(&client->lock); + OSSpinLockUnlock(&client->stream->lock); } LeaveCriticalSection(&g_sessions_lock); @@ -2979,7 +2974,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) if(index == (UINT32)-1){ UINT32 i; level = 1.; - for(i = 0; i < This->fmt->nChannels; ++i){ + for(i = 0; i < This->stream->fmt->nChannels; ++i){ Float32 tmp; tmp = This->session->master_vol * This->session->channel_vols[i] * This->vols[i]; @@ -2990,7 +2985,7 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) This->session->channel_vols[index] * This->vols[index]; } - sc = AudioUnitSetParameter(This->unit, kHALOutputParam_Volume, + sc = AudioUnitSetParameter(This->stream->unit, kHALOutputParam_Volume, kAudioUnitScope_Global, 0, level, 0); if(sc != noErr) WARN("Couldn't set volume: %x\n", (int)sc); @@ -3180,7 +3175,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelCount( if(!out) return E_POINTER; - *out = This->fmt->nChannels; + *out = This->stream->fmt->nChannels; return S_OK; } @@ -3196,17 +3191,17 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( if(level < 0.f || level > 1.f) return E_INVALIDARG; - if(index >= This->fmt->nChannels) + if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); ret = ca_setvol(This, index); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return ret; } @@ -3221,7 +3216,7 @@ static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( if(!level) return E_POINTER; - if(index >= This->fmt->nChannels) + if(index >= This->stream->fmt->nChannels) return E_INVALIDARG; *level = This->vols[index]; @@ -3241,17 +3236,17 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); for(i = 0; i < count; ++i) This->vols[i] = levels[i]; ret = ca_setvol(This, -1); - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return ret; } @@ -3267,15 +3262,15 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( if(!levels) return E_POINTER; - if(count != This->fmt->nChannels) + if(count != This->stream->fmt->nChannels) return E_INVALIDARG; - OSSpinLockLock(&This->lock); + OSSpinLockLock(&This->stream->lock); for(i = 0; i < count; ++i) levels[i] = This->vols[i]; - OSSpinLockUnlock(&This->lock); + OSSpinLockUnlock(&This->stream->lock); return S_OK; } diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 7c1200464b9..6a991f1de98 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -18,6 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +struct coreaudio_stream /* To be made private */ +{ + OSSpinLock lock; + AudioComponentInstance unit; + AudioConverterRef converter; + AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ + AudioDeviceID dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + + BOOL playing; + SIZE_T local_buffer_size, tmp_buffer_size; + UINT32 period_ms, period_frames; + UINT32 bufsize_frames, resamp_bufsize_frames; + UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; + UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames; + UINT32 wrap_bufsize_frames; + UINT64 written_frames; + INT32 getbuf_last; + WAVEFORMATEX *fmt; + BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; +}; + struct endpoint { WCHAR *name; -- 2.33.1

1 0

[PATCH v2 2/6] winecoreaudio: Move get_endpoint_ids to a unixlib.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winecoreaudio.drv/Makefile.in | 1 + dlls/winecoreaudio.drv/coreaudio.c | 229 ++++++++++++++++++++++++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 211 ++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 44 ++++++ 4 files changed, 326 insertions(+), 159 deletions(-) create mode 100644 dlls/winecoreaudio.drv/unixlib.h diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index afbc50c7148..b6bf5bd4587 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,4 +1,5 @@ MODULE = winecoreaudio.drv +UNIXLIB = winecoreaudio.so IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm EXTRALIBS = $(COREAUDIO_LIBS) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 1f222367bed..f3af24f80fb 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1,5 +1,8 @@ /* - * Wine Driver for CoreAudio + * Unixlib for winecoreaudio driver. + * + * Copyright 2011 Andrew Eikum for CodeWeavers + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,16 +18,230 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - +#if 0 +#pragma makedep unix +#endif #include "config.h" +#define LoadResource __carbon_LoadResource +#define CompareString __carbon_CompareString +#define GetCurrentThread __carbon_GetCurrentThread +#define GetCurrentProcess __carbon_GetCurrentProcess + #include <stdarg.h> +#include <errno.h> +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/ioctl.h> +#include <fcntl.h> +#include <fenv.h> +#include <unistd.h> + +#include <libkern/OSAtomic.h> +#include <CoreAudio/CoreAudio.h> +#include <AudioToolbox/AudioFormat.h> +#include <AudioToolbox/AudioConverter.h> +#include <AudioUnit/AudioUnit.h> + +#undef LoadResource +#undef CompareString +#undef GetCurrentThread +#undef GetCurrentProcess +#undef _CDECL + +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "mmddk.h" -#include "coreaudio.h" +#include "winnls.h" +#include "winreg.h" +#include "mmdeviceapi.h" +#include "initguid.h" +#include "audioclient.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/unixlib.h" + +#include "unixlib.h" + +WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); + +static HRESULT osstatus_to_hresult(OSStatus sc) +{ + switch(sc){ + case kAudioFormatUnsupportedDataFormatError: + case kAudioFormatUnknownFormatError: + case kAudioDeviceUnsupportedFormatError: + return AUDCLNT_E_UNSUPPORTED_FORMAT; + case kAudioHardwareBadDeviceError: + return AUDCLNT_E_DEVICE_INVALIDATED; + } + return E_FAIL; +} + +static AudioObjectPropertyScope get_scope(EDataFlow flow) +{ + return (flow == eRender) ? kAudioDevicePropertyScopeOutput : kAudioDevicePropertyScopeInput; +} + +static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) +{ + AudioObjectPropertyAddress addr; + AudioBufferList *buffers; + BOOL ret = FALSE; + OSStatus sc; + UInt32 size; + int i; + + addr.mSelector = kAudioDevicePropertyStreamConfiguration; + addr.mScope = get_scope(flow); + addr.mElement = 0; + + sc = AudioObjectGetPropertyDataSize(device, &addr, 0, NULL, &size); + if(sc != noErr){ + WARN("Unable to get _StreamConfiguration property size for device %u: %x\n", + (unsigned int)device, (int)sc); + return FALSE; + } + + buffers = malloc(size); + if(!buffers) return FALSE; + + sc = AudioObjectGetPropertyData(device, &addr, 0, NULL, &size, buffers); + if(sc != noErr){ + WARN("Unable to get _StreamConfiguration property for device %u: %x\n", + (unsigned int)device, (int)sc); + free(buffers); + return FALSE; + } + + for(i = 0; i < buffers->mNumberBuffers; i++){ + if(buffers->mBuffers[i].mNumberChannels > 0){ + ret = TRUE; + break; + } + } + free(buffers); + return ret; +} + +static NTSTATUS get_endpoint_ids(void *args) +{ + struct get_endpoint_ids_params *params = args; + unsigned int num_devices, i, needed; + AudioDeviceID *devices, default_id; + AudioObjectPropertyAddress addr; + struct endpoint *endpoint; + UInt32 devsize, size; + struct endpoint_info + { + CFStringRef name; + AudioDeviceID id; + } *info; + OSStatus sc; + WCHAR *ptr; + + params->num = 0; + params->default_idx = 0; + + addr.mScope = kAudioObjectPropertyScopeGlobal; + addr.mElement = kAudioObjectPropertyElementMaster; + if(params->flow == eRender) addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice; + else if(params->flow == eCapture) addr.mSelector = kAudioHardwarePropertyDefaultInputDevice; + else{ + params->result = E_INVALIDARG; + return STATUS_SUCCESS; + } + + size = sizeof(default_id); + sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &size, &default_id); + if(sc != noErr){ + WARN("Getting _DefaultInputDevice property failed: %x\n", (int)sc); + default_id = -1; + } + + addr.mSelector = kAudioHardwarePropertyDevices; + sc = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr, 0, NULL, &devsize); + if(sc != noErr){ + WARN("Getting _Devices property size failed: %x\n", (int)sc); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + num_devices = devsize / sizeof(AudioDeviceID); + devices = malloc(devsize); + info = malloc(num_devices * sizeof(*info)); + if(!devices || !info){ + free(info); + free(devices); + params->result = E_OUTOFMEMORY; + return STATUS_SUCCESS; + } + + sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, &devsize, devices); + if(sc != noErr){ + WARN("Getting _Devices property failed: %x\n", (int)sc); + free(info); + free(devices); + params->result = osstatus_to_hresult(sc); + return STATUS_SUCCESS; + } + + addr.mSelector = kAudioObjectPropertyName; + addr.mScope = get_scope(params->flow); + addr.mElement = 0; + + for(i = 0; i < num_devices; i++){ + if(!device_has_channels(devices[i], params->flow)) continue; + + size = sizeof(CFStringRef); + sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, &size, &info[params->num].name); + if(sc != noErr){ + WARN("Unable to get _Name property for device %u: %x\n", + (unsigned int)devices[i], (int)sc); + continue; + } + info[params->num++].id = devices[i]; + } + free(devices); + + needed = sizeof(*endpoint) * params->num; + endpoint = params->endpoints; + ptr = (WCHAR *)(endpoint + params->num); + + for(i = 0; i < params->num; i++){ + SIZE_T len = CFStringGetLength(info[i].name); + needed += (len + 1) * sizeof(WCHAR); + + if(needed <= params->size){ + endpoint->name = ptr; + CFStringGetCharacters(info[i].name, CFRangeMake(0, len), (UniChar*)endpoint->name); + ptr[len] = 0; + endpoint->id = info[i].id; + endpoint++; + ptr += len + 1; + } + CFRelease(info[i].name); + if(info[i].id == default_id) params->default_idx = i; + } + free(info); + + if(needed > params->size){ + params->size = needed; + params->result = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + else params->result = S_OK; + + return STATUS_SUCCESS; +} + +unixlib_entry_t __wine_unix_call_funcs[] = +{ + get_endpoint_ids, +}; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f07f4bae5fb..f8b538971f2 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -56,8 +56,10 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/unixlib.h" #include "ole2.h" #include "mmdeviceapi.h" @@ -69,9 +71,12 @@ #include "endpointvolume.h" #include "audioclient.h" #include "audiopolicy.h" +#include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); +unixlib_handle_t coreaudio_handle = 0; + #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; @@ -245,6 +250,9 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) switch (reason) { case DLL_PROCESS_ATTACH: + if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &coreaudio_handle, sizeof(coreaudio_handle), NULL)) + return FALSE; g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; @@ -319,7 +327,7 @@ exit: RegCloseKey(drv_key); } -static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) +static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) { HKEY key = NULL, dev_key; DWORD type, size = sizeof(*guid); @@ -333,7 +341,7 @@ static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) key_name[0] = '0'; key_name[1] = ','; - sprintfW(key_name + 2, key_fmt, device); + sprintfW(key_name + 2, key_fmt, device_id); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -359,164 +367,61 @@ static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) RegCloseKey(key); } -HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, - GUID **guids, UINT *num, UINT *def_index) +HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, + GUID **guids_out, UINT *num, UINT *def_index) { - UInt32 devsize, size; - AudioDeviceID *devices; - AudioDeviceID default_id; - AudioObjectPropertyAddress addr; - OSStatus sc; - int i, ndevices; - - TRACE("%d %p %p %p\n", flow, ids, num, def_index); - - addr.mScope = kAudioObjectPropertyScopeGlobal; - addr.mElement = kAudioObjectPropertyElementMaster; - if(flow == eRender) - addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice; - else if(flow == eCapture) - addr.mSelector = kAudioHardwarePropertyDefaultInputDevice; - else - return E_INVALIDARG; - - size = sizeof(default_id); - sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, - NULL, &size, &default_id); - if(sc != noErr){ - WARN("Getting _DefaultInputDevice property failed: %x\n", (int)sc); - default_id = -1; - } - - addr.mSelector = kAudioHardwarePropertyDevices; - sc = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &addr, 0, - NULL, &devsize); - if(sc != noErr){ - WARN("Getting _Devices property size failed: %x\n", (int)sc); - return osstatus_to_hresult(sc); - } - - devices = HeapAlloc(GetProcessHeap(), 0, devsize); - if(!devices) - return E_OUTOFMEMORY; - - sc = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr, 0, NULL, - &devsize, devices); - if(sc != noErr){ - WARN("Getting _Devices property failed: %x\n", (int)sc); - HeapFree(GetProcessHeap(), 0, devices); - return osstatus_to_hresult(sc); + struct get_endpoint_ids_params params; + unsigned int i; + GUID *guids; + WCHAR **ids; + + TRACE("%d %p %p %p\n", flow, ids_out, num, def_index); + + params.flow = flow; + params.size = 1000; + params.endpoints = NULL; + do{ + heap_free(params.endpoints); + params.endpoints = heap_alloc(params.size); + UNIX_CALL(get_endpoint_ids, &params); + }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)); + + if(FAILED(params.result)) goto end; + + ids = heap_alloc_zero(params.num * sizeof(*ids)); + guids = heap_alloc(params.num * sizeof(*guids)); + if(!ids || !guids){ + params.result = E_OUTOFMEMORY; + goto end; } - ndevices = devsize / sizeof(AudioDeviceID); - - *ids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(WCHAR *)); - if(!*ids){ - HeapFree(GetProcessHeap(), 0, devices); - return E_OUTOFMEMORY; - } - - *guids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(GUID)); - if(!*guids){ - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, devices); - return E_OUTOFMEMORY; - } - - *num = 0; - *def_index = (UINT)-1; - for(i = 0; i < ndevices; ++i){ - AudioBufferList *buffers; - CFStringRef name; - SIZE_T len; - int j; - - addr.mSelector = kAudioDevicePropertyStreamConfiguration; - if(flow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else - addr.mScope = kAudioDevicePropertyScopeInput; - addr.mElement = 0; - sc = AudioObjectGetPropertyDataSize(devices[i], &addr, 0, NULL, &size); - if(sc != noErr){ - WARN("Unable to get _StreamConfiguration property size for " - "device %u: %x\n", (unsigned int)devices[i], (int)sc); - continue; - } - - buffers = HeapAlloc(GetProcessHeap(), 0, size); - if(!buffers){ - HeapFree(GetProcessHeap(), 0, devices); - for(j = 0; j < *num; ++j) - HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, *guids); - HeapFree(GetProcessHeap(), 0, *ids); - return E_OUTOFMEMORY; + for(i = 0; i < params.num; i++){ + int size = (strlenW(params.endpoints[i].name) + 1) * sizeof(WCHAR); + ids[i] = heap_alloc(size); + if(!ids[i]){ + params.result = E_OUTOFMEMORY; + goto end; } - - sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, - &size, buffers); - if(sc != noErr){ - WARN("Unable to get _StreamConfiguration property for " - "device %u: %x\n", (unsigned int)devices[i], (int)sc); - HeapFree(GetProcessHeap(), 0, buffers); - continue; - } - - /* check that there's at least one channel in this device before - * we claim it as usable */ - for(j = 0; j < buffers->mNumberBuffers; ++j) - if(buffers->mBuffers[j].mNumberChannels > 0) - break; - if(j >= buffers->mNumberBuffers){ - HeapFree(GetProcessHeap(), 0, buffers); - continue; - } - - HeapFree(GetProcessHeap(), 0, buffers); - - size = sizeof(name); - addr.mSelector = kAudioObjectPropertyName; - sc = AudioObjectGetPropertyData(devices[i], &addr, 0, NULL, - &size, &name); - if(sc != noErr){ - WARN("Unable to get _Name property for device %u: %x\n", - (unsigned int)devices[i], (int)sc); - continue; - } - - len = CFStringGetLength(name) + 1; - (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(!(*ids)[*num]){ - CFRelease(name); - HeapFree(GetProcessHeap(), 0, devices); - for(j = 0; j < *num; ++j) - HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; + memcpy(ids[i], params.endpoints[i].name, size); + get_device_guid(flow, params.endpoints[i].id, guids + i); + } + *def_index = params.default_idx; + +end: + heap_free(params.endpoints); + if(FAILED(params.result)){ + heap_free(guids); + if(ids){ + for(i = 0; i < params.num; i++) heap_free(ids[i]); + heap_free(ids); } - CFStringGetCharacters(name, CFRangeMake(0, len - 1), (UniChar*)(*ids)[*num]); - ((*ids)[*num])[len - 1] = 0; - CFRelease(name); - - get_device_guid(flow, devices[i], &(*guids)[*num]); - - if(*def_index == (UINT)-1 && devices[i] == default_id) - *def_index = *num; - - TRACE("device %u: id %s key %u%s\n", *num, debugstr_w((*ids)[*num]), - (unsigned int)devices[i], (*def_index == *num) ? " (default)" : ""); - - (*num)++; + }else{ + *ids_out = ids; + *guids_out = guids; + *num = params.num; } - if(*def_index == (UINT)-1) - *def_index = 0; - - HeapFree(GetProcessHeap(), 0, devices); - - return S_OK; + return params.result; } static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h new file mode 100644 index 00000000000..7c1200464b9 --- /dev/null +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -0,0 +1,44 @@ +/* + * Unixlib header file for winecoreaudio driver. + * + * Copyright 2021 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct endpoint +{ + WCHAR *name; + DWORD id; +}; + +struct get_endpoint_ids_params +{ + EDataFlow flow; + struct endpoint *endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; +}; + +enum unix_funcs +{ + unix_get_endpoint_ids, +}; + +extern unixlib_handle_t coreaudio_handle; + +#define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, unix_ ## func, params ) -- 2.33.1

1 0

[PATCH v2 1/6] winecoreaudio: Move DriverProc to midi.c.
by Andrew Eikum 17 Nov '21

17 Nov '21

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Fix copyright date typo. dlls/winecoreaudio.drv/coreaudio.c | 81 ------------------------------ dlls/winecoreaudio.drv/coreaudio.h | 9 ---- dlls/winecoreaudio.drv/midi.c | 78 +++++++++++++++++++++++++++- 3 files changed, 77 insertions(+), 91 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 321c24b477c..1f222367bed 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1,8 +1,6 @@ /* * Wine Driver for CoreAudio * - * Copyright 2005 Emmanuel Maillard - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -30,82 +28,3 @@ #include "mmddk.h" #include "coreaudio.h" #include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); - - -/************************************************************************** - * CoreAudio_drvLoad [internal] - */ -static LRESULT CoreAudio_drvLoad(void) -{ - TRACE("()\n"); - - if (CoreAudio_MIDIInit() != DRV_SUCCESS) - return DRV_FAILURE; - - return DRV_SUCCESS; -} - -/************************************************************************** - * CoreAudio_drvFree [internal] - */ -static LRESULT CoreAudio_drvFree(void) -{ - TRACE("()\n"); - CoreAudio_MIDIRelease(); - return DRV_SUCCESS; -} - -/************************************************************************** - * CoreAudio_drvOpen [internal] - */ -static LRESULT CoreAudio_drvOpen(LPSTR str) -{ - TRACE("(%s)\n", str); - return 1; -} - -/************************************************************************** - * CoreAudio_drvClose [internal] - */ -static DWORD CoreAudio_drvClose(DWORD dwDevID) -{ - TRACE("(%08x)\n", dwDevID); - return 1; -} - -/************************************************************************** - * DriverProc (WINECOREAUDIO.1) - */ -LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", - dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : - wMsg == DRV_FREE ? "DRV_FREE" : - wMsg == DRV_OPEN ? "DRV_OPEN" : - wMsg == DRV_CLOSE ? "DRV_CLOSE" : - wMsg == DRV_ENABLE ? "DRV_ENABLE" : - wMsg == DRV_DISABLE ? "DRV_DISABLE" : - wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : - wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : - wMsg == DRV_INSTALL ? "DRV_INSTALL" : - wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", - wMsg, dwParam1, dwParam2); - - switch(wMsg) { - case DRV_LOAD: return CoreAudio_drvLoad(); - case DRV_FREE: return CoreAudio_drvFree(); - case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); - case DRV_CLOSE: return CoreAudio_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; - case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - default: - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } -} diff --git a/dlls/winecoreaudio.drv/coreaudio.h b/dlls/winecoreaudio.drv/coreaudio.h index 68b52502333..e04043c4010 100644 --- a/dlls/winecoreaudio.drv/coreaudio.h +++ b/dlls/winecoreaudio.drv/coreaudio.h @@ -22,15 +22,6 @@ #include "wine/debug.h" -extern LONG CoreAudio_WaveInit(void); -extern void CoreAudio_WaveRelease(void); - -extern LONG CoreAudio_MIDIInit(void); -extern LONG CoreAudio_MIDIRelease(void); - -extern LONG CoreAudio_MixerInit(void); -extern void CoreAudio_MixerRelease(void); - /* fourcc is in native order, where MSB is the first character. */ static inline const char* wine_dbgstr_fourcc(INT32 fourcc) { diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index c299d116f12..64fc3618f61 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -8,7 +8,7 @@ * current support is limited to MIDI ports of OSS systems * 98/9 rewriting MCI code for MIDI * 98/11 split in midi.c and mcimidi.c - * Copyright 2006 Emmanuel Maillard + * Copyright 2005, 2006 Emmanuel Maillard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1033,3 +1033,79 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw } return MMSYSERR_NOTSUPPORTED; } + +/************************************************************************** + * CoreAudio_drvLoad [internal] + */ +static LRESULT CoreAudio_drvLoad(void) +{ + TRACE("()\n"); + + if (CoreAudio_MIDIInit() != DRV_SUCCESS) + return DRV_FAILURE; + + return DRV_SUCCESS; +} + +/************************************************************************** + * CoreAudio_drvFree [internal] + */ +static LRESULT CoreAudio_drvFree(void) +{ + TRACE("()\n"); + CoreAudio_MIDIRelease(); + return DRV_SUCCESS; +} + +/************************************************************************** + * CoreAudio_drvOpen [internal] + */ +static LRESULT CoreAudio_drvOpen(LPSTR str) +{ + TRACE("(%s)\n", str); + return 1; +} + +/************************************************************************** + * CoreAudio_drvClose [internal] + */ +static DWORD CoreAudio_drvClose(DWORD dwDevID) +{ + TRACE("(%08x)\n", dwDevID); + return 1; +} + +/************************************************************************** + * DriverProc (WINECOREAUDIO.1) + */ +LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) +{ + TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", + dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : + wMsg == DRV_FREE ? "DRV_FREE" : + wMsg == DRV_OPEN ? "DRV_OPEN" : + wMsg == DRV_CLOSE ? "DRV_CLOSE" : + wMsg == DRV_ENABLE ? "DRV_ENABLE" : + wMsg == DRV_DISABLE ? "DRV_DISABLE" : + wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" : + wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" : + wMsg == DRV_INSTALL ? "DRV_INSTALL" : + wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", + wMsg, dwParam1, dwParam2); + + switch(wMsg) { + case DRV_LOAD: return CoreAudio_drvLoad(); + case DRV_FREE: return CoreAudio_drvFree(); + case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); + case DRV_CLOSE: return CoreAudio_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; + case DRV_QUERYCONFIGURE: return 1; + case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; + default: + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } +} -- 2.33.1

1 0

[PATCH 1/9] Revert "makefiles: Use static importlibs on all platforms."
by Rémi Bernon 17 Nov '21

17 Nov '21

This reverts commit a9b5bb326a1514e2c4185633ab34b22c9bbc9863. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This first patch is only there so that the testbot can run the tests without failing spuriously. The change broke graphics drivers, although I don't know precisely how and it should probably be fixed instead of reverting it. tools/makedep.c | 78 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea46aed8d8..d5412eccfa4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,10 +2189,19 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - lib = get_static_lib( submakes[j], name ); - if (lib) break; + { + if (is_cross || !*dll_ext || submakes[j]->staticimplib) + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + { + strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); + if (needs_implib_symlink( submakes[j] )) + strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); + } + break; + } + + if ((lib = get_static_lib( submakes[j], name ))) break; } if (lib) @@ -2579,8 +2588,12 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[2] = { "a", "cross.a" }; - int i, count = 1 + !!crosstarget; + const char *lib, *dst, *ext[4]; + int i, count = 0; + + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; + if (needs_delay_lib( make )) ext[count++] = "delay.a"; for (i = 0; i < count; i++) { @@ -3307,27 +3320,42 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) + if (*dll_ext && !make->implib_objs.count) { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); + strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); + output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.def", make->importlib ), + strmake( "d%s/lib%s.def", so_dir, make->importlib )); + } + else + { + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) + { + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); + } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); - if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); -- 2.33.1

3 13

[PATCH 1/3] d3d10core/tests: Add a test for DXGI_FORMAT_R8G8_UINT support in vertex buffers.
by Nikolay Sivov 17 Nov '21

17 Nov '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index b8338152bb7..73151f2296c 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13645,6 +13645,10 @@ static void test_format_support(void) {DXGI_FORMAT_R32_UINT}, {DXGI_FORMAT_R16_UINT}, }; + static const struct format_support vertex_buffers[] = + { + {DXGI_FORMAT_R8G8_UINT}, + }; if (!(device = create_device())) { @@ -13685,6 +13689,9 @@ static void test_format_support(void) check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + check_format_support(format_support, vertex_buffers, ARRAY_SIZE(vertex_buffers), + D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER, "vertex buffer"); + check_format_support(format_support, display_format_support, ARRAY_SIZE(display_format_support), D3D10_FORMAT_SUPPORT_DISPLAY, "display"); -- 2.33.0

3 7

[PATCH 6/6] win32u: Move NtUserScrollDC implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

3 2

[PATCH 5/6] win32u: Move NtUserGetMouseMovePointsEx implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 67 ----------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/input.c | 64 +++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 11 +++++++ 7 files changed, 79 insertions(+), 69 deletions(-)

3 2

[PATCH 4/6] win32u: Move NtUserUnregisterHotKey implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 28 ---------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++++ 8 files changed, 43 insertions(+), 30 deletions(-)

3 2

[PATCH 3/6] win32u: Move NtUserGetKeyboardLayoutList implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +--- dlls/user32/input.c | 51 -------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 47 ++++++++++++++++++++++++ dlls/win32u/wrappers.c | 5 +++ 9 files changed, 132 insertions(+), 59 deletions(-)

3 2

[PATCH 2/6] win32u: Move NtUserActivateKeyboardLayout implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

3 2

[PATCH 1/6] win32u: Move NtUserToUnicodeEx implementation from user32.
by Jacek Caban 17 Nov '21

17 Nov '21

3 2

[PATCH v3] kernel32/tests: Add SetCurrentConsoleFontEx tests for the current window size
by Hugh McMaster 17 Nov '21

17 Nov '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in v3: - Drop font selection loop. - Drop nFont comparisons. dlls/kernel32/tests/console.c | 187 +++++++++++++++++++++++++++++++++- 1 file changed, 185 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 8b5abfa2da9..bf9bf158267 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3554,10 +3554,17 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + unsigned int cp, font_family; + const WCHAR *face_name = L"Courier New"; + + font_family = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + + /* Save current console font information */ + cp = GetConsoleOutputCP(); orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3651,17 +3658,193 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + SetConsoleOutputCP(CP_UTF8); + + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + cfix.FontFamily = font_family; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, face_name); + + tmp.cbSize = sizeof(tmp); + + /* Courier New is available in the console by default from Windows 10 build 1607 */ + SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + + if (lstrcmpW(tmp.FaceName, face_name)) + { + SetConsoleOutputCP(cp); + skip("%s not available. Skipping SetCurrentConsoleFontEx tests.\n", wine_dbgstr_w(face_name)); + return; + } + + /* Test font size 8x16 */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20 */ + cfix.dwFontSize.X = 10; + cfix.dwFontSize.Y = 20; SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 5x12. We pass in 10x12. */ + cfix.dwFontSize.Y = 12; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size 10x20. Font height is 20. All other metrics are zero. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 20; + cfix.FontFamily = 0; + cfix.FontWeight = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 10, "got %u, expected font width of 10\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 20, "got %u, expected font height of 20\n", tmp.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == font_family, "got %u, expected %u\n", tmp.FontFamily, font_family); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test font size 7x14. We pass in 7x0. */ + cfix = tmp; + cfix.dwFontSize.X = 7; + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test font size with width and height set to 0x0. */ + cfix.dwFontSize.X = 0; + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == 5, "got %u, expected font width of 5\n", tmp.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %u, expected font height of 12\n", tmp.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, cfix.FaceName), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(cfix.FaceName)); + + /* Test with invalid font face name */ + cfix.dwFontSize.X = 8; + cfix.dwFontSize.Y = 16; + lstrcpyW(cfix.FaceName, L"MissingFont"); + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + + /* Test with no font face name */ + cfix.FaceName[0] = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + memset(&tmp, 0, sizeof(tmp)); + tmp.cbSize = sizeof(tmp); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(tmp.dwFontSize.X == cfix.dwFontSize.X, "got %u, expected font width of %u\n", + tmp.dwFontSize.X, cfix.dwFontSize.X); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %u, expected font height of %u\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + ok(!lstrcmpW(tmp.FaceName, face_name), "got %s, expected %s\n", + wine_dbgstr_w(tmp.FaceName), wine_dbgstr_w(face_name)); + /* Restore original console font parameters */ + SetConsoleOutputCP(cp); + SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); -- 2.33.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader/spirv: Shift the private variable destination mask instead of the source mask.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Otherwise if the input is located above position 0 in the private array it will be swizzled incorrectly, e.g. a.yz instead of a.xy in test_domain_shader_inputs(). Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5a7e561f..b7e7428a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4672,8 +4672,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id, - vkd3d_write_mask_from_component_count(input_component_count) << component_idx, - VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask); + vkd3d_write_mask_from_component_count(input_component_count), + VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_SHADER_NO_SWIZZLE, dst->write_mask >> component_idx); vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst_reg, dst->write_mask, val_id); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 670fbf4a..3b0c4242 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29506,7 +29506,6 @@ static void test_domain_shader_inputs(void) {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, }; - static const unsigned int is_todo[] = {0x00110000, 0x00110000, 0x00110000, 0x00110000}; static const unsigned int stride = sizeof(*reference); memset(&desc, 0, sizeof(desc)); @@ -29556,9 +29555,8 @@ static void test_domain_shader_inputs(void) const float *elems = get_readback_data(&rb, y, 0, 0, stride); for (x = 0; x < ARRAY_SIZE(*reference); ++x) { - todo_if(is_todo[y] & (1u << (x * 4))) - ok(compare_float(reference[y][x], elems[x], 0), - "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); } } release_resource_readback(&rb); -- 2.20.1

1 0

[PATCH vkd3d 5/6] vkd3d-shader/spirv: Fix the outer tessellation level indices for isoline tessellation.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> For isoline tessellation, "density" is specified by OL0, and "detail" by OL1. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- tests/d3d12.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e1a7dd37..5a7e561f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4084,8 +4084,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_TRIANGLE_W_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 2}}, {VKD3D_SIV_TRIANGLE_INNER_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelInner, NULL, 2, 0}}, - {VKD3D_SIV_LINE_DETAIL_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, - {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, + {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 0}}, + {VKD3D_SIV_LINE_DETAIL_TESS_FACTOR, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInTessLevelOuter, NULL, 4, 1}}, }; static const struct vkd3d_spirv_builtin vkd3d_pixel_shader_position_builtin = { diff --git a/tests/d3d12.c b/tests/d3d12.c index f5a1723a..670fbf4a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29506,7 +29506,7 @@ static void test_domain_shader_inputs(void) {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, }; - static const unsigned int is_todo[] = {0x00110000, 0x00110100, 0x00111100, 0x00111000}; + static const unsigned int is_todo[] = {0x00110000, 0x00110000, 0x00110000, 0x00110000}; static const unsigned int stride = sizeof(*reference); memset(&desc, 0, sizeof(desc)); -- 2.20.1

1 0

[PATCH vkd3d 4/6] tests: Add tests for a domain shader using a single patch constant input value.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> This specifically tests the case where "count" would end up being one for arrayed builtins in needs_private_io_variable(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9b0a91f7..f5a1723a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29567,6 +29567,180 @@ static void test_domain_shader_inputs(void) destroy_test_context(&context); } +static void test_domain_shader_one_patch_constant_input(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12Resource *so_buffer; + ID3D12CommandQueue *queue; + unsigned int x, y; + HRESULT hr; + +#if 0 + struct data + { + float4 position : SV_Position; + }; + + data vs_main() + { + data d; + d.position = float4(1.0f, 2.0f, 3.0f, 4.0f); + return d; + } + + struct patch_constant_data + { + float tess_factor[2] : SV_TessFactor; + }; + + void patch_constant(OutputPatch<data, 1> control_points, + uint prim_id : SV_PrimitiveID, + out patch_constant_data output) + { + output.tess_factor[0] = 2.0f; + output.tess_factor[1] = 1.0f; + } + + [domain("isoline")] + [outputcontrolpoints(1)] + [partitioning("integer")] + [outputtopology("line")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input) + { + return input[0]; + } + + [domain("isoline")] + void ds_main(float tess_factor[2] : SV_TessFactor, + const OutputPatch<data, 1> patch, + out float4 position : SV_Position) + { + position = float4(patch[0].position.xyz, tess_factor[1]); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xcb24c840, 0x8a22891b, 0xcf0dbe1d, 0x7b0a4fdb, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x36132cb6, 0x45a8f125, 0x2ff97810, 0xf60e439e, 0x00000001, 0x000001f4, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x00000048, + 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000e01, + 0x00000038, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0xabab0072, 0x58454853, 0x00000104, 0x00030050, 0x00000041, 0x01000071, 0x01000893, + 0x01000894, 0x01000895, 0x01000896, 0x01001097, 0x0100086a, 0x00001835, 0x0000000a, 0x40000000, + 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, 0x01000072, + 0x0400005f, 0x002010f2, 0x00000001, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, + 0x00000002, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000016, 0x04000067, + 0x00102012, 0x00000001, 0x00000015, 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, + 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00902012, 0x0010000a, + 0x00000000, 0x0090900a, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0x3ac40533, 0x2aa65785, 0x41df1859, 0xb3b2294b, 0x00000001, 0x00000164, 0x00000004, + 0x00000030, 0x00000064, 0x000000b4, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x00000048, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000010, + 0x00000003, 0x00000000, 0x00000001, 0x00000038, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, + 0x00000101, 0x545f5653, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x58454853, 0x00000074, 0x00040050, 0x0000001d, 0x01000893, 0x01000895, + 0x0100086a, 0x04000061, 0x0011b012, 0x00000001, 0x00000015, 0x0400005f, 0x00219072, 0x00000001, + 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x06000036, 0x00102072, 0x00000000, + 0x00219246, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x0011b00a, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + }; + static const float reference[][4] = + { + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + {1.0f, 2.0f, 3.0f, 1.0f}, + }; + static const unsigned int stride = sizeof(*reference); + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + memset(&input_layout, 0, sizeof(input_layout)); + + init_pipeline_state_desc(&pso_desc, context.root_signature, DXGI_FORMAT_UNKNOWN, &vs, NULL, &input_layout); + pso_desc.HS = hs; + pso_desc.DS = ds; + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = &stride; + pso_desc.StreamOutput.NumStrides = 1; + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + so_buffer = create_default_buffer(context.device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (y = 0; y < ARRAY_SIZE(reference); ++y) + { + const float *elems = get_readback_data(&rb, y, 0, 0, stride); + for (x = 0; x < ARRAY_SIZE(*reference); ++x) + { + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + } + } + release_resource_readback(&rb); + + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -35970,6 +36144,7 @@ START_TEST(d3d12) run_test(test_line_tessellation); run_test(test_tessellation_primitive_id); run_test(test_domain_shader_inputs); + run_test(test_domain_shader_one_patch_constant_input); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.20.1

1 0

[PATCH vkd3d 3/6] tests: Add tests for domain shader patch constant inputs.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8071faf0..9b0a91f7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29360,6 +29360,213 @@ static void test_tessellation_primitive_id(void) destroy_test_context(&context); } +static void test_domain_shader_inputs(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12Resource *so_buffer; + ID3D12CommandQueue *queue; + unsigned int x, y; + HRESULT hr; + +#if 0 + struct data + { + float4 position : SV_Position; + }; + + data vs_main() + { + data d; + d.position = float4(1.0f, 2.0f, 3.0f, 4.0f); + return d; + } + + struct patch_constant_data + { + float tess_factor[2] : SV_TessFactor; + float3 a : A; + float3 b : B; + }; + + void patch_constant(OutputPatch<data, 1> control_points, + uint prim_id : SV_PrimitiveID, + out patch_constant_data output) + { + output.tess_factor[0] = 2.0f; + output.tess_factor[1] = 1.0f; + output.a = float3(2.0f, 4.0f, 10.0f); + output.b = float3(3.0f, 3.0f, 12.0f); + } + + [domain("isoline")] + [outputcontrolpoints(1)] + [partitioning("integer")] + [outputtopology("line")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 1> input) + { + return input[0]; + } + + [domain("isoline")] + void ds_main(float tess_factor[2] : SV_TessFactor, + float2 tess_coord : SV_DomainLocation, + float3 a : A, + float3 b : B, + const OutputPatch<data, 1> patch, + out float4 position : SV_Position, + out float4 out_color : COLOR) + { + position = float4(patch[0].position.xy, tess_coord); + out_color = float4(0.5f * (a.xy + b.yz), tess_factor[0], tess_factor[1]); + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0xcb24c840, 0x8a22891b, 0xcf0dbe1d, 0x7b0a4fdb, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x00000040, 0x00010050, 0x00000010, + 0x0100086a, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x40000000, 0x40400000, 0x40800000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD hs_code[] = + { + 0x43425844, 0x67db9c59, 0xff2c4d5e, 0xc2a4d15b, 0x0f71495f, 0x00000001, 0x00000384, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000011c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000007c, + 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000010, 0x00000003, 0x00000000, 0x00000e01, + 0x00000076, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000010e, 0x00000068, 0x00000001, + 0x0000000f, 0x00000003, 0x00000001, 0x00000e01, 0x00000078, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000010e, 0x545f5653, 0x46737365, 0x6f746361, 0x00410072, 0xabab0042, 0x58454853, + 0x00000260, 0x00030050, 0x00000098, 0x01000071, 0x01000893, 0x01000894, 0x01000895, 0x01000896, + 0x01001097, 0x0100086a, 0x00001835, 0x0000000a, 0x41200000, 0x40800000, 0x40000000, 0x40000000, + 0x41400000, 0x40400000, 0x40400000, 0x3f800000, 0x01000072, 0x0400005f, 0x002010f2, 0x00000001, + 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, + 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, + 0x04000067, 0x00102012, 0x00000000, 0x00000016, 0x04000067, 0x00102012, 0x00000001, 0x00000015, + 0x02000068, 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000002, 0x04000036, 0x00100012, + 0x00000000, 0x0001700a, 0x07000036, 0x00902012, 0x0010000a, 0x00000000, 0x0090903a, 0x0010000a, + 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x03000065, + 0x00102022, 0x00000000, 0x03000065, 0x00102022, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, + 0x00102022, 0x00000000, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, + 0x00902022, 0x0010000a, 0x00000000, 0x0090902a, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, + 0x02000099, 0x00000002, 0x0200005f, 0x00017000, 0x03000065, 0x00102042, 0x00000000, 0x03000065, + 0x00102042, 0x00000001, 0x02000068, 0x00000001, 0x0400005b, 0x00102042, 0x00000000, 0x00000002, + 0x04000036, 0x00100012, 0x00000000, 0x0001700a, 0x07000036, 0x00902042, 0x0010000a, 0x00000000, + 0x0090901a, 0x0010000a, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, 0x00000002, 0x0200005f, + 0x00017000, 0x03000065, 0x00102082, 0x00000000, 0x03000065, 0x00102082, 0x00000001, 0x02000068, + 0x00000001, 0x0400005b, 0x00102082, 0x00000000, 0x00000002, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x07000036, 0x00902082, 0x0010000a, 0x00000000, 0x0090900a, 0x0010000a, 0x00000000, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs = {hs_code, sizeof(hs_code)}; + static const DWORD ds_code[] = + { + 0x43425844, 0xef67f8be, 0x1be137b6, 0x0e4a6b01, 0xf0cd92d8, 0x00000001, 0x00000264, 0x00000004, + 0x00000030, 0x00000064, 0x000000e8, 0x0000013c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000010, + 0x00000003, 0x00000000, 0x00000101, 0x00000076, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000060e, 0x00000068, 0x00000001, 0x0000000f, 0x00000003, 0x00000001, 0x00000101, 0x00000078, + 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c0e, 0x545f5653, 0x46737365, 0x6f746361, + 0x00410072, 0xabab0042, 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, + 0x00000001, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x4f4c4f43, 0xabab0052, 0x58454853, + 0x00000120, 0x00040050, 0x00000048, 0x01000893, 0x01000895, 0x0100086a, 0x04000061, 0x0011b012, + 0x00000000, 0x00000016, 0x0300005f, 0x0011b062, 0x00000000, 0x04000061, 0x0011b012, 0x00000001, + 0x00000015, 0x0300005f, 0x0011b0c2, 0x00000001, 0x0200005f, 0x0001c032, 0x0400005f, 0x00219032, + 0x00000001, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000001, 0x02000068, 0x00000001, 0x06000036, 0x00102032, 0x00000000, 0x00219046, 0x00000000, + 0x00000000, 0x04000036, 0x001020c2, 0x00000000, 0x0001c406, 0x07000000, 0x00100032, 0x00000000, + 0x0011b596, 0x00000000, 0x0011bae6, 0x00000001, 0x0a000038, 0x00102032, 0x00000001, 0x00100046, + 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x05000036, 0x00102042, + 0x00000001, 0x0011b00a, 0x00000000, 0x05000036, 0x00102082, 0x00000001, 0x0011b00a, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 4, 0}, + }; + static const float reference[][8] = + { + {1.0f, 2.0f, 0.0f, 0.0f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 1.0f, 0.0f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 0.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, + {1.0f, 2.0f, 1.0f, 0.5f, 2.5f, 8.0f, 2.0f, 1.0f}, + }; + static const unsigned int is_todo[] = {0x00110000, 0x00110100, 0x00111100, 0x00111000}; + static const unsigned int stride = sizeof(*reference); + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + memset(&input_layout, 0, sizeof(input_layout)); + + init_pipeline_state_desc(&pso_desc, context.root_signature, DXGI_FORMAT_UNKNOWN, &vs, NULL, &input_layout); + pso_desc.HS = hs; + pso_desc.DS = ds; + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = &stride; + pso_desc.StreamOutput.NumStrides = 1; + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + so_buffer = create_default_buffer(context.device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (y = 0; y < ARRAY_SIZE(reference); ++y) + { + const float *elems = get_readback_data(&rb, y, 0, 0, stride); + for (x = 0; x < ARRAY_SIZE(*reference); ++x) + { + todo_if(is_todo[y] & (1u << (x * 4))) + ok(compare_float(reference[y][x], elems[x], 0), + "Got unexpected value %.8e for [%u][%u], expected %.8e.\n", elems[x], y, x, reference[y][x]); + } + } + release_resource_readback(&rb); + + ID3D12Resource_Release(so_buffer); + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -35762,6 +35969,7 @@ START_TEST(d3d12) run_test(test_hull_shader_fork_phase); run_test(test_line_tessellation); run_test(test_tessellation_primitive_id); + run_test(test_domain_shader_inputs); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); -- 2.20.1

1 0

[PATCH vkd3d 2/6] vkd3d-shader/spirv: Handle arrayed builtin inputs.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Fixes invalid SPIR-V being generated in Monster Hunter: World. Based on vkd3d-proton patches by Hans-Kristian Arntzen and Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This is triggered by the tests in patch 3/6 and 4/6 in this series. libs/vkd3d-shader/spirv.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8827c431..e1a7dd37 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4416,6 +4416,13 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa bool have_sysval = false; unsigned int i, count; + /* Always use private variables for arrayed builtins. These are generally + * scalars on the D3D side, so would need extra array indices when + * accessing them. It may be feasible to insert those indices at the point + * where the builtins are used, but it's not clear it's worth the effort. */ + if (builtin && (builtin->spirv_array_size || builtin->fixup_pfn)) + return true; + if (*component_count == VKD3D_VEC4_SIZE) return false; @@ -4519,8 +4526,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi component_idx = vkd3d_write_mask_get_component_idx(signature_element->mask); } - if (!(use_private_var = builtin && builtin->fixup_pfn) - && needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) + if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask) && (compiler->shader_type != VKD3D_SHADER_TYPE_HULL || (reg->type != VKD3DSPR_INCONTROLPOINT && reg->type != VKD3DSPR_PATCHCONST))) use_private_var = true; @@ -4644,6 +4650,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); dst_reg.idx[0].offset = i; } + else if (builtin && builtin->spirv_array_size) + { + /* The D3D builtin is not an array, but the SPIR-V builtin is, + * so we'll need to index into the SPIR-V builtin when loading + * it. This happens when reading TessLevel in domain shaders. */ + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); + index = vkd3d_dxbc_compiler_get_constant_uint(compiler, builtin->member_idx); + val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); + dst_reg.idx[0].offset = reg_idx + i; + } val_id = vkd3d_spirv_build_op_load(builder, type_id, val_id, SpvMemoryAccessMaskNone); if (builtin && builtin->fixup_pfn) @@ -4947,11 +4963,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; struct vkd3d_symbol *symbol = NULL; + bool use_private_variable = false; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; unsigned int signature_idx; - bool use_private_variable; unsigned int write_mask; unsigned int array_size; bool is_patch_constant; @@ -4991,11 +5007,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; - if (!(use_private_variable = builtin && builtin->spirv_array_size) - && (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE + if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_SHADER_NO_SWIZZLE || needs_private_io_variable(shader_signature, signature_element->register_index, builtin, &output_component_count, &write_mask) - || is_patch_constant)) + || is_patch_constant) use_private_variable = true; else component_idx = vkd3d_write_mask_get_component_idx(write_mask); -- 2.20.1

1 0

[PATCH vkd3d 1/6] vkd3d-shader/spirv: Apply 'Patch' decorations to builtin patch constant inputs.
by Henri Verbeet 17 Nov '21

17 Nov '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Prevents a crash in radv when such inputs are present. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This is triggered by the tests in patch 3/6 and 4/6 in this series. libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 698c3054..8827c431 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4582,6 +4582,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + if (reg->type == VKD3DSPR_PATCHCONST) + vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); } else { -- 2.20.1

1 0

[PATCH v2 01/10] Revert "makefiles: Use static importlibs on all platforms."
by Rémi Bernon 17 Nov '21

17 Nov '21

This reverts commit a9b5bb326a1514e2c4185633ab34b22c9bbc9863. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Add a win32u fix for a random explorer.exe crash on startup, although maybe unrelated to the issues seen before. Fix call to CancelIoEx / GetOverlappedResult which didn't previously wait on Wine, causing 32bit segmentation fault after the result was later overwritten on the stack. PATCH 1 is still only there for the tests to run. tools/makedep.c | 78 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea46aed8d8..d5412eccfa4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2189,10 +2189,19 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) - lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); - else - lib = get_static_lib( submakes[j], name ); - if (lib) break; + { + if (is_cross || !*dll_ext || submakes[j]->staticimplib) + lib = obj_dir_path( submakes[j], strmake( "lib%s.a", name )); + else + { + strarray_add_uniq( deps, strmake( "%s/lib%s.def", submakes[j]->obj_dir, name )); + if (needs_implib_symlink( submakes[j] )) + strarray_add_uniq( deps, strmake( "dlls/lib%s.def", name )); + } + break; + } + + if ((lib = get_static_lib( submakes[j], name ))) break; } if (lib) @@ -2579,8 +2588,12 @@ static void output_uninstall_rules( struct makefile *make ) static struct strarray output_importlib_symlinks( const struct makefile *make ) { struct strarray ret = empty_strarray; - const char *lib, *dst, *ext[2] = { "a", "cross.a" }; - int i, count = 1 + !!crosstarget; + const char *lib, *dst, *ext[4]; + int i, count = 0; + + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; + if (needs_delay_lib( make )) ext[count++] = "delay.a"; for (i = 0; i < count; i++) { @@ -3307,27 +3320,42 @@ static void output_module( struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - - strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); - if (!*dll_ext && needs_delay_lib( make )) + if (*dll_ext && !make->implib_objs.count) { - strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); - output( "%s.delay.a ", importlib_path ); + strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); + output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output( "\t%s%s -w --def -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.def", make->importlib ), + strmake( "d%s/lib%s.def", so_dir, make->importlib )); + } + else + { + strarray_add( &make->clean_files, strmake( "lib%s.a", make->importlib )); + if (!*dll_ext && needs_delay_lib( make )) + { + strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); + output( "%s.delay.a ", importlib_path ); + } + output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); + output_filenames( target_flags ); + if (make->is_win16) output_filename( "-m16" ); + output_filename( "--export" ); + output_filename( spec_file ); + output_filenames_obj_dir( make, make->implib_objs ); + output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.a", make->importlib ), + strmake( "d%s/lib%s.a", so_dir, make->importlib )); } - output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - output( "\t%s%s -w --implib -o $@", cmd_prefix( "BUILD" ), tools_path( make, "winebuild" ) ); - output_filenames( target_flags ); - if (make->is_win16) output_filename( "-m16" ); - output_filename( "--export" ); - output_filename( spec_file ); - output_filenames_obj_dir( make, make->implib_objs ); - output( "\n" ); - add_install_rule( make, make->importlib, - strmake( "lib%s.a", make->importlib ), - strmake( "d%s/lib%s.a", so_dir, make->importlib )); - if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); -- 2.33.1

1 10

[PATCH v2 3/3] msdasql: Implement IGetDataSource GetDataSource
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 +- dlls/msdasql/msdasql_private.h | 2 +- dlls/msdasql/session.c | 15 ++++++++++++--- dlls/msdasql/tests/provider.c | 7 ++++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index e98945b9777..bc208a74cc5 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -559,7 +559,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index a3d73498fe9..7d7f67c2c78 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 44f36f0e591..b4239c59037 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,8 @@ struct msdasql_session ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; LONG refs; + + IUnknown *datasource; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -139,6 +141,8 @@ static ULONG WINAPI session_Release(IUnknown *iface) if (!refs) { TRACE( "destroying %p\n", session ); + + IUnknown_Release(session->datasource); heap_free( session ); } return refs; @@ -173,9 +177,13 @@ ULONG WINAPI datasource_Release(IGetDataSource *iface) HRESULT WINAPI datasource_GetDataSource(IGetDataSource *iface, REFIID riid, IUnknown **datasource) { struct msdasql_session *session = impl_from_IGetDataSource( iface ); - FIXME("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); - return E_NOTIMPL; + TRACE("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); + + if (!datasource) + return E_INVALIDARG; + + return IUnknown_QueryInterface(session->datasource, riid, (void**)datasource); } static const IGetDataSourceVtbl datasourceVtbl = @@ -1155,7 +1163,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1169,6 +1177,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index a0b11194f2b..b520b127d67 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -399,7 +399,7 @@ static void test_command_rowset(IUnknown *cmd) static void test_sessions(void) { - IDBProperties *props; + IDBProperties *props, *dsource = NULL; IDBInitialize *dbinit = NULL; IDataInitialize *datainit; IDBCreateSession *dbsession = NULL; @@ -456,6 +456,11 @@ static void test_sessions(void) hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IGetDataSource_GetDataSource(datasource, &IID_IDBProperties, (IUnknown**)&dsource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dsource == props, "different pointers\n"); + IDBProperties_Release(dsource); IGetDataSource_Release(datasource); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); -- 2.33.0

2 1

[PATCH v2 2/3] msdasql: Move ICommandWithParameters to the correct interface
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index df394264bf7..44f36f0e591 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -293,6 +293,7 @@ struct command IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; + ICommandWithParameters ICommandWithParameters_iface; LONG refs; WCHAR *query; IUnknown *session; @@ -323,6 +324,11 @@ static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); } +static inline struct command *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandWithParameters_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -352,6 +358,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandPrepare_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &command->ICommandWithParameters_iface; + } if(*ppv) { @@ -426,7 +436,6 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; - ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -456,11 +465,6 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } -static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) -{ - return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); -} - static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -489,10 +493,6 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } - else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) - { - *ppv = &rowset->ICommandWithParameters_iface; - } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -801,58 +801,6 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; -static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); -} - -static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_AddRef(&rowset->IRowset_iface); -} - -static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_Release(&rowset->IRowset_iface); -} - -static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, - DBPARAMINFO **info, OLECHAR **buffer) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, - LPCWSTR names[], DB_LPARAMS ordinals[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, - const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); - return E_NOTIMPL; -} - -struct ICommandWithParametersVtbl command_with_params_vtbl = -{ - cmd_with_params_QueryInterface, - cmd_with_params_AddRef, - cmd_with_params_Release, - cmd_with_params_GetParameterInfo, - cmd_with_params_MapParameterNames, - cmd_with_params_SetParameterInfo -}; - static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -871,7 +819,6 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); @@ -1116,6 +1063,58 @@ struct ICommandPrepareVtbl commandprepareVtbl = commandprepare_Unprepare }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", command, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -1137,6 +1136,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; + command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; -- 2.33.0

2 1

[PATCH v2 1/3] msdasql: ICommandPrepare Un/Prepare return S_OK
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

These functions are to attempt to optimize the query that is about to be run. We can safely ignore these calls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 196fd1c6b81..df394264bf7 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1096,15 +1096,15 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p, %u\n", command, runs); - return E_NOTIMPL; + TRACE("%p, %u\n", command, runs); + return S_OK; } static HRESULT WINAPI commandprepare_Unprepare(ICommandPrepare *iface) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p\n", command); - return E_NOTIMPL; + TRACE("%p\n", command); + return S_OK; } struct ICommandPrepareVtbl commandprepareVtbl = -- 2.33.0

2 1

[PATCH v3 0/9] winedbg(gdbproxy): don't misbehave on module names w/ special characters; modernise
by Jinoh Kang 17 Nov '21

17 Nov '21

Changelog: v1 -> v2: address review comments so far v2 -> v3: - Change cover letter subject - Capitalise subject - Split qXfer cache patch into two Jinoh Kang (9): winedbg: Crash when allocation fails in packet_realloc(). winedbg: Free buffer and return NULL if size==0 in packet_realloc(). winedbg: Generalise packet_realloc(), rename to buffer_realloc(). winedbg: Use unsigned int for offset/length in GDB qXfer handler. winedbg: Escape special characters in GDB packet reply. winedbg: Buffer and escape output of GDB qXfer commands. winedbg: Define table for GDB qXfer command handlers. winedbg: Cache GDB qXfer command result for chunked fetching. winedbg: Implement GDB qXfer object exec-file. programs/winedbg/gdbproxy.c | 565 ++++++++++++++++++++++++++++-------- 1 file changed, 452 insertions(+), 113 deletions(-) -- 2.31.1

2 25

[PATCH 1/3] uxtheme: Support more progress bar parts.
by Zhiyi Zhang 17 Nov '21

17 Nov '21

These parts are available on Vista+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index c9a23429511..afeda659a36 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -526,6 +526,26 @@ static const MSSTYLES_CLASS_MAP classProgress[] = { {PP_BARVERT, 0, L"BARVERT"}, {PP_CHUNK, 0, L"CHUNK"}, {PP_CHUNKVERT, 0, L"CHUNKVERT"}, + {PP_FILL, 0, L"FILL"}, + {PP_FILL, PBFS_NORMAL, L"NORMAL"}, + {PP_FILL, PBFS_ERROR, L"ERROR"}, + {PP_FILL, PBFS_PAUSED, L"PAUSED"}, + {PP_FILL, PBFS_PARTIAL, L"PARTIAL"}, + {PP_FILLVERT, 0, L"FILLVERT"}, + {PP_FILLVERT, PBFVS_NORMAL, L"NORMAL"}, + {PP_FILLVERT, PBFVS_ERROR, L"ERROR"}, + {PP_FILLVERT, PBFVS_PAUSED, L"PAUSED"}, + {PP_FILLVERT, PBFVS_PARTIAL, L"PARTIAL"}, + {PP_PULSEOVERLAY, 0, L"PULSEOVERLAY"}, + {PP_MOVEOVERLAY, 0, L"MOVEOVERLAY"}, + {PP_PULSEOVERLAYVERT, 0, L"PULSEOVERLAYVERT"}, + {PP_MOVEOVERLAYVERT, 0, L"MOVEOVERLAYVERT"}, + {PP_TRANSPARENTBAR, 0, L"TRANSPARENTBAR"}, + {PP_TRANSPARENTBAR, PBBS_NORMAL, L"NORMAL"}, + {PP_TRANSPARENTBAR, PBBS_PARTIAL, L"PARTIAL"}, + {PP_TRANSPARENTBARVERT, 0, L"TRANSPARENTBARVERT"}, + {PP_TRANSPARENTBARVERT, PBBVS_NORMAL, L"NORMAL"}, + {PP_TRANSPARENTBARVERT, PBBVS_PARTIAL, L"PARTIAL"}, {0, 0, L""} }; -- 2.32.0

2 1

[PATCH 3/3] light.msstyles: Add more progress bar parts.
by Zhiyi Zhang 17 Nov '21

17 Nov '21

Fix Nokia SDK 2.0 for Java installer showing artifacts on its progress bar. The application queries for these Vista+ progress bar parts because Wine's default system version is set to Windows 7. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 49 ++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 87b5c26e617..ba27c9461bc 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -486,6 +486,55 @@ BLUE_INI TEXTFILE "SizingMargins = 1, 1, 1, 1\r\n" "SizingType = Stretch\r\n" +"[Progress.Fill]\r\n" +"FillColor = 48 150 250\r\n" + +"[Progress.FillVert]\r\n" +"FillColor = 48 150 250\r\n" + +"[Progress.Fill(Error)]\r\n" +"FillColor = 213 0 0\r\n" + +"[Progress.FillVert(Error)]\r\n" +"FillColor = 213 0 0\r\n" + +"[Progress.Fill(Paused)]\r\n" +"FillColor = 255 238 88\r\n" + +"[Progress.FillVert(Paused)]\r\n" +"FillColor = 255 238 88\r\n" + +"[Progress.Fill(Partial)]\r\n" +"FillColor = 189 189 189\r\n" + +"[Progress.FillVert(Partial)]\r\n" +"FillColor = 189 189 189\r\n" + +"[Progress.PulseOverlay]\r\n" +"BgType = None\r\n" + +"[Progress.MoveOverlay]\r\n" +"BgType = None\r\n" + +"[Progress.PulseOverlayVert]\r\n" +"BgType = None\r\n" + +"[Progress.MoveOverlayVert]\r\n" +"BgType = None\r\n" + +"[Progress.TransparentBar]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_horizontal.bmp\r\n" +"MinSize = 10, 10\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.TransparentBarVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" -- 2.32.0

1 0

[PATCH 2/3] light.msstyles: Fix incorrect progress bar chunk color.
by Zhiyi Zhang 17 Nov '21

17 Nov '21

Fix Nokia SDK 2.0 for Java installer not showing progress chunks. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index aad8aa51d09..87b5c26e617 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -457,7 +457,7 @@ BLUE_INI TEXTFILE "ProgressSpaceSize = 0\r\n" "BgType = BorderFill\r\n" "FillType = Solid\r\n" -"FillColor = 255 255 255\r\n" +"FillColor = 48 150 250\r\n" "BorderSize = 1\r\n" "BorderColor = 174 174 174\r\n" -- 2.32.0

1 0

[PATCH 3/3] msdasql: Implement IGetDataSource GetDataSource
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 +- dlls/msdasql/msdasql_private.h | 2 +- dlls/msdasql/session.c | 15 ++++++++++++--- dlls/msdasql/tests/provider.c | 7 ++++++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index e98945b9777..bc208a74cc5 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -559,7 +559,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index a3d73498fe9..7d7f67c2c78 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 44f36f0e591..b4239c59037 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -43,6 +43,8 @@ struct msdasql_session ISessionProperties ISessionProperties_iface; IDBCreateCommand IDBCreateCommand_iface; LONG refs; + + IUnknown *datasource; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -139,6 +141,8 @@ static ULONG WINAPI session_Release(IUnknown *iface) if (!refs) { TRACE( "destroying %p\n", session ); + + IUnknown_Release(session->datasource); heap_free( session ); } return refs; @@ -173,9 +177,13 @@ ULONG WINAPI datasource_Release(IGetDataSource *iface) HRESULT WINAPI datasource_GetDataSource(IGetDataSource *iface, REFIID riid, IUnknown **datasource) { struct msdasql_session *session = impl_from_IGetDataSource( iface ); - FIXME("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); - return E_NOTIMPL; + TRACE("%p, %s, %p stub\n", session, debugstr_guid(riid), datasource); + + if (!datasource) + return E_INVALIDARG; + + return IUnknown_QueryInterface(session->datasource, riid, (void**)datasource); } static const IGetDataSourceVtbl datasourceVtbl = @@ -1155,7 +1163,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1169,6 +1177,7 @@ HRESULT create_db_session(REFIID riid, void **unk) session->IOpenRowset_iface.lpVtbl = &openrowsetVtbl; session->ISessionProperties_iface.lpVtbl = &propertiesVtbl; session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; + IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index a0b11194f2b..f385f499b84 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -399,7 +399,7 @@ static void test_command_rowset(IUnknown *cmd) static void test_sessions(void) { - IDBProperties *props; + IDBProperties *props, *dsource = NULL; IDBInitialize *dbinit = NULL; IDataInitialize *datainit; IDBCreateSession *dbsession = NULL; @@ -456,6 +456,11 @@ static void test_sessions(void) hr = IUnknown_QueryInterface(session, &IID_IGetDataSource, (void**)&datasource); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IGetDataSource_GetDataSource(datasource, &IID_IDBProperties, (IUnknown**)&dsource); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dsource != props, "different pointers\n"); + IDBProperties_Release(dsource); IGetDataSource_Release(datasource); hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); -- 2.33.0

2 1

[PATCH 2/3] msdasql: Move ICommandWithParameters to the correct interface
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 126 ++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index df394264bf7..44f36f0e591 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -293,6 +293,7 @@ struct command IColumnsInfo IColumnsInfo_iface; IConvertType IConvertType_iface; ICommandPrepare ICommandPrepare_iface; + ICommandWithParameters ICommandWithParameters_iface; LONG refs; WCHAR *query; IUnknown *session; @@ -323,6 +324,11 @@ static inline struct command *impl_from_ICommandPrepare( ICommandPrepare *iface return CONTAINING_RECORD( iface, struct command, ICommandPrepare_iface ); } +static inline struct command *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) +{ + return CONTAINING_RECORD( iface, struct command, ICommandWithParameters_iface ); +} + static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, void **ppv) { struct command *command = impl_from_ICommandText( iface ); @@ -352,6 +358,10 @@ static HRESULT WINAPI command_QueryInterface(ICommandText *iface, REFIID riid, v { *ppv = &command->ICommandPrepare_iface; } + else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) + { + *ppv = &command->ICommandWithParameters_iface; + } if(*ppv) { @@ -426,7 +436,6 @@ struct msdasql_rowset IColumnsInfo IColumnsInfo_iface; IAccessor IAccessor_iface; IColumnsRowset IColumnsRowset_iface; - ICommandWithParameters ICommandWithParameters_iface; IUnknown *caller; LONG refs; }; @@ -456,11 +465,6 @@ static inline struct msdasql_rowset *impl_from_IColumnsRowset ( IColumnsRowset * return CONTAINING_RECORD( iface, struct msdasql_rowset, IColumnsRowset_iface ); } -static inline struct msdasql_rowset *impl_from_ICommandWithParameters( ICommandWithParameters *iface ) -{ - return CONTAINING_RECORD( iface, struct msdasql_rowset, ICommandWithParameters_iface ); -} - static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, void **ppv) { struct msdasql_rowset *rowset = impl_from_IRowset( iface ); @@ -489,10 +493,6 @@ static HRESULT WINAPI msdasql_rowset_QueryInterface(IRowset *iface, REFIID riid, { *ppv = &rowset->IColumnsRowset_iface; } - else if(IsEqualGUID(&IID_ICommandWithParameters, riid)) - { - *ppv = &rowset->ICommandWithParameters_iface; - } else if (IsEqualGUID(&IID_IRowsetChange, riid)) { TRACE("IID_IRowsetChange not supported\n"); @@ -801,58 +801,6 @@ struct IColumnsRowsetVtbl columnrs_rs_vtbl = column_rs_GetColumnsRowset }; -static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_QueryInterface(&rowset->IRowset_iface, riid, out); -} - -static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_AddRef(&rowset->IRowset_iface); -} - -static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - return IRowset_Release(&rowset->IRowset_iface); -} - -static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, - DBPARAMINFO **info, OLECHAR **buffer) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %p, %p, %p\n", rowset, uparams, info, buffer); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, - LPCWSTR names[], DB_LPARAMS ordinals[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, names, ordinals); - return E_NOTIMPL; -} - -static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, - const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) -{ - struct msdasql_rowset *rowset = impl_from_ICommandWithParameters( iface ); - FIXME("%p, %ld, %p, %p\n", rowset, uparams, ordinals, bindinfo); - return E_NOTIMPL; -} - -struct ICommandWithParametersVtbl command_with_params_vtbl = -{ - cmd_with_params_QueryInterface, - cmd_with_params_AddRef, - cmd_with_params_Release, - cmd_with_params_GetParameterInfo, - cmd_with_params_MapParameterNames, - cmd_with_params_SetParameterInfo -}; - static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFIID riid, DBPARAMS *params, DBROWCOUNT *affected, IUnknown **rowset) { @@ -871,7 +819,6 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->IColumnsInfo_iface.lpVtbl = &rowset_columninfo_vtbll; msrowset->IAccessor_iface.lpVtbl = &accessor_vtbl; msrowset->IColumnsRowset_iface.lpVtbl = &columnrs_rs_vtbl; - msrowset->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); @@ -1116,6 +1063,58 @@ struct ICommandPrepareVtbl commandprepareVtbl = commandprepare_Unprepare }; +static HRESULT WINAPI cmd_with_params_QueryInterface(ICommandWithParameters *iface, REFIID riid, void **out) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_QueryInterface(&command->ICommandText_iface, riid, out); +} + +static ULONG WINAPI cmd_with_params_AddRef(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_AddRef(&command->ICommandText_iface); +} + +static ULONG WINAPI cmd_with_params_Release(ICommandWithParameters *iface) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + return ICommandText_Release(&command->ICommandText_iface); +} + +static HRESULT WINAPI cmd_with_params_GetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS *uparams, + DBPARAMINFO **info, OLECHAR **buffer) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %p, %p, %p\n", command, uparams, info, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_MapParameterNames(ICommandWithParameters *iface, DB_UPARAMS uparams, + LPCWSTR names[], DB_LPARAMS ordinals[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, names, ordinals); + return E_NOTIMPL; +} + +static HRESULT WINAPI cmd_with_params_SetParameterInfo(ICommandWithParameters *iface, DB_UPARAMS uparams, + const DB_UPARAMS ordinals[], const DBPARAMBINDINFO bindinfo[]) +{ + struct command *command = impl_from_ICommandWithParameters( iface ); + FIXME("%p, %ld, %p, %p\n", command, uparams, ordinals, bindinfo); + return E_NOTIMPL; +} + +struct ICommandWithParametersVtbl command_with_params_vtbl = +{ + cmd_with_params_QueryInterface, + cmd_with_params_AddRef, + cmd_with_params_Release, + cmd_with_params_GetParameterInfo, + cmd_with_params_MapParameterNames, + cmd_with_params_SetParameterInfo +}; + static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnknown *outer, REFIID riid, IUnknown **out) { @@ -1137,6 +1136,7 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->IColumnsInfo_iface.lpVtbl = &columninfoVtbl; command->IConvertType_iface.lpVtbl = &converttypeVtbl; command->ICommandPrepare_iface.lpVtbl = &commandprepareVtbl; + command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; -- 2.33.0

2 1

[PATCH 1/3] msdasql: ICommandPrepare Un/Prepare return S_OK
by Alistair Leslie-Hughes 17 Nov '21

17 Nov '21

These functions are to attempt to optimize the query that is about to be run. We can safely ignore these calls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 196fd1c6b81..df394264bf7 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1096,15 +1096,15 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p, %u\n", command, runs); - return E_NOTIMPL; + TRACE("%p, %u\n", command, runs); + return S_OK; } static HRESULT WINAPI commandprepare_Unprepare(ICommandPrepare *iface) { struct command *command = impl_from_ICommandPrepare( iface ); - FIXME("%p\n", command); - return E_NOTIMPL; + TRACE("%p\n", command); + return S_OK; } struct ICommandPrepareVtbl commandprepareVtbl = -- 2.33.0

2 1

[PATCH v2] po: Update Traditional Chinese translation.
by Chilung Chan 17 Nov '21

17 Nov '21

Signed-off-by: Chilung Chan <eason066(a)gmail.com> --- v2: Added back missing '\n'. To reviewers: Give yourself sufficient time to review the translations. po/zh_TW.po | 1356 +++++++++++++++++++++++---------------------------- 1 file changed, 598 insertions(+), 758 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index b72bc2b836a..566ea11a761 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-10-30 18:53+0800\n" +"PO-Revision-Date: 2021-11-06 18:33+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -4558,7 +4558,7 @@ msgstr "自動資料區段超出 64k。\n" #: dlls/kernel32/winerror.mc:793 msgid "Ring 2 segment must be movable.\n" -msgstr "環 2 資料段必須可被移動。\n" +msgstr "環形第 2 資料段必須可被移動。\n" #: dlls/kernel32/winerror.mc:798 msgid "Relocation chain exceeds segment limit in %1.\n" @@ -4582,11 +4582,11 @@ msgstr "檔案名稱過長。\n" #: dlls/kernel32/winerror.mc:823 msgid "Ring 2 stack in use.\n" -msgstr "環 2 堆疊使用中。\n" +msgstr "環形第 2 堆疊現正使用中。\n" #: dlls/kernel32/winerror.mc:828 msgid "Error in use of filename wildcards.\n" -msgstr "使用檔名萬用字元時發生錯誤。\n" +msgstr "使用檔案名稱萬用字元時發生錯誤。\n" #: dlls/kernel32/winerror.mc:833 msgid "Invalid signal number.\n" @@ -6866,7 +6866,7 @@ msgstr "無法存取檔案。\n" #: dlls/kernel32/winerror.mc:3693 msgid "The filename cannot be resolved.\n" -msgstr "無法解析檔名。\n" +msgstr "無法解析檔案名稱。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" @@ -12257,7 +12257,7 @@ msgstr "驅動程式未啟用。" msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." -msgstr "指定的裝置已在使用中。請等候該裝置不再使用，然後再試一次。" +msgstr "指定的裝置已在使用中。請等待該裝置空出來，然後再試一次。" #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." @@ -12430,7 +12430,7 @@ msgstr "您正在使用的多媒體控制介面裝置不支援指定的命令。 #: dlls/winmm/winmm.rc:76 msgid "" "Cannot find the specified file. Make sure the path and filename are correct." -msgstr "找不到指定的檔案。請確定路徑和檔名正確。" +msgstr "找不到指定的檔案。請確定路徑和檔案名稱正確。" #: dlls/winmm/winmm.rc:77 msgid "The device driver is not ready." @@ -12623,15 +12623,15 @@ msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置不再使用，再試" +"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置空出來，然後再試" "一次。" #: dlls/winmm/winmm.rc:114 @@ -12639,15 +12639,15 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置不再使用，然後" +"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置空出來，然後" "再試一次。" #: dlls/winmm/winmm.rc:116 @@ -12696,7 +12696,7 @@ msgstr "「歌曲指標」的時間格式和 SMPTE 彼此互斥。您無法一 msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." -msgstr "指定的 MIDI 連接埠已在使用中。請等待它不再使用，然後再試一次。" +msgstr "指定的 MIDI 連接埠已在使用中。請等待該連接埠空出來，然後再試一次。" #: dlls/winmm/winmm.rc:131 msgid "" @@ -13057,11 +13057,11 @@ msgid "" msgstr "" "ATTRIB - 顯示或變更檔案屬性。\n" "\n" -"語法：\n" -"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔名]\n" +"語法:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔案名稱]\n" " [/S [/D]]\n" "\n" -"其中：\n" +"其中:\n" "\n" " + 設定一個屬性。\n" " - 清空一個屬性。\n" @@ -13069,7 +13069,7 @@ msgstr "" " A 封存檔案屬性。\n" " S 系統檔案屬性。\n" " H 隱藏檔案屬性。\n" -" [儲存裝置:][路徑][檔名]\n" +" [儲存裝置:][路徑][檔案名稱]\n" " 指定 attrib 要處理的一個或多個檔案。\n" " /S 處理在目前資料夾和所有子資料夾中的匹配檔案。\n" " /D 同樣處理資料夾。\n" @@ -13114,15 +13114,6 @@ msgid "Clock" msgstr "時鐘" #: programs/cmd/cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CALL <batchfilename> is used within a batch file to execute commands\n" -#| "from another batch file. When the batch file exits, control returns to\n" -#| "the file which called it. The CALL command may supply parameters to the\n" -#| "called procedure.\n" -#| "\n" -#| "Changes to default directory, environment variables etc made within a\n" -#| "called procedure are inherited by the caller.\n" msgid "" "CALL <batchfilename> is used within a batch file to execute commands from\n" "another batch file. When the batch file exits, control returns to the file\n" @@ -13132,7 +13123,7 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <批次檔名> 是使用在批次檔之內以執行其他\n" +"CALL <批次檔名稱> 是使用在批次檔之內以執行其他\n" "批次檔中的指令。從其他的批次檔離開時，控制權會\n" "回到呼叫它的檔案。CALL 命令可以提供參數給\n" "被呼叫的程序。\n" @@ -13141,10 +13132,6 @@ msgstr "" "將會由呼叫者所繼承。\n" #: programs/cmd/cmd.rc:44 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -13153,8 +13140,6 @@ msgstr "" "預設目錄。\n" #: programs/cmd/cmd.rc:47 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <目錄> 變更目前的預設目錄。\n" @@ -13164,7 +13149,7 @@ msgstr "CLS 清空主控臺螢幕。\n" #: programs/cmd/cmd.rc:53 msgid "COPY <filename> copies a file.\n" -msgstr "COPY <檔名> 複製檔案。\n" +msgstr "COPY <檔案名稱> 複製檔案。\n" #: programs/cmd/cmd.rc:56 msgid "CTTY changes the input/output device.\n" @@ -13176,23 +13161,13 @@ msgstr "DATE 顯示或變更系統日期。\n" #: programs/cmd/cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <檔名> 刪除檔案或一組檔案。\n" +msgstr "DEL <檔案名稱> 刪除檔案或一組檔案。\n" #: programs/cmd/cmd.rc:65 msgid "DIR lists the contents of a directory.\n" msgstr "DIR 列出目錄的內容。\n" #: programs/cmd/cmd.rc:75 -#, fuzzy -#| msgid "" -#| "ECHO <string> displays <string> on the current terminal device.\n" -#| "\n" -#| "ECHO ON causes all subsequent commands in a batch file to be displayed\n" -#| "on the terminal device before they are executed.\n" -#| "\n" -#| "ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n" -#| "default). The ECHO OFF command can be prevented from displaying by\n" -#| "preceding it with an @ sign.\n" msgid "" "ECHO <string> displays <string> on the current terminal device.\n" "\n" @@ -13214,14 +13189,9 @@ msgstr "" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <檔名> 刪除一個檔案或一組檔案。\n" +msgstr "ERASE <檔案名稱> 刪除一個檔案或一組檔案。\n" #: programs/cmd/cmd.rc:85 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -13231,21 +13201,11 @@ msgid "" msgstr "" "FOR 命令用來向檔案集合中的每一個檔案執行命令。\n" "\n" -"語法：FOR %變數 IN (集合) DO 命令\n" +"語法: FOR %變數 IN (集合) DO 命令\n" +"\n" +"當在批次檔裡使用 FOR 的時候，必須使用兩個 % 符號。\n" #: programs/cmd/cmd.rc:97 -#, fuzzy -#| msgid "" -#| "The GOTO command transfers execution to another statement within a\n" -#| "batch file.\n" -#| "\n" -#| "The label which is the target of a GOTO may be up to 255 characters\n" -#| "long but may not include spaces (this is different from other operating\n" -#| "systems). If two or more identical labels exist in a batch file the\n" -#| "first one will always be executed. Attempting to GOTO a nonexistent\n" -#| "label terminates the batch file execution.\n" -#| "\n" -#| "GOTO has no effect when used interactively.\n" msgid "" "The GOTO command transfers execution to another statement within a batch\n" "file.\n" @@ -13290,7 +13250,7 @@ msgid "" msgstr "" "IF 用於有條件地執行命令。\n" "\n" -"語法：IF [NOT] EXIST 檔名命令\n" +"語法: IF [NOT] EXIST 檔名命令\n" " IF [NOT] 字串一==字串二命令\n" " IF [NOT] ERRORLEVEL 數字命令\n" "\n" @@ -13305,11 +13265,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL 用於設定磁碟卷冊標貼。\n" +"LABEL 用於設定磁碟的磁碟區標籤。\n" "\n" -"語法：LABEL [裝置代號:]\n" -"命令將向您提示詢問新的卷冊標貼用於給定的儲存裝置。\n" -"您可以利用 VOL 命令來顯示磁碟卷冊標貼。\n" +"語法: LABEL [裝置代號:]\n" +"命令將向您提示詢問要讓給定的儲存裝置使用的磁碟區標籤。\n" +"您可以利用 VOL 命令來顯示磁碟的磁碟區標籤。\n" #: programs/cmd/cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -13320,17 +13280,6 @@ msgid "MKDIR <name> creates a subdirectory.\n" msgstr "MKDIR <名稱> 建立子目錄。\n" #: programs/cmd/cmd.rc:131 -#, fuzzy -#| msgid "" -#| "MOVE relocates a file or directory to a new point within the file " -#| "system.\n" -#| "\n" -#| "If the item being moved is a directory then all the files and " -#| "subdirectories\n" -#| "below the item are moved as well.\n" -#| "\n" -#| "MOVE fails if the old and new locations are on different DOS drive " -#| "letters.\n" msgid "" "MOVE relocates a file or directory to a new point within the file system.\n" "\n" @@ -13347,17 +13296,6 @@ msgstr "" "如果舊的和新的位置在不同的 DOS 儲存裝置代號之上，MOVE 將會失敗。\n" #: programs/cmd/cmd.rc:142 -#, fuzzy -#| msgid "" -#| "PATH displays or changes the cmd search path.\n" -#| "\n" -#| "Entering PATH will display the current PATH setting (initially taken\n" -#| "from the registry). To change the setting follow the\n" -#| "PATH command with the new value.\n" -#| "\n" -#| "It is also possible to modify the PATH by using the PATH environment\n" -#| "variable, for example:\n" -#| "PATH %PATH%;c:\\temp\n" msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -13376,16 +13314,10 @@ msgstr "" "PATH 命令之後緊接新的值。\n" "\n" "也可以藉由 PATH 環境變數來修改 PATH，\n" -"舉例來說：\n" +"舉例來說:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 -#, fuzzy -#| msgid "" -#| "PAUSE displays a message on the screen asking the user to press a key.\n" -#| "\n" -#| "It is mainly useful in batch files to allow the user to read the output\n" -#| "of a previous command before it scrolls off the screen.\n" msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" @@ -13398,30 +13330,6 @@ msgstr "" "輸出捲動離開螢幕之前能夠去讀取它。\n" #: programs/cmd/cmd.rc:169 -#, fuzzy -#| msgid "" -#| "PROMPT sets the command-line prompt.\n" -#| "\n" -#| "The string following the PROMPT command (and the space immediately " -#| "after)\n" -#| "appears at the beginning of the line when cmd is waiting for input.\n" -#| "\n" -#| "The following character strings have the special meaning shown:\n" -#| "\n" -#| "$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n" -#| "$d Current date $e Escape $g > sign\n" -#| "$l < sign $n Current drive $p Current path\n" -#| "$q Equal sign $t Current time $v cmd version\n" -#| "\n" -#| "Note that entering the PROMPT command without a prompt-string resets the\n" -#| "prompt to the default, which is the current directory (which includes " -#| "the\n" -#| "current drive letter) followed by a greater-than (>) sign.\n" -#| "(like a command PROMPT $p$g).\n" -#| "\n" -#| "The prompt can also be changed by altering the PROMPT environment " -#| "variable,\n" -#| "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -13448,7 +13356,7 @@ msgstr "" "跟隨著 PROMPT 命令的字串 (以及緊接於後的空格)\n" "將會在 cmd 等待輸入時出現於一列的起始部分。\n" "\n" -"下列字元串有特殊平均顯示：\n" +"下列字元串有特殊平均顯示:\n" "\n" "$$ 錢幣符號 $_ 送列鍵 $b 管線符號 (|)\n" "$d 目前日期 $e 退出 $g > 符號\n" @@ -13463,56 +13371,30 @@ msgstr "" "因此命令 SET PROMPT=text 與 PROMPT text 具有相同的效果。\n" #: programs/cmd/cmd.rc:173 -#, fuzzy -#| msgid "" -#| "A command line beginning with REM (followed by a space) performs no\n" -#| "action, and can therefore be used as a comment in a batch file.\n" msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" -"以 REM 起始的命令列 (之後緊接空格) 不會進行任何\n" -"動作，因而可以做為批次檔中的註釋。\n" +"以 REM 起始的命令列 (之後緊接空格) 不會進行任何動作，\n" +"因而可以做為批次檔中的註釋。\n" #: programs/cmd/cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" -msgstr "REN <檔名> 是 RENAME 的簡短版本。它會重新命名檔案。\n" +msgstr "REN <檔案名稱> 是 RENAME 的簡短版本。它會重新命名檔案。\n" #: programs/cmd/cmd.rc:178 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <檔名> 重新命名檔案。\n" +msgstr "RENAME <檔案名稱> 重新命名檔案。\n" #: programs/cmd/cmd.rc:181 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除子目錄。\n" +msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除目錄。\n" #: programs/cmd/cmd.rc:183 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <目錄> 刪除子目錄。\n" +msgstr "RMDIR <目錄> 刪除目錄。\n" #: programs/cmd/cmd.rc:229 -#, fuzzy -#| msgid "" -#| "SET displays or changes the cmd environment variables.\n" -#| "\n" -#| "SET without parameters shows all of the current environment.\n" -#| "\n" -#| "To create or modify an environment variable the syntax is:\n" -#| "\n" -#| "SET <variable>=<value>\n" -#| "\n" -#| "where <variable> and <value> are character strings. There must be no\n" -#| "space before the equals sign, nor can the variable name\n" -#| "have embedded spaces.\n" -#| "\n" -#| "Under Wine, the environment of the underlying operating system is\n" -#| "included into the Win32 environment, there will generally therefore be\n" -#| "many more values than in a native Win32 implementation. Note that it is\n" -#| "not possible to affect the operating system environment from within cmd.\n" msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -13534,24 +13416,18 @@ msgstr "" "\n" "不接參數的 SET 將顯示目前的全部環境。\n" "\n" -"要建立或修改環境變數的語法是：\n" +"要建立或修改環境變數的語法是:\n" "\n" "SET <變數名稱>=<變數值>\n" "\n" -"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有\n" -"空格，而變數名稱也不可以嵌入空格。\n" +"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有空格，\n" +"而變數名稱也不可以嵌入空格。\n" "\n" -"在 Wine 之下，下層的作業系統環境也被\n" -"包含於 Win32 環境之中，因此通常會比在原生的 Win32 實作中\n" -"還要多出更多變數值。要注意的是，從 cmd 之中是不可能\n" -"去影響作業系統的環境。\n" +"在 Wine 之下，下層的作業系統環境也被包含於 Win32 環境之中，\n" +"因此通常會比在原生的 Win32 實作中還要多出更多變數值。\n" +"要注意的是，從 cmd 之中是不可能去影響作業系統的環境。\n" #: programs/cmd/cmd.rc:234 -#, fuzzy -#| msgid "" -#| "SHIFT is used in a batch file to remove one parameter from the head of\n" -#| "the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n" -#| "if called from the command line.\n" msgid "" "SHIFT is used in a batch file to remove one parameter from the head of the\n" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" @@ -13562,35 +13438,6 @@ msgstr "" "將不會有任何效果。\n" #: programs/cmd/cmd.rc:212 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -13620,30 +13467,30 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity 遮罩以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/ProgIDOpen 使用指定的 progID 開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/cmd/cmd.rc:237 msgid "TIME sets or shows the current system time.\n" @@ -13654,15 +13501,11 @@ msgid "TITLE <string> sets the window title for the cmd window.\n" msgstr "TITLE <字串> 設定 cmd 視窗的視窗標題。\n" #: programs/cmd/cmd.rc:244 -#, fuzzy -#| msgid "" -#| "TYPE <filename> copies <filename> to the console device (or elsewhere\n" -#| "if redirected). No check is made that the file is readable text.\n" msgid "" "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" "redirected). No check is made that the file is readable text.\n" msgstr "" -"TYPE <檔名> 將 <檔名> 的內容複製到主控臺裝置 (或是其他被\n" +"TYPE <檔案名稱> 將 <檔案名稱> 的內容複製到主控臺裝置 (或是其他被\n" "重新導向的地方)。不會檢查該檔案是否為可讀的文字。\n" #: programs/cmd/cmd.rc:253 @@ -13675,7 +13518,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括：\n" +"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括:\n" "\n" "VERIFY ON\t設定旗標。\n" "VERIFY OFF\t清空旗標。\n" @@ -13689,13 +13532,9 @@ msgstr "VER 顯示您正在執行的 cmd 版本。\n" #: programs/cmd/cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 顯示磁碟裝置的卷冊標貼。\n" +msgstr "VOL 顯示磁碟裝置的磁碟區標籤。\n" #: programs/cmd/cmd.rc:263 -#, fuzzy -#| msgid "" -#| "ENDLOCAL ends localization of environment changes in a batch file\n" -#| "which were introduced by a preceding SETLOCAL.\n" msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" @@ -13716,36 +13555,22 @@ msgstr "" "\n" "SETLOCAL 之後完成的環境變更對於批次檔而言為本地，\n" "並被保留直到遇到下一個 ENDLOCAL (或是檔案\n" -"的結束，取決於誰先出現)，前一個環境的設定值\n" +"的結尾，取決於誰先出現)，前一個環境的設定值\n" "則於該點被儲存。\n" #: programs/cmd/cmd.rc:275 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a stack, and then\n" "changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <目錄名> 儲存目前的目錄到\n" -"堆疊中，然後變更現行目錄到所給定的目錄。\n" +"PUSHD <目錄> 儲存目前的目錄到堆疊中，\n" +"然後變更現行目錄到所給定的目錄。\n" #: programs/cmd/cmd.rc:278 msgid "POPD changes current directory to the last one saved with PUSHD.\n" msgstr "POPD 變更現行目錄到上一個利用 PUSHD 儲存的目錄。\n" #: programs/cmd/cmd.rc:288 -#, fuzzy -#| msgid "" -#| "ASSOC shows or modifies file extension associations.\n" -#| "\n" -#| "Syntax: ASSOC [.ext[=[fileType]]]\n" -#| "\n" -#| "ASSOC without parameters displays current file associations.\n" -#| "If used with only a file extension, displays the current association.\n" -#| "Specifying no file type after the equal sign removes the current " -#| "association, if any.\n" msgid "" "ASSOC shows or modifies file extension associations.\n" "\n" @@ -13758,25 +13583,13 @@ msgid "" msgstr "" "ASSOC 顯示或修改副檔名的關聯。\n" "\n" -"語法：ASSOC [.ext[=[檔案型態]]]\n" +"語法: ASSOC [.ext[=[檔案型態]]]\n" "\n" "ASSOC 不加參數將顯示目前的檔案關聯。\n" "如果只使用副檔名，則顯示它目前的關聯。\n" "在等號之號如果沒有指定檔案類型就移除目前的任何關聯。\n" #: programs/cmd/cmd.rc:300 -#, fuzzy -#| msgid "" -#| "FTYPE shows or modifies open commands associated with file types.\n" -#| "\n" -#| "Syntax: FTYPE [fileType[=[openCommand]]]\n" -#| "\n" -#| "Without parameters, shows the file types for which open command strings " -#| "are currently defined.\n" -#| "If used with only a file type, displays the associated open command " -#| "string, if any.\n" -#| "Specifying no open command after the equal sign removes the command " -#| "string associated to the specified file type.\n" msgid "" "FTYPE shows or modifies open commands associated with file types.\n" "\n" @@ -13791,22 +13604,18 @@ msgid "" msgstr "" "FTYPE 顯示或修改開啟命令所關聯的檔案類型。\n" "\n" -"語法：FTYPE [檔案型態[=[開啟命令]]]\n" +"語法: FTYPE [檔案型態[=[開啟命令]]]\n" "\n" "如果不加參數，則顯示開啟命令目前所定義的檔案型態。\n" "如果只使用檔案類型，則顯示關聯的任何開啟命令字串。\n" -"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的任何關聯命令字串。\n" +"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的\n" +"任何關聯命令字串。\n" #: programs/cmd/cmd.rc:303 msgid "MORE displays output of files or piped input in pages.\n" msgstr "MORE 以分頁的方式顯示檔案的輸出或管線的輸入。\n" #: programs/cmd/cmd.rc:308 -#, fuzzy -#| msgid "" -#| "CHOICE displays a text and waits, until the User\n" -#| "presses an allowed Key from a selectable list.\n" -#| "CHOICE is mainly used to build a menu selection in a batch file.\n" msgid "" "CHOICE displays a text and waits, until the User presses an allowed Key\n" "from a selectable list.\n" @@ -13829,61 +13638,26 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"建立符號連結。\n" +"\n" +"語法: MKLINK [選項] 連結名稱目標\n" +"\n" +"選項:\n" +"/d 建立目錄符號連結。\n" +"/h 建立永久連結。\n" +"/j 建立目錄連接。\n" +"連結名稱為新的符號連結的名稱。\n" +"目標為連結名稱指向的路徑。\n" #: programs/cmd/cmd.rc:312 -#, fuzzy -#| msgid "" -#| "EXIT terminates the current command session and returns\n" -#| "to the operating system or shell from which you invoked cmd.\n" msgid "" "EXIT terminates the current command session and returns to the operating\n" "system or shell from which you invoked cmd.\n" msgstr "" -"EXIT 終止目前的命令作業階段並回到\n" -"您從其調用 cmd 的作業系統或命令殼。\n" +"EXIT 終止目前的命令作業階段並回到您從其調用 cmd 的\n" +"作業系統或命令殼。\n" #: programs/cmd/cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -13925,10 +13699,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 內建命令包括：\n" +"CMD 內建命令包括:\n" "ASSOC\t\t顯示或修改副檔名關聯\n" "ATTRIB\t\t顯示或變更 DOS 檔案屬性\n" -"CALL\t\t從另一個批次檔內部調用\n" +"CALL\t\t在批次檔中呼叫另一個批次檔\n" "CD (CHDIR)\t變更目前的預設目錄\n" "CHOICE\t\t從可選清單等待按鍵\n" "CLS\t\t清空主控臺螢幕\n" @@ -13942,13 +13716,14 @@ msgstr "" "FTYPE\t\t顯示或修改與檔案類型關聯的開啟命令\n" "HELP\t\t顯示主題的簡潔說明\n" "MD (MKDIR)\t建立子目錄\n" +"MKLINK\t建立符號連結\n" "MORE\t\t分頁顯示輸出\n" "MOVE\t\t移動一個檔案、一組檔案或樹狀目錄\n" "PATH\t\t設定或顯示搜尋路徑\n" "PAUSE\t\t懸置執行中的批次檔\n" "POPD\t\t還原到上一次以 PUSHD 儲存的目錄\n" "PROMPT\t\t變更指令提示符號\n" -"PUSHD\t\t變更為新的目錄並儲存目前的\n" +"PUSHD\t\t變更為新的目錄並儲存目前的目錄\n" "REN (RENAME)\t重新命名檔案\n" "RD (RMDIR)\t刪除子目錄\n" "SET\t\t設定或顯示環境變數\n" @@ -13958,15 +13733,15 @@ msgstr "" "TITLE\t\t設定用於 CMD 作業階段的視窗標題\n" "TYPE\t\t印出文字檔的內容\n" "VER\t\t顯示目前的 CMD 版本\n" -"VOL\t\t顯示磁碟裝置的卷冊標貼\n" +"VOL\t\t顯示磁碟裝置的磁碟區標籤\n" "XCOPY\t\t複製來源檔案或樹狀目錄到目的地\n" "EXIT\t\t關閉 CMD\n" "\n" -"輸入 HELP <命令> 以獲得關於以上任何命令的進一步資訊。\n" +"輸入 HELP <命令> 以取得關於以上任何命令的進一步資訊。\n" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "您確定嗎？" +msgstr "您確定嗎?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13980,15 +13755,15 @@ msgstr "N" #: programs/cmd/cmd.rc:368 msgid "File association missing for extension %1\n" -msgstr "缺少用於延伸檔名 %1 的檔案關聯\n" +msgstr "找不到副檔名 %1 的檔案關聯\n" #: programs/cmd/cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "沒有與檔案類型 %1 相關聯的開啟命令\n" +msgstr "沒有與檔案類型 '%1' 相關聯的開啟命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆寫 %1？" +msgstr "覆寫 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13996,7 +13771,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "命令列於批次處理時可能會被截斷。使用：\n" +msgstr "命令列於批次處理時可能會被截斷。使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -14024,11 +13799,11 @@ msgstr "現在時間是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "輸入新日期：" +msgstr "輸入新日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "輸入新時間：" +msgstr "輸入新時間: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14040,7 +13815,7 @@ msgstr "開啟 %1 失敗\n" #: programs/cmd/cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "無法呼叫批次命令稿外部的批次標貼\n" +msgstr "無法呼叫批次命令指令碼外部的批次標貼\n" #: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" @@ -14049,7 +13824,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "刪除 %1？" +msgstr "刪除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14072,12 +13847,12 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"卷冊序號是 %1!04x!-%2!04x!\n" +"磁碟區序號是 %1!04x!-%2!04x!\n" "\n" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷冊標貼 (11 個字元，<Enter> 表示沒有)？" +msgstr "磁碟區標籤 (11 個字元，<Enter> 表示沒有)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -14085,19 +13860,19 @@ msgstr "找不到 PATH\n" #: programs/cmd/cmd.rc:395 msgid "Press any key to continue... " -msgstr "按下任何鍵繼續... " +msgstr "按下任意鍵繼續... " #: programs/cmd/cmd.rc:396 msgid "Wine Command Prompt" -msgstr "Wine 命令提示符號" +msgstr "Wine 命令提示字元" #: programs/cmd/cmd.rc:397 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: programs/cmd/cmd.rc:398 msgid "More? " -msgstr "更多？" +msgstr "更多? " #: programs/cmd/cmd.rc:399 msgid "The input line is too long.\n" @@ -14105,26 +13880,24 @@ msgstr "輸入列太長。\n" #: programs/cmd/cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" -msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區為 %2\n" #: programs/cmd/cmd.rc:401 msgid "Volume in drive %1!c! has no label.\n" -msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區沒有任何標籤。\n" #: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 -#, fuzzy msgid " (Yes|No)" -msgstr " (是|否)" +msgstr " (Yes|No)" #: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 -#, fuzzy msgid " (Yes|No|All)" -msgstr " (是|否|全部)" +msgstr " (Yes|No|All)" #: programs/cmd/cmd.rc:404 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "無法識別 %1 為內部、外部命令或是批次命令稿。\n" +msgstr "無法識別 %1 為內部、外部命令或是批次命令指令碼。\n" #: programs/cmd/cmd.rc:405 msgid "Division by zero error.\n" @@ -14140,14 +13913,14 @@ msgstr "預期為一個運算子。\n" #: programs/cmd/cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "小括號不匹配。\n" +msgstr "小括號不相符。\n" #: programs/cmd/cmd.rc:409 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"不當的數字形式 - 必須是十進位 (12)、\n" +"錯誤的數字形式 - 必須是十進位 (12)、\n" " 十六進位 (0x34) 或八進位 (056) 之一。\n" #: programs/conhost/conhost.rc:54 @@ -14168,23 +13941,19 @@ msgstr "大(&L)" #: programs/conhost/conhost.rc:59 msgid "Command history" -msgstr "指令歷程" +msgstr "命令歷程記錄" #: programs/conhost/conhost.rc:60 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "緩衝區域" +msgstr "緩衝大小(&B):" #: programs/conhost/conhost.rc:63 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "刪除連續相同的指令(&R)" +msgstr "移除重複(&R)" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "彈出功能表" +msgstr "快顯功能表" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -14195,22 +13964,16 @@ msgid "S&hift" msgstr "S&hift" #: programs/conhost/conhost.rc:69 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "關閉虛擬終端(&C)" +msgstr "主控臺" #: programs/conhost/conhost.rc:70 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "快速編輯" +msgstr "快速編輯模式(&Q)" #: programs/conhost/conhost.rc:71 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "專家模式(&E)" +msgstr "插入模式(&I)" #: programs/conhost/conhost.rc:79 msgid "&Font" @@ -14222,7 +13985,7 @@ msgstr "顏色(&C)" #: programs/conhost/conhost.rc:92 msgid "Configuration" -msgstr "組態" +msgstr "設定" #: programs/conhost/conhost.rc:95 msgid "Buffer zone" @@ -14230,11 +13993,11 @@ msgstr "緩衝區域" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "寬度(&W)：" +msgstr "寬度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14242,11 +14005,11 @@ msgstr "視窗大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "寬度(&I)：" +msgstr "寬度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14254,19 +14017,19 @@ msgstr "當程式結束後" #: programs/conhost/conhost.rc:112 msgid "&Close console" -msgstr "關閉虛擬終端(&C)" +msgstr "關閉主控臺(&C)" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Edition" +msgstr "版本" #: programs/conhost/conhost.rc:120 msgid "Console parameters" -msgstr "虛擬終端執行參數" +msgstr "主控臺執行參數" #: programs/conhost/conhost.rc:123 msgid "Retain these settings for later sessions" -msgstr "保留當前配置以便下次使用" +msgstr "保留目前設定以便下次使用" #: programs/conhost/conhost.rc:124 msgid "Modify only current session" @@ -14311,8 +14074,6 @@ msgid "Configuration error" msgstr "組態錯誤" #: programs/conhost/conhost.rc:46 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." @@ -14332,17 +14093,15 @@ msgstr "DirectX 診斷工具" #: programs/dxdiag/dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "用法：dxdiag [/whql:off | /whql:on] [/t 檔名 | /x 檔名]" +msgstr "用法: dxdiag [/whql:off | /whql:on] [/t 檔案名稱 | /x 檔案名稱]" #: programs/explorer/explorer.rc:32 msgid "Wine Explorer" msgstr "Wine 檔案總管" #: programs/explorer/explorer.rc:34 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "啟動" +msgstr "開始" #: programs/explorer/explorer.rc:35 programs/winefile/winefile.rc:36 msgid "&Run..." @@ -14354,6 +14113,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- 支援的命令 -\n" +"\n" +"hardlink 永久連結管理\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -14361,38 +14123,39 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - 支援的命令 -\n" +"\n" +"create 建立永久連結\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "語法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：主機名稱\n" +msgstr "用法: 主機名稱\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "錯誤：無效的選項 %c。\n" +msgstr "錯誤: 無效的選項 '%c'。\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "錯誤：找不到行程 %1。\n" +msgstr "錯誤: 無法取得主機名稱: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "錯誤：不能利用主機名稱公用程式來設定系統主機名稱。\n" +msgstr "錯誤: 無法使用 hostname 工具設定系統的主機名稱。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "錯誤：指定了不明或無效的命令列參數\n" +msgstr "錯誤: 指定了不明或無效的命令列參數\n" #: programs/ipconfig/ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -14455,10 +14218,8 @@ msgid "IPv6 address" msgstr "IPv6 位址" #: programs/msinfo32/msinfo32.rc:28 -#, fuzzy -#| msgid "System Configuration" msgid "System Information" -msgstr "系統設定" +msgstr "系統資訊" #: programs/net/net.rc:30 msgid "" @@ -14470,7 +14231,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET command [引數]\n" " 或\n" @@ -14487,12 +14248,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET START [service]\n" "\n" -"如果 service 被省略，就顯示執行中服務的清單，否則 service 表示要啟動的服務名" -"稱。\n" +"如果 'service' 被省略，就顯示執行中服務的清單，否則 'service' 表示要啟動的" +"服務名稱。\n" #: programs/net/net.rc:32 msgid "" @@ -14502,7 +14263,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET STOP service\n" "\n" @@ -14510,7 +14271,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止附屬服務：%1\n" +msgstr "正在停止附屬服務: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14518,27 +14279,27 @@ msgstr "無法停止服務 %1。\n" #: programs/net/net.rc:35 msgid "Could not get handle to service control manager.\n" -msgstr "無法獲得服務控制管理員控柄。\n" +msgstr "無法取得服務控制管理員的控制代碼。\n" #: programs/net/net.rc:36 msgid "Could not get handle to service.\n" -msgstr "無法獲得服務控柄。\n" +msgstr "無法取得服務的控制代碼。\n" #: programs/net/net.rc:37 msgid "The %1 service is starting.\n" -msgstr "%1 服務正在開始。\n" +msgstr "正在啟動 %1 服務。\n" #: programs/net/net.rc:38 msgid "The %1 service was started successfully.\n" -msgstr "%1 服務已成功開始。\n" +msgstr "%1 服務已成功啟動。\n" #: programs/net/net.rc:39 msgid "The %1 service failed to start.\n" -msgstr "%1 服務無法開始。\n" +msgstr "無法啟動 %1 服務。\n" #: programs/net/net.rc:40 msgid "The %1 service is stopping.\n" -msgstr "%1 服務正在停止。\n" +msgstr "正在停止 %1 服務。\n" #: programs/net/net.rc:41 msgid "The %1 service was stopped successfully.\n" @@ -14546,11 +14307,11 @@ msgstr "%1 服務已成功停止。\n" #: programs/net/net.rc:42 msgid "The %1 service failed to stop.\n" -msgstr "%1 服務無法停止。\n" +msgstr "無法停止 %1 服務。\n" #: programs/net/net.rc:44 msgid "There are no entries in the list.\n" -msgstr "在清單中沒有條目。\n" +msgstr "在清單中沒有項目。\n" #: programs/net/net.rc:45 msgid "" @@ -14559,12 +14320,12 @@ msgid "" "---------------------------------------------------------------\n" msgstr "" "\n" -"狀態本地遠端\n" +"狀態本機遠端\n" "---------------------------------------------------------------\n" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 開啟資源：%4!u!\n" +msgstr "%1 %2 %3 開啟資源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14580,7 +14341,7 @@ msgstr "網路發生了錯誤" #: programs/net/net.rc:51 msgid "Connection is being made" -msgstr "正在進行連接" +msgstr "正在連線" #: programs/net/net.rc:52 msgid "Reconnecting" @@ -14588,7 +14349,7 @@ msgstr "正在重新連線" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服務正在執行：\n" +msgstr "下列服務正在執行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14725,7 +14486,7 @@ msgstr "版面設定(&T)..." #: programs/notepad/notepad.rc:37 msgid "P&rinter Setup..." -msgstr "列印設定(&R)..." +msgstr "印表機設定(&R)..." #: programs/notepad/notepad.rc:42 programs/wordpad/wordpad.rc:44 msgid "&Undo\tCtrl+Z" @@ -14755,11 +14516,11 @@ msgstr "全選(&A)\tCtrl+A" #: programs/notepad/notepad.rc:50 msgid "&Time/Date\tF5" -msgstr "插入日期時間(&T)\tF5" +msgstr "插入日期/時間(&T)\tF5" #: programs/notepad/notepad.rc:52 msgid "&Wrap long lines" -msgstr "自動換列(&W)" +msgstr "自動換行(&W)" #: programs/notepad/notepad.rc:56 msgid "&Search...\tCtrl+F" @@ -14894,9 +14655,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"檔案 %s 不存在\n" +"檔案 '%s' 不存在。\n" "\n" -"您想新增一個檔案嗎？" +"您要建立一個新檔案嗎?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14904,25 +14665,25 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"檔案 %s 正文已更改\n" +"檔案 '%s' 的內容已更改。\n" "\n" -"是否儲存更改？" +"您要儲存更改嗎?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." -msgstr "找不到 %s。" +msgstr "找不到 '%s'。" #: programs/notepad/notepad.rc:85 msgid "Unicode (UTF-16)" -msgstr "萬國碼 (UTF-16)" +msgstr "Unicode (UTF-16)" #: programs/notepad/notepad.rc:86 msgid "Unicode (UTF-16 big-endian)" -msgstr "萬國碼 (UTF-16 大尾序)" +msgstr "Unicode (UTF-16 big-endian)" #: programs/notepad/notepad.rc:87 msgid "Unicode (UTF-8)" -msgstr "萬國碼 (UTF-8)" +msgstr "Unicode (UTF-8)" #: programs/notepad/notepad.rc:94 msgid "" @@ -14934,11 +14695,11 @@ msgid "" "Continue?" msgstr "" "%1\n" -"這個檔案含有萬國碼字元，如果以 %2 編碼\n" -"儲存這個檔案，您將會失去它們。\n" -"要保留這些字元，請按一下取消，然後在編碼\n" -"的下拉選單中選取一個萬國碼選項。\n" -"要繼續嗎？" +"這個檔案含有 Unicode 字元，如果以 %2 編碼儲存這個檔案，\n" +"這些字符將會丟失。\n" +"要保留這些字元，請按一下 [取消]，\n" +"然後在 [編碼] 下拉選單中選取一個 Unicode 選項。\n" +"您要繼續嗎?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14946,7 +14707,7 @@ msgstr "檔案綁定(&B)..." #: programs/oleview/oleview.rc:33 msgid "&View TypeLib..." -msgstr "查看 &TypeLib..." +msgstr "查看 TypeLib(&V)..." #: programs/oleview/oleview.rc:35 msgid "&System Configuration" @@ -14958,15 +14719,15 @@ msgstr "執行註冊表編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" -msgstr "&CoCreateInstance 參數" +msgstr "CoCreateInstance 旗標(&C)" #: programs/oleview/oleview.rc:44 msgid "&In-process server" -msgstr "同行程伺服器(&I)" +msgstr "同處理序伺服程式(&I)" #: programs/oleview/oleview.rc:45 msgid "In-process &handler" -msgstr "同行程處理常式(&H)" +msgstr "同處理序處理常式(&H)" #: programs/oleview/oleview.rc:46 msgid "&Local server" @@ -15031,7 +14792,7 @@ msgstr "關於 OleView(&A)" #: programs/oleview/oleview.rc:82 msgid "&Save as..." -msgstr "另存為(&S)..." +msgstr "另存新檔(&S)..." #: programs/oleview/oleview.rc:87 msgid "&Group by type kind" @@ -15059,7 +14820,7 @@ msgstr "啟用分散式 COM(&E)" #: programs/oleview/oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "啟用遠端連線(&R)(限 Win95)" +msgstr "啟用遠端連線 (限 Win95)(&R)" #: programs/oleview/oleview.rc:173 msgid "" @@ -15119,7 +14880,7 @@ msgstr "TypeLib 檔案 (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: programs/oleview/oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "通過檔案綽號綁定到檔案" +msgstr "通過 File Moniker 綁定到檔案" #: programs/oleview/oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -15127,7 +14888,7 @@ msgstr "開啟 TypeLib 檔案並查看內容" #: programs/oleview/oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "修改本機分散式 COM 設定" +msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" @@ -15135,7 +14896,7 @@ msgstr "執行 Wine 註冊表編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "結束程式。提示儲存" +msgstr "結束程式。提示儲存" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" @@ -15143,19 +14904,19 @@ msgstr "建立目前選擇的物件實例" #: programs/oleview/oleview.rc:111 msgid "Create an instance of the selected object on a specific machine" -msgstr "建立當前選定物件在指定電腦的實例" +msgstr "建立目前選定物件在指定電腦的實例" #: programs/oleview/oleview.rc:112 msgid "Release the currently selected object instance" -msgstr "釋放當前選定物件實例" +msgstr "釋放目前選定物件實例" #: programs/oleview/oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "將當前選定項目的 GUID 複製到剪貼簿" +msgstr "將目前選定項目的 GUID 複製到剪貼簿" #: programs/oleview/oleview.rc:114 msgid "Display the viewer for the selected item" -msgstr "顯示選定項目的查看器" +msgstr "顯示選定項目的檢視器" #: programs/oleview/oleview.rc:119 msgid "Toggle between expert and novice display mode" @@ -15180,15 +14941,15 @@ msgstr "重新整理所有清單" #: programs/oleview/oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/oleview/oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程伺服器" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序伺服程式" #: programs/oleview/oleview.rc:116 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程處理常式" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序處理常式" #: programs/oleview/oleview.rc:117 msgid "Ask for a local server when calling CoGetClassObject" @@ -15220,7 +14981,7 @@ msgstr "所有物件" #: programs/oleview/oleview.rc:135 msgid "Application IDs" -msgstr "應用程式 IDs" +msgstr "應用程式識別碼" #: programs/oleview/oleview.rc:136 msgid "Type Libraries" @@ -15252,7 +15013,7 @@ msgstr "CoGetClassObject 失敗。" #: programs/oleview/oleview.rc:145 msgid "Unknown error" -msgstr "未知錯誤" +msgstr "不明錯誤" #: programs/oleview/oleview.rc:148 msgid "bytes" @@ -15268,7 +15029,7 @@ msgstr "繼承介面" #: programs/oleview/oleview.rc:126 msgid "Save as an .IDL or .H file" -msgstr "存為 .IDL 或 .H 檔案" +msgstr "儲存為 .IDL 或 .H 檔案" #: programs/oleview/oleview.rc:127 msgid "Close window" @@ -15296,7 +15057,7 @@ msgstr "複製(&C)...\tF8" #: programs/progman/progman.rc:38 msgid "&Properties\tAlt+Enter" -msgstr "屬性(&P)\tAlt+Enter" +msgstr "內容(&P)\tAlt+Enter" #: programs/progman/progman.rc:40 msgid "&Execute..." @@ -15414,11 +15175,11 @@ msgstr "變更圖示" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "檔案名(&F):" +msgstr "檔案名稱(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "當前圖示(&I):" +msgstr "目前圖示(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15438,11 +15199,11 @@ msgstr "資訊" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否刪除程式群組 %s？" +msgstr "是否刪除程式群組 `%s'?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否刪除程式 %s？" +msgstr "是否刪除程式 `%s'?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15450,19 +15211,19 @@ msgstr "未實作" #: programs/progman/progman.rc:71 msgid "Error reading `%s'." -msgstr "讀取檔案 %s 時發生錯誤。" +msgstr "讀取檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:72 msgid "Error writing `%s'." -msgstr "寫入檔案 %s 時發生錯誤。" +msgstr "寫入檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:75 msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"無法開啟群組檔案 %s。\n" -"是否繼續嘗試？" +"無法開啟群組檔案 `%s'。\n" +"是否繼續嘗試開啟?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15470,15 +15231,15 @@ msgstr "沒有可用的說明資訊。" #: programs/progman/progman.rc:78 msgid "Unknown feature in %s" -msgstr "在 %s 中發現未知特性" +msgstr "在 %s 中發現不明功能" #: programs/progman/progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "檔案 %s 已經存在。不覆蓋已有檔案。" +msgstr "檔案 `%s' 已經存在。不覆寫已有檔案。" #: programs/progman/progman.rc:80 msgid "Save group as `%s' to prevent overwriting original files." -msgstr "將程式組儲存為 %s 可以避免復蓋已有的檔案。" +msgstr "將程式組儲存為 `%s' 可以避免覆寫已有的檔案。" #: programs/progman/progman.rc:84 msgid "Libraries (*.dll)" @@ -15493,47 +15254,32 @@ msgid "Icons (*.ico)" msgstr "圖示 (*.ico)" #: programs/reg/reg.rc:139 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的語法。 " #: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 無法存取或建立指定的註冊表鍵\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "作業已成功完成\n" +msgstr "reg: 操作完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" -msgstr "作業被使用者取消。\n" +msgstr "reg: 註冊表操作已經取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄機碼\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15541,7 +15287,7 @@ msgstr "(預設)" #: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG /?\" 以取得說明。\n" #: programs/reg/reg.rc:35 msgid "" @@ -15555,6 +15301,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"用法:\n" +" REG [操作] [參數]\n" +"\n" +"支援的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" +"\n" +"要取得指定操作的說明，請輸入:\n" +" REG [操作] /?\n" +"\n" #: programs/reg/reg.rc:67 msgid "" @@ -15605,6 +15360,52 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" +"\n" +" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +"\n" +" <機碼>\n" +" 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" +" 則會在該機碼新增登錄資料。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要新增的登錄值的名稱。\n" +"\n" +" /ve\n" +" 新增未命名的登錄值。這個選項會修改 (預設) 的\n" +" 登錄值。\n" +"\n" +" /t <類型>\n" +" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" <類型> 必須是下列的其中一個:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n" +"\n" +" /s <分隔符號>\n" +" 指定一個用於分隔 REG_MULTI_SZ 資料字串的字元。\n" +" 如果未指定 [/s]，分隔符號會預設為 \\0。\n" +"\n" +" /d <資料>\n" +" 要新增給新的登錄值的資料。\n" +"\n" +" /f\n" +" 修改登錄項目而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15640,6 +15441,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <機碼1> <機碼2> [/s] [/f]\n" +"\n" +" 複製指定登錄機碼的內容到另一個位置。\n" +" 預設情況下，這個操作只會複製登錄值。\n" +" 使用 [/s] 來遞迴複製所有子機碼和值。\n" +"\n" +" <機碼1>, <機碼2>\n" +" 指定登錄機碼的來源 (<機碼1>) 和目標 (<機碼2>) 資料。\n" +" 如果 <機碼2> 不存在，系統將會建立它。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /s\n" +" 從 <機碼1> 複製所有子機碼和值到 <機碼2>。\n" +"\n" +" /f\n" +" 覆寫 <機碼2> 內所有的登錄資料而不需確認提示。\n" +" 這個選項不會修改只在 <機碼2> 存在的子機碼和值。\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15679,6 +15509,41 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <機碼> [/v 值名稱 | /ve | /va] [/f]\n" +"\n" +" 刪除一個登錄機碼 (所有子機碼和值)，\n" +" 或從給定的登錄機碼刪除一個或多個值。\n" +"\n" +" <機碼>\n" +" 要刪除的登錄機碼。如果指定了 [/v]、[/ve] 或 [/va]，\n" +" 則可刪除登錄機碼內的一個或多個值。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要刪除的登錄值的名稱。\n" +"\n" +" /ve\n" +" 刪除未命名的登錄值。這個選項會刪除 (預設) 的\n" +" 登錄值。\n" +"\n" +" /va\n" +" 刪除登錄機碼的所有值。\n" +"\n" +" /f\n" +" 刪除一個登錄機碼 (包括所有子機碼和值)\n" +" 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15710,6 +15575,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <機碼> <檔案> [/y]\n" +"\n" +" 將指定的登錄機碼 (包括所有子機碼和值)\n" +" 匯出到一個檔案。\n" +"\n" +" <機碼>\n" +" 要匯出的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" <檔案>\n" +" 要建立的登錄檔案的名稱和路徑。\n" +" 檔案必須是 .reg 的副檔名。\n" +"\n" +" /y\n" +" 覆寫 <檔案> 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15721,6 +15613,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <檔案>\n" +"\n" +" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +"\n" +" <檔案>\n" +" 要匯入的登錄檔案的名稱和路徑。\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15756,6 +15655,37 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <機碼> [/v 值名稱 | /ve] [/s]\n" +"\n" +" 查詢指定的登錄機碼，並列出該機碼中的所有即時子機碼、值和資料。\n" +" 使用 [/s] 來遞迴查詢每個子機碼。\n" +"\n" +" <機碼>\n" +" 要查詢的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要查詢的登錄值的名稱。如果未指定 [/v] 或 [/ve]，\n" +" 則會列出 <機碼> 下所有的值。\n" +"\n" +" /ve\n" +" 查詢未命名的登錄值。這個選項會查詢 (預設) 的\n" +" 登錄值。\n" +"\n" +" /s\n" +" 列出 <機碼> 及其子機碼的所有登錄項目。\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15766,122 +15696,98 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 使用 32 位元登錄檢視來存取機碼。\n" +"\n" +" /reg:64\n" +" 使用 64 位元登錄檢視來存取機碼。\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的登錄機碼\n" #: programs/reg/reg.rc:119 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法存取遠端機器\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的系統金鑰\n" #: programs/reg/reg.rc:140 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " -msgstr "錯誤：無效的選項 %c。\n" +msgstr "reg: 無效的選項 [%1]。 " #: programs/reg/reg.rc:122 msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的數字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的十六進制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的字串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: 未處理的登錄資料類型 [/t 0x%1!x!, /d %2]\n" #: programs/reg/reg.rc:121 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "不受支援的型態。\n" +msgstr "reg: 不支援的登錄資料類型 [%1]\n" #: programs/reg/reg.rc:125 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "登錄值 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:118 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "錯誤：無效的命令列參數\n" +msgstr "reg: 無效的命令列參數\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 來源和目標機碼不可以相同\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "目標機碼內的值 '%1\\%2' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:133 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確定要刪除登錄值 '%1' 嗎?" #: programs/reg/reg.rc:134 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您確認要刪除這個數值 %s 嗎？" +msgstr "您確定要刪除 '%1' 下的所有登錄值嗎?" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "確定要刪除 %1？" +msgstr "您確定要刪除登錄機碼 '%1' 嗎?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法刪除所有在 '%1' 下的登錄值\n" #: programs/reg/reg.rc:173 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法匯入登錄機碼 '%1'\n" #: programs/reg/reg.rc:150 -#, fuzzy -#| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" -msgstr "沒有任何命令被指定。" +msgstr "reg: 無法找到檔案 '%1'。\n" #: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -15889,7 +15795,7 @@ msgstr "(沒有設值)" #: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" @@ -15897,16 +15803,16 @@ msgstr "註冊表(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." -msgstr "匯入註冊表檔案(&I)..." +msgstr "匯入登錄檔案(&I)..." #: programs/regedit/regedit.rc:37 msgid "&Export Registry File..." -msgstr "匯出註冊表檔案(&E)..." +msgstr "匯出登錄檔案(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "索引鍵(&K)" +msgstr "機碼(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15916,12 +15822,12 @@ msgstr "字串值(&S)" #: programs/regedit/regedit.rc:50 programs/regedit/regedit.rc:102 #: programs/regedit/regedit.rc:124 msgid "&Binary Value" -msgstr "二進位值(&B)" +msgstr "二進制值(&B)" #: programs/regedit/regedit.rc:51 programs/regedit/regedit.rc:103 #: programs/regedit/regedit.rc:125 msgid "&DWORD Value" -msgstr "雙字組值(&D)" +msgstr "DWORD 值(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:104 #: programs/regedit/regedit.rc:126 @@ -15940,7 +15846,7 @@ msgstr "重新命名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "複製索引鍵名稱(&C)" +msgstr "複製機碼名稱(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15970,13 +15876,11 @@ msgstr "關於註冊表編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "展開" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "修改二進位資料..." +msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -15984,31 +15888,31 @@ msgstr "匯出註冊表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "搜尋：" +msgstr "尋找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "在這找：" +msgstr "在這找:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "索引鍵" +msgstr "機碼" #: programs/regedit/regedit.rc:282 msgid "Value names" -msgstr "數值名稱" +msgstr "值名稱" #: programs/regedit/regedit.rc:283 msgid "Value content" -msgstr "數值內容" +msgstr "值內容" #: programs/regedit/regedit.rc:284 msgid "Whole string only" -msgstr "整詞匹配" +msgstr "字串須完全相符" #: programs/regedit/regedit.rc:291 msgid "Add Favorite" @@ -16029,20 +15933,20 @@ msgstr "編輯字串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "數值名稱:" +msgstr "值名稱:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "數值資料:" +msgstr "值資料:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" -msgstr "編輯雙字組" +msgstr "編輯 DWORD" #: programs/regedit/regedit.rc:333 msgid "Base" -msgstr "進位制" +msgstr "Base" #: programs/regedit/regedit.rc:334 msgid "Hexadecimal" @@ -16054,7 +15958,7 @@ msgstr "十進位" #: programs/regedit/regedit.rc:342 msgid "Edit Binary" -msgstr "編輯二進位資料" +msgstr "編輯二進位" #: programs/regedit/regedit.rc:355 msgid "Edit Multi-String" @@ -16077,13 +15981,9 @@ msgid "Contains commands for accessing frequently used keys" msgstr "含有與使用常用索引鍵有關的全部指令" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有與說明資訊有關的全部指令" +msgstr "含有顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -16099,87 +15999,76 @@ msgstr "註冊表編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" -msgstr "匯入註冊表檔案" +msgstr "匯入登錄檔案" #: programs/regedit/regedit.rc:222 msgid "Export Registry File" -msgstr "匯出註冊表檔案" +msgstr "匯出登錄檔案" #: programs/regedit/regedit.rc:223 msgid "Registry files (*.reg)" -msgstr "註冊表檔案 (*.reg)" +msgstr "登錄檔案 (*.reg)" #: programs/regedit/regedit.rc:224 msgid "Win9x/NT4 Registry files (REGEDIT4)" -msgstr "Win9x/NT4 註冊表檔案 (REGEDIT4)" +msgstr "Win9x/NT4 登錄檔案 (REGEDIT4)" #: programs/regedit/regedit.rc:241 msgid "(cannot display value)" -msgstr "(不能顯示值)" +msgstr "(無法顯示值)" #: programs/regedit/regedit.rc:242 msgid "(unknown %d)" -msgstr "(未知 %d)" +msgstr "(不明 %d)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to modify the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法編輯選定的登錄值。" #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄機碼。" #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄值。" #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"無法重新命名機碼 '%1'。\n" +"指定的機碼名稱已經存在。" #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"無法重新命名值 '%1'。\n" +"指定的值名稱已經存在。" #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to delete the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法刪除選定的登錄機碼。" #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄機碼。" #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "%1 所包含的機碼和值已成功新增至註冊表。" #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "無法匯入 %1。指定的檔案不是有效的登錄檔案。" #: programs/regedit/regedit.rc:408 msgid "" @@ -16211,151 +16100,144 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" +"用法:\n" +" regedit [選項] [檔案名稱] [登錄機碼]\n" +"\n" +"選項:\n" +" [no option] 啟動本程式的圖形介面。\n" +" /L:system.dat 要修改的 system.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /R:user.dat 要修改的 user.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /C 匯入登錄檔案的內容。\n" +" /D 刪除指定的登錄機碼。\n" +" /E 匯出指定的登錄機碼內容到檔案。\n" +" 如果沒有指定機碼，則會匯出整個註冊表。\n" +" /S 靜音模式。不會顯示訊息。\n" +" /V 以進階模式啟動圖形介面。已略過。\n" +" /? 顯示這個資訊並結束。\n" +" [檔案名稱] 要匯入的註冊表資訊檔案的位置。\n" +" 當與 [/E] 一起使用時，這個選項會指定\n" +" 註冊表資訊檔案的匯出位置。\n" +" [登錄機碼] 要修改的登錄機碼。\n" +"\n" +"使用範例:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" +msgstr "regedit: 無效或無法辨識的切換參數 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "輸入 \"regedit /?\" 以取得說明。\n" #: programs/regedit/regedit.rc:411 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 未指定檔案名稱。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: 未指定要移除的登錄機碼。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" -msgstr "" +msgstr "regedit: 找不到檔案 '%1'。\n" #: programs/regedit/regedit.rc:414 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟檔案 '%1'。\n" #: programs/regedit/regedit.rc:415 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "無效的控柄作業。\n" +msgstr "regedit: 未處理的操作。\n" #: programs/regedit/regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: 記憶體不足! (%1!S!, line %2!u!)\n" #: programs/regedit/regedit.rc:417 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的十六進位值。\n" #: programs/regedit/regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: 無法轉換十六進位資料。在 '%1' 遇到錯誤的值。\n" #: programs/regedit/regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 不支援的登錄資料類型 [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 在 '%1' 發現意外的結尾。\n" #: programs/regedit/regedit.rc:422 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line '%1' was not recognized.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 無法辨識列 '%1'。\n" #: programs/regedit/regedit.rc:423 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法從 '%1' 新增登錄值到 '%2'。\n" #: programs/regedit/regedit.rc:424 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 在 '%2' 遇到不支援的登錄資料類型 [0x%1!x!]。\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: 登錄值 '%1' 將以二進位資料匯出。\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的系統金鑰 [%1]\n" #: programs/regedit/regedit.rc:428 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "regedit: 無法匯出 '%1'。找不到指定的登錄機碼。\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法刪除登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line contains invalid syntax.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "結束註冊表編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "將索引鍵新增到我的最愛" +msgstr "將機碼新增到我的最愛" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "從我的最愛中刪除索引鍵" +msgstr "從我的最愛中刪除機碼" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" msgstr "顯示或隱藏狀態列" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "改變兩個窗格之間的分隔線位置" +msgstr "變更兩個窗格之間的分隔線位置" #: programs/regedit/regedit.rc:192 msgid "Refreshes the window" @@ -16363,19 +16245,19 @@ msgstr "重新整理視窗" #: programs/regedit/regedit.rc:193 msgid "Deletes the selection" -msgstr "刪除選擇項目" +msgstr "刪除已選項目" #: programs/regedit/regedit.rc:194 msgid "Renames the selection" -msgstr "重新命名選擇項目" +msgstr "重新命名已選項目" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "將索引鍵的名稱複製到剪貼簿" +msgstr "將機碼的名稱複製到剪貼簿" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在索引鍵、值或資料中找字串" +msgstr "在機碼、值或資料中尋找字串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16387,7 +16269,7 @@ msgstr "修改值的資料" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "新增一個新的索引鍵" +msgstr "新增一個新的機碼" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16398,10 +16280,8 @@ msgid "Adds a new binary value" msgstr "新增一個新的二進制值" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "新增一個新的二進制值" +msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -16409,118 +16289,92 @@ msgstr "將純文字檔案匯入註冊表" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表導出到純文字檔案" +msgstr "將註冊表匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" msgstr "列印註冊表的全部或部分" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "註冊表編輯器" +msgstr "開啟註冊表編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry value '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄值 '%1'。" #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "無法編輯這類型的索引鍵 (%u)" +msgstr "無法編輯這種類型的登錄機碼 (%1!u!)。" #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "數值太大 (%u)" +msgstr "登錄值太大 (%1!u!)。" #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" -msgstr "確認刪除數值" +msgstr "確認刪除登錄值" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除已選取的登錄值嗎?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "找不到搜尋的字串 %s" +msgstr "搜尋完成。找不到字串 '%1'。" #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除這些登錄值嗎?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "索引鍵 #%d" +msgstr "新機碼 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" -msgstr "新索引鍵 #%d" +msgstr "新登錄值 #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry key '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄機碼 '%1'。" #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "修改值的資料" +msgstr "以二進位修改登錄值的資料" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" -msgstr "新增一個多字串值" +msgstr "新增一個新的多字串值" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "匯出註冊表的所選分支到文字檔" +msgstr "匯出註冊表中已選取的分支到文字檔案" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "新增一個新的字串值" +msgstr "新增一個新的可擴充字串值" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "確認刪除數值" +msgstr "確認刪除機碼" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "確定要刪除 %1？" +msgstr "您確認要刪除這個登錄機碼及其所有的子機碼嗎?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "展開或摺疊已選取的節點" #: programs/regedit/regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "自動分頁(&O)" +msgstr "摺疊" #: programs/regsvr32/regsvr32.rc:33 msgid "" @@ -16529,6 +16383,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL 註冊工具\n" +"\n" +"提供 DLL 註冊服務。\n" +"\n" #: programs/regsvr32/regsvr32.rc:41 msgid "" @@ -16543,85 +16401,66 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"用法:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] Dll名稱\n" +"\n" +"選項:\n" +" [/u] 取消註冊伺服器。\n" +" [/s] 靜音模式 (不會顯示訊息)。\n" +" [/i] 呼叫 DllInstall，並將選項傳給它 [cmdline]。\n" +"\t在與 [/u] 一起使用時，會以解除安裝模式呼叫 DllInstall。\n" +" [/n] 不要呼叫 DllRegisterServer。這個選項必須與 [/i] 一起使用。\n" +"\n" #: programs/regsvr32/regsvr32.rc:42 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regedit: 無效或無法辨識的切換參數 [%1]\n" +"\n" #: programs/regsvr32/regsvr32.rc:43 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "開啟 %1 失敗\n" +msgstr "regsvr32: 無法載入 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: '%1!S!' 尚未於 DLL '%2' 實作\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除安裝 DLL '%1'\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16652,30 +16491,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity mask 以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/exec 對指定檔案進行 Exec (在 Wine 內部使用)。\n" +"/ProgIDOpen 使用指定的 progID 來開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/start/start.rc:59 msgid "" @@ -16683,12 +16523,12 @@ msgid "" "specified file.\n" "ShellExecuteEx failed" msgstr "" -"無法啟始應用程式，或是沒有與指定檔案關聯的應用程式。\n" +"無法啟動應用程式，或是沒有與指定檔案關聯的應用程式。\n" "ShellExecuteEx 失敗" #: programs/start/start.rc:61 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "無法翻譯指定的 Unix 檔名到 DOS 檔名。" +msgstr "無法翻譯指定的 Unix 檔案名稱到 DOS 檔案名稱。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -- 2.33.0.windows.2

2 1

[PATCH] po: Update Traditional Chinese translation.
by Jactry Zeng 17 Nov '21

17 Nov '21

From: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Chilung Chan <eason066(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- Superseded patch 218912. --- po/zh_TW.po | 1352 +++++++++++++++++++++++---------------------------- 1 file changed, 597 insertions(+), 755 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index a4fe8ba9ef6..b6c33378538 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-10-30 18:53+0800\n" +"PO-Revision-Date: 2021-11-06 18:33+0800\n" "Last-Translator: Chilung Chan <eason066(a)gmail.com>\n" "Language-Team: Chinese (Taiwan)\n" "Language: zh_TW\n" @@ -4558,7 +4558,7 @@ msgstr "自動資料區段超出 64k。\n" #: dlls/kernel32/winerror.mc:793 msgid "Ring 2 segment must be movable.\n" -msgstr "環 2 資料段必須可被移動。\n" +msgstr "環形第 2 資料段必須可被移動。\n" #: dlls/kernel32/winerror.mc:798 msgid "Relocation chain exceeds segment limit in %1.\n" @@ -4582,11 +4582,11 @@ msgstr "檔案名稱過長。\n" #: dlls/kernel32/winerror.mc:823 msgid "Ring 2 stack in use.\n" -msgstr "環 2 堆疊使用中。\n" +msgstr "環形第 2 堆疊現正使用中。\n" #: dlls/kernel32/winerror.mc:828 msgid "Error in use of filename wildcards.\n" -msgstr "使用檔名萬用字元時發生錯誤。\n" +msgstr "使用檔案名稱萬用字元時發生錯誤。\n" #: dlls/kernel32/winerror.mc:833 msgid "Invalid signal number.\n" @@ -6866,7 +6866,7 @@ msgstr "無法存取檔案。\n" #: dlls/kernel32/winerror.mc:3693 msgid "The filename cannot be resolved.\n" -msgstr "無法解析檔名。\n" +msgstr "無法解析檔案名稱。\n" #: dlls/kernel32/winerror.mc:3698 msgid "RPC entry type mismatch.\n" @@ -12257,7 +12257,7 @@ msgstr "驅動程式未啟用。" msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." -msgstr "指定的裝置已在使用中。請等候該裝置不再使用，然後再試一次。" +msgstr "指定的裝置已在使用中。請等待該裝置空出來，然後再試一次。" #: dlls/winmm/winmm.rc:37 msgid "The specified device handle is invalid." @@ -12430,7 +12430,7 @@ msgstr "您正在使用的多媒體控制介面裝置不支援指定的命令。 #: dlls/winmm/winmm.rc:76 msgid "" "Cannot find the specified file. Make sure the path and filename are correct." -msgstr "找不到指定的檔案。請確定路徑和檔名正確。" +msgstr "找不到指定的檔案。請確定路徑和檔案名稱正確。" #: dlls/winmm/winmm.rc:77 msgid "The device driver is not ready." @@ -12623,15 +12623,15 @@ msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式播放檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置不再使用，再試" +"目前的 wave 裝置正在使用中，所以無法設定它來播放。請等待該裝置空出來，然後再試" "一次。" #: dlls/winmm/winmm.rc:114 @@ -12639,15 +12639,15 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置不" -"再使用，然後再試一次。" +"所有可以用目前格式記錄檔案的 wave 裝置都在使用中。請等待其中一個 wave 裝置" +"空出來，然後再試一次。" #: dlls/winmm/winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置不再使用，然後" +"無法設定目前的 wave 裝置去記錄，因為它正在使用中。請等待該裝置空出來，然後" "再試一次。" #: dlls/winmm/winmm.rc:116 @@ -12696,7 +12696,7 @@ msgstr "「歌曲指標」的時間格式和 SMPTE 彼此互斥。您無法一 msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." -msgstr "指定的 MIDI 連接埠已在使用中。請等待它不再使用，然後再試一次。" +msgstr "指定的 MIDI 連接埠已在使用中。請等待該連接埠空出來，然後再試一次。" #: dlls/winmm/winmm.rc:131 msgid "" @@ -13057,11 +13057,11 @@ msgid "" msgstr "" "ATTRIB - 顯示或變更檔案屬性。\n" "\n" -"語法：\n" -"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔名]\n" +"語法:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [儲存裝置:][路徑][檔案名稱]\n" " [/S [/D]]\n" "\n" -"其中：\n" +"其中:\n" "\n" " + 設定一個屬性。\n" " - 清空一個屬性。\n" @@ -13069,7 +13069,7 @@ msgstr "" " A 封存檔案屬性。\n" " S 系統檔案屬性。\n" " H 隱藏檔案屬性。\n" -" [儲存裝置:][路徑][檔名]\n" +" [儲存裝置:][路徑][檔案名稱]\n" " 指定 attrib 要處理的一個或多個檔案。\n" " /S 處理在目前資料夾和所有子資料夾中的匹配檔案。\n" " /D 同樣處理資料夾。\n" @@ -13114,15 +13114,6 @@ msgid "Clock" msgstr "時鐘" #: programs/cmd/cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CALL <batchfilename> is used within a batch file to execute commands\n" -#| "from another batch file. When the batch file exits, control returns to\n" -#| "the file which called it. The CALL command may supply parameters to the\n" -#| "called procedure.\n" -#| "\n" -#| "Changes to default directory, environment variables etc made within a\n" -#| "called procedure are inherited by the caller.\n" msgid "" "CALL <batchfilename> is used within a batch file to execute commands from\n" "another batch file. When the batch file exits, control returns to the file\n" @@ -13132,7 +13123,7 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <批次檔名> 是使用在批次檔之內以執行其他\n" +"CALL <批次檔名稱> 是使用在批次檔之內以執行其他\n" "批次檔中的指令。從其他的批次檔離開時，控制權會\n" "回到呼叫它的檔案。CALL 命令可以提供參數給\n" "被呼叫的程序。\n" @@ -13141,10 +13132,6 @@ msgstr "" "將會由呼叫者所繼承。\n" #: programs/cmd/cmd.rc:44 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -13153,8 +13140,6 @@ msgstr "" "預設目錄。\n" #: programs/cmd/cmd.rc:47 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <目錄> 變更目前的預設目錄。\n" @@ -13164,7 +13149,7 @@ msgstr "CLS 清空主控臺螢幕。\n" #: programs/cmd/cmd.rc:53 msgid "COPY <filename> copies a file.\n" -msgstr "COPY <檔名> 複製檔案。\n" +msgstr "COPY <檔案名稱> 複製檔案。\n" #: programs/cmd/cmd.rc:56 msgid "CTTY changes the input/output device.\n" @@ -13176,23 +13161,13 @@ msgstr "DATE 顯示或變更系統日期。\n" #: programs/cmd/cmd.rc:62 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <檔名> 刪除檔案或一組檔案。\n" +msgstr "DEL <檔案名稱> 刪除檔案或一組檔案。\n" #: programs/cmd/cmd.rc:65 msgid "DIR lists the contents of a directory.\n" msgstr "DIR 列出目錄的內容。\n" #: programs/cmd/cmd.rc:75 -#, fuzzy -#| msgid "" -#| "ECHO <string> displays <string> on the current terminal device.\n" -#| "\n" -#| "ECHO ON causes all subsequent commands in a batch file to be displayed\n" -#| "on the terminal device before they are executed.\n" -#| "\n" -#| "ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n" -#| "default). The ECHO OFF command can be prevented from displaying by\n" -#| "preceding it with an @ sign.\n" msgid "" "ECHO <string> displays <string> on the current terminal device.\n" "\n" @@ -13214,14 +13189,9 @@ msgstr "" #: programs/cmd/cmd.rc:78 msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "ERASE <檔名> 刪除一個檔案或一組檔案。\n" +msgstr "ERASE <檔案名稱> 刪除一個檔案或一組檔案。\n" #: programs/cmd/cmd.rc:85 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -13231,21 +13201,11 @@ msgid "" msgstr "" "FOR 命令用來向檔案集合中的每一個檔案執行命令。\n" "\n" -"語法：FOR %變數 IN (集合) DO 命令\n" +"語法: FOR %變數 IN (集合) DO 命令\n" +"\n" +"當在批次檔裡使用 FOR 的時候，必須使用兩個 % 符號。\n" #: programs/cmd/cmd.rc:97 -#, fuzzy -#| msgid "" -#| "The GOTO command transfers execution to another statement within a\n" -#| "batch file.\n" -#| "\n" -#| "The label which is the target of a GOTO may be up to 255 characters\n" -#| "long but may not include spaces (this is different from other operating\n" -#| "systems). If two or more identical labels exist in a batch file the\n" -#| "first one will always be executed. Attempting to GOTO a nonexistent\n" -#| "label terminates the batch file execution.\n" -#| "\n" -#| "GOTO has no effect when used interactively.\n" msgid "" "The GOTO command transfers execution to another statement within a batch\n" "file.\n" @@ -13290,7 +13250,7 @@ msgid "" msgstr "" "IF 用於有條件地執行命令。\n" "\n" -"語法：IF [NOT] EXIST 檔名命令\n" +"語法: IF [NOT] EXIST 檔名命令\n" " IF [NOT] 字串一==字串二命令\n" " IF [NOT] ERRORLEVEL 數字命令\n" "\n" @@ -13305,11 +13265,11 @@ msgid "" "The command will prompt you for the new volume label for the given drive.\n" "You can display the disk volume label with the VOL command.\n" msgstr "" -"LABEL 用於設定磁碟卷冊標貼。\n" +"LABEL 用於設定磁碟的磁碟區標籤。\n" "\n" -"語法：LABEL [裝置代號:]\n" -"命令將向您提示詢問新的卷冊標貼用於給定的儲存裝置。\n" -"您可以利用 VOL 命令來顯示磁碟卷冊標貼。\n" +"語法: LABEL [裝置代號:]\n" +"命令將向您提示詢問要讓給定的儲存裝置使用的磁碟區標籤。\n" +"您可以利用 VOL 命令來顯示磁碟的磁碟區標籤。\n" #: programs/cmd/cmd.rc:121 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" @@ -13320,17 +13280,6 @@ msgid "MKDIR <name> creates a subdirectory.\n" msgstr "MKDIR <名稱> 建立子目錄。\n" #: programs/cmd/cmd.rc:131 -#, fuzzy -#| msgid "" -#| "MOVE relocates a file or directory to a new point within the file " -#| "system.\n" -#| "\n" -#| "If the item being moved is a directory then all the files and " -#| "subdirectories\n" -#| "below the item are moved as well.\n" -#| "\n" -#| "MOVE fails if the old and new locations are on different DOS drive " -#| "letters.\n" msgid "" "MOVE relocates a file or directory to a new point within the file system.\n" "\n" @@ -13347,17 +13296,6 @@ msgstr "" "如果舊的和新的位置在不同的 DOS 儲存裝置代號之上，MOVE 將會失敗。\n" #: programs/cmd/cmd.rc:142 -#, fuzzy -#| msgid "" -#| "PATH displays or changes the cmd search path.\n" -#| "\n" -#| "Entering PATH will display the current PATH setting (initially taken\n" -#| "from the registry). To change the setting follow the\n" -#| "PATH command with the new value.\n" -#| "\n" -#| "It is also possible to modify the PATH by using the PATH environment\n" -#| "variable, for example:\n" -#| "PATH %PATH%;c:\\temp\n" msgid "" "PATH displays or changes the cmd search path.\n" "\n" @@ -13376,16 +13314,10 @@ msgstr "" "PATH 命令之後緊接新的值。\n" "\n" "也可以藉由 PATH 環境變數來修改 PATH，\n" -"舉例來說：\n" +"舉例來說:\n" "PATH %PATH%;c:\\temp\n" #: programs/cmd/cmd.rc:148 -#, fuzzy -#| msgid "" -#| "PAUSE displays a message on the screen asking the user to press a key.\n" -#| "\n" -#| "It is mainly useful in batch files to allow the user to read the output\n" -#| "of a previous command before it scrolls off the screen.\n" msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" @@ -13398,30 +13330,6 @@ msgstr "" "輸出捲動離開螢幕之前能夠去讀取它。\n" #: programs/cmd/cmd.rc:169 -#, fuzzy -#| msgid "" -#| "PROMPT sets the command-line prompt.\n" -#| "\n" -#| "The string following the PROMPT command (and the space immediately " -#| "after)\n" -#| "appears at the beginning of the line when cmd is waiting for input.\n" -#| "\n" -#| "The following character strings have the special meaning shown:\n" -#| "\n" -#| "$$ Dollar sign $_ Linefeed $b Pipe sign (|)\n" -#| "$d Current date $e Escape $g > sign\n" -#| "$l < sign $n Current drive $p Current path\n" -#| "$q Equal sign $t Current time $v cmd version\n" -#| "\n" -#| "Note that entering the PROMPT command without a prompt-string resets the\n" -#| "prompt to the default, which is the current directory (which includes " -#| "the\n" -#| "current drive letter) followed by a greater-than (>) sign.\n" -#| "(like a command PROMPT $p$g).\n" -#| "\n" -#| "The prompt can also be changed by altering the PROMPT environment " -#| "variable,\n" -#| "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -13448,7 +13356,7 @@ msgstr "" "跟隨著 PROMPT 命令的字串 (以及緊接於後的空格)\n" "將會在 cmd 等待輸入時出現於一列的起始部分。\n" "\n" -"下列字元串有特殊平均顯示：\n" +"下列字元串有特殊平均顯示:\n" "\n" "$$ 錢幣符號 $_ 送列鍵 $b 管線符號 (|)\n" "$d 目前日期 $e 退出 $g > 符號\n" @@ -13463,56 +13371,30 @@ msgstr "" "因此命令 SET PROMPT=text 與 PROMPT text 具有相同的效果。\n" #: programs/cmd/cmd.rc:173 -#, fuzzy -#| msgid "" -#| "A command line beginning with REM (followed by a space) performs no\n" -#| "action, and can therefore be used as a comment in a batch file.\n" msgid "" "A command line beginning with REM (followed by a space) performs no action,\n" "and can therefore be used as a comment in a batch file.\n" msgstr "" -"以 REM 起始的命令列 (之後緊接空格) 不會進行任何\n" -"動作，因而可以做為批次檔中的註釋。\n" +"以 REM 起始的命令列 (之後緊接空格) 不會進行任何動作，\n" +"因而可以做為批次檔中的註釋。\n" #: programs/cmd/cmd.rc:176 msgid "REN <filename> is the short version of RENAME. It renames a file.\n" -msgstr "REN <檔名> 是 RENAME 的簡短版本。它會重新命名檔案。\n" +msgstr "REN <檔案名稱> 是 RENAME 的簡短版本。它會重新命名檔案。\n" #: programs/cmd/cmd.rc:178 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <檔名> 重新命名檔案。\n" +msgstr "RENAME <檔案名稱> 重新命名檔案。\n" #: programs/cmd/cmd.rc:181 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除子目錄。\n" +msgstr "RD <目錄> 是 RMDIR 的簡短版本。它會刪除目錄。\n" #: programs/cmd/cmd.rc:183 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <目錄> 刪除子目錄。\n" +msgstr "RMDIR <目錄> 刪除目錄。\n" #: programs/cmd/cmd.rc:229 -#, fuzzy -#| msgid "" -#| "SET displays or changes the cmd environment variables.\n" -#| "\n" -#| "SET without parameters shows all of the current environment.\n" -#| "\n" -#| "To create or modify an environment variable the syntax is:\n" -#| "\n" -#| "SET <variable>=<value>\n" -#| "\n" -#| "where <variable> and <value> are character strings. There must be no\n" -#| "space before the equals sign, nor can the variable name\n" -#| "have embedded spaces.\n" -#| "\n" -#| "Under Wine, the environment of the underlying operating system is\n" -#| "included into the Win32 environment, there will generally therefore be\n" -#| "many more values than in a native Win32 implementation. Note that it is\n" -#| "not possible to affect the operating system environment from within cmd.\n" msgid "" "SET displays or changes the cmd environment variables.\n" "\n" @@ -13534,24 +13416,18 @@ msgstr "" "\n" "不接參數的 SET 將顯示目前的全部環境。\n" "\n" -"要建立或修改環境變數的語法是：\n" +"要建立或修改環境變數的語法是:\n" "\n" "SET <變數名稱>=<變數值>\n" "\n" -"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有\n" -"空格，而變數名稱也不可以嵌入空格。\n" +"其中 <變數名稱> 和 <變數值> 都是字串。在等號之前必須沒有空格，\n" +"而變數名稱也不可以嵌入空格。\n" "\n" -"在 Wine 之下，下層的作業系統環境也被\n" -"包含於 Win32 環境之中，因此通常會比在原生的 Win32 實作中\n" -"還要多出更多變數值。要注意的是，從 cmd 之中是不可能\n" -"去影響作業系統的環境。\n" +"在 Wine 之下，下層的作業系統環境也被包含於 Win32 環境之中，\n" +"因此通常會比在原生的 Win32 實作中還要多出更多變數值。\n" +"要注意的是，從 cmd 之中是不可能去影響作業系統的環境。\n" #: programs/cmd/cmd.rc:234 -#, fuzzy -#| msgid "" -#| "SHIFT is used in a batch file to remove one parameter from the head of\n" -#| "the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n" -#| "if called from the command line.\n" msgid "" "SHIFT is used in a batch file to remove one parameter from the head of the\n" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" @@ -13562,35 +13438,6 @@ msgstr "" "將不會有任何效果。\n" #: programs/cmd/cmd.rc:212 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -13620,30 +13467,30 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity 遮罩以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/ProgIDOpen 使用指定的 progID 開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/cmd/cmd.rc:237 msgid "TIME sets or shows the current system time.\n" @@ -13654,15 +13501,11 @@ msgid "TITLE <string> sets the window title for the cmd window.\n" msgstr "TITLE <字串> 設定 cmd 視窗的視窗標題。\n" #: programs/cmd/cmd.rc:244 -#, fuzzy -#| msgid "" -#| "TYPE <filename> copies <filename> to the console device (or elsewhere\n" -#| "if redirected). No check is made that the file is readable text.\n" msgid "" "TYPE <filename> copies <filename> to the console device (or elsewhere if\n" "redirected). No check is made that the file is readable text.\n" msgstr "" -"TYPE <檔名> 將 <檔名> 的內容複製到主控臺裝置 (或是其他被\n" +"TYPE <檔案名稱> 將 <檔案名稱> 的內容複製到主控臺裝置 (或是其他被\n" "重新導向的地方)。不會檢查該檔案是否為可讀的文字。\n" #: programs/cmd/cmd.rc:253 @@ -13675,7 +13518,7 @@ msgid "" "\n" "The verify flag has no function in Wine.\n" msgstr "" -"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括：\n" +"VERIFY 用來設定、清空或測試驗證旗標。有效的形式包括:\n" "\n" "VERIFY ON\t設定旗標。\n" "VERIFY OFF\t清空旗標。\n" @@ -13689,13 +13532,9 @@ msgstr "VER 顯示您正在執行的 cmd 版本。\n" #: programs/cmd/cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL 顯示磁碟裝置的卷冊標貼。\n" +msgstr "VOL 顯示磁碟裝置的磁碟區標籤。\n" #: programs/cmd/cmd.rc:263 -#, fuzzy -#| msgid "" -#| "ENDLOCAL ends localization of environment changes in a batch file\n" -#| "which were introduced by a preceding SETLOCAL.\n" msgid "" "ENDLOCAL ends localization of environment changes in a batch file which\n" "were introduced by a preceding SETLOCAL.\n" @@ -13716,36 +13555,22 @@ msgstr "" "\n" "SETLOCAL 之後完成的環境變更對於批次檔而言為本地，\n" "並被保留直到遇到下一個 ENDLOCAL (或是檔案\n" -"的結束，取決於誰先出現)，前一個環境的設定值\n" +"的結尾，取決於誰先出現)，前一個環境的設定值\n" "則於該點被儲存。\n" #: programs/cmd/cmd.rc:275 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a stack, and then\n" "changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <目錄名> 儲存目前的目錄到\n" -"堆疊中，然後變更現行目錄到所給定的目錄。\n" +"PUSHD <目錄> 儲存目前的目錄到堆疊中，\n" +"然後變更現行目錄到所給定的目錄。\n" #: programs/cmd/cmd.rc:278 msgid "POPD changes current directory to the last one saved with PUSHD.\n" msgstr "POPD 變更現行目錄到上一個利用 PUSHD 儲存的目錄。\n" #: programs/cmd/cmd.rc:288 -#, fuzzy -#| msgid "" -#| "ASSOC shows or modifies file extension associations.\n" -#| "\n" -#| "Syntax: ASSOC [.ext[=[fileType]]]\n" -#| "\n" -#| "ASSOC without parameters displays current file associations.\n" -#| "If used with only a file extension, displays the current association.\n" -#| "Specifying no file type after the equal sign removes the current " -#| "association, if any.\n" msgid "" "ASSOC shows or modifies file extension associations.\n" "\n" @@ -13758,25 +13583,13 @@ msgid "" msgstr "" "ASSOC 顯示或修改副檔名的關聯。\n" "\n" -"語法：ASSOC [.ext[=[檔案型態]]]\n" +"語法: ASSOC [.ext[=[檔案型態]]]\n" "\n" "ASSOC 不加參數將顯示目前的檔案關聯。\n" "如果只使用副檔名，則顯示它目前的關聯。\n" "在等號之號如果沒有指定檔案類型就移除目前的任何關聯。\n" #: programs/cmd/cmd.rc:300 -#, fuzzy -#| msgid "" -#| "FTYPE shows or modifies open commands associated with file types.\n" -#| "\n" -#| "Syntax: FTYPE [fileType[=[openCommand]]]\n" -#| "\n" -#| "Without parameters, shows the file types for which open command strings " -#| "are currently defined.\n" -#| "If used with only a file type, displays the associated open command " -#| "string, if any.\n" -#| "Specifying no open command after the equal sign removes the command " -#| "string associated to the specified file type.\n" msgid "" "FTYPE shows or modifies open commands associated with file types.\n" "\n" @@ -13791,22 +13604,18 @@ msgid "" msgstr "" "FTYPE 顯示或修改開啟命令所關聯的檔案類型。\n" "\n" -"語法：FTYPE [檔案型態[=[開啟命令]]]\n" +"語法: FTYPE [檔案型態[=[開啟命令]]]\n" "\n" "如果不加參數，則顯示開啟命令目前所定義的檔案型態。\n" "如果只使用檔案類型，則顯示關聯的任何開啟命令字串。\n" -"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的任何關聯命令字串。\n" +"在等號之號如果沒有指定檔案類型就移除對於給定檔案型態的\n" +"任何關聯命令字串。\n" #: programs/cmd/cmd.rc:303 msgid "MORE displays output of files or piped input in pages.\n" msgstr "MORE 以分頁的方式顯示檔案的輸出或管線的輸入。\n" #: programs/cmd/cmd.rc:308 -#, fuzzy -#| msgid "" -#| "CHOICE displays a text and waits, until the User\n" -#| "presses an allowed Key from a selectable list.\n" -#| "CHOICE is mainly used to build a menu selection in a batch file.\n" msgid "" "CHOICE displays a text and waits, until the User presses an allowed Key\n" "from a selectable list.\n" @@ -13829,61 +13638,26 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"建立符號連結。\n" +"\n" +"語法: MKLINK [選項] 連結名稱目標\n" +"\n" +"選項:\n" +"/d 建立目錄符號連結。\n" +"/h 建立永久連結。\n" +"/j 建立目錄連接。\n" +"連結名稱為新的符號連結的名稱。\n" +"目標為連結名稱指向的路徑。\n" #: programs/cmd/cmd.rc:312 -#, fuzzy -#| msgid "" -#| "EXIT terminates the current command session and returns\n" -#| "to the operating system or shell from which you invoked cmd.\n" msgid "" "EXIT terminates the current command session and returns to the operating\n" "system or shell from which you invoked cmd.\n" msgstr "" -"EXIT 終止目前的命令作業階段並回到\n" -"您從其調用 cmd 的作業系統或命令殼。\n" +"EXIT 終止目前的命令作業階段並回到您從其調用 cmd 的\n" +"作業系統或命令殼。\n" #: programs/cmd/cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -13925,10 +13699,10 @@ msgid "" "\n" "Enter HELP <command> for further information on any of the above commands.\n" msgstr "" -"CMD 內建命令包括：\n" +"CMD 內建命令包括:\n" "ASSOC\t\t顯示或修改副檔名關聯\n" "ATTRIB\t\t顯示或變更 DOS 檔案屬性\n" -"CALL\t\t從另一個批次檔內部調用\n" +"CALL\t\t在批次檔中呼叫另一個批次檔\n" "CD (CHDIR)\t變更目前的預設目錄\n" "CHOICE\t\t從可選清單等待按鍵\n" "CLS\t\t清空主控臺螢幕\n" @@ -13942,13 +13716,14 @@ msgstr "" "FTYPE\t\t顯示或修改與檔案類型關聯的開啟命令\n" "HELP\t\t顯示主題的簡潔說明\n" "MD (MKDIR)\t建立子目錄\n" +"MKLINK\t建立符號連結\n" "MORE\t\t分頁顯示輸出\n" "MOVE\t\t移動一個檔案、一組檔案或樹狀目錄\n" "PATH\t\t設定或顯示搜尋路徑\n" "PAUSE\t\t懸置執行中的批次檔\n" "POPD\t\t還原到上一次以 PUSHD 儲存的目錄\n" "PROMPT\t\t變更指令提示符號\n" -"PUSHD\t\t變更為新的目錄並儲存目前的\n" +"PUSHD\t\t變更為新的目錄並儲存目前的目錄\n" "REN (RENAME)\t重新命名檔案\n" "RD (RMDIR)\t刪除子目錄\n" "SET\t\t設定或顯示環境變數\n" @@ -13958,15 +13733,15 @@ msgstr "" "TITLE\t\t設定用於 CMD 作業階段的視窗標題\n" "TYPE\t\t印出文字檔的內容\n" "VER\t\t顯示目前的 CMD 版本\n" -"VOL\t\t顯示磁碟裝置的卷冊標貼\n" +"VOL\t\t顯示磁碟裝置的磁碟區標籤\n" "XCOPY\t\t複製來源檔案或樹狀目錄到目的地\n" "EXIT\t\t關閉 CMD\n" "\n" -"輸入 HELP <命令> 以獲得關於以上任何命令的進一步資訊。\n" +"輸入 HELP <命令> 以取得關於以上任何命令的進一步資訊。\n" #: programs/cmd/cmd.rc:365 msgid "Are you sure?" -msgstr "您確定嗎？" +msgstr "您確定嗎?" #: programs/cmd/cmd.rc:366 programs/reg/reg.rc:126 programs/xcopy/xcopy.rc:43 msgctxt "Yes key" @@ -13980,15 +13755,15 @@ msgstr "N" #: programs/cmd/cmd.rc:368 msgid "File association missing for extension %1\n" -msgstr "缺少用於延伸檔名 %1 的檔案關聯\n" +msgstr "找不到副檔名 %1 的檔案關聯\n" #: programs/cmd/cmd.rc:369 msgid "No open command associated with file type '%1'\n" -msgstr "沒有與檔案類型 %1 相關聯的開啟命令\n" +msgstr "沒有與檔案類型 '%1' 相關聯的開啟命令\n" #: programs/cmd/cmd.rc:370 msgid "Overwrite %1?" -msgstr "覆寫 %1？" +msgstr "覆寫 %1?" #: programs/cmd/cmd.rc:371 msgid "More..." @@ -13996,7 +13771,7 @@ msgstr "更多..." #: programs/cmd/cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "命令列於批次處理時可能會被截斷。使用：\n" +msgstr "命令列於批次處理時可能會被截斷。使用:\n" #: programs/cmd/cmd.rc:374 msgid "Argument missing\n" @@ -14024,11 +13799,11 @@ msgstr "現在時間是 %1\n" #: programs/cmd/cmd.rc:381 msgid "Enter new date: " -msgstr "輸入新日期：" +msgstr "輸入新日期: " #: programs/cmd/cmd.rc:382 msgid "Enter new time: " -msgstr "輸入新時間：" +msgstr "輸入新時間: " #: programs/cmd/cmd.rc:383 msgid "Environment variable %1 not defined\n" @@ -14040,7 +13815,7 @@ msgstr "開啟 %1 失敗\n" #: programs/cmd/cmd.rc:385 msgid "Cannot call batch label outside of a batch script\n" -msgstr "無法呼叫批次命令稿外部的批次標貼\n" +msgstr "無法呼叫批次命令指令碼外部的批次標貼\n" #: programs/cmd/cmd.rc:386 programs/reg/reg.rc:128 programs/xcopy/xcopy.rc:45 msgctxt "All key" @@ -14049,7 +13824,7 @@ msgstr "A" #: programs/cmd/cmd.rc:387 msgid "Delete %1?" -msgstr "刪除 %1？" +msgstr "刪除 %1?" #: programs/cmd/cmd.rc:388 msgid "Echo is %1\n" @@ -14072,12 +13847,12 @@ msgid "" "Volume Serial Number is %1!04x!-%2!04x!\n" "\n" msgstr "" -"卷冊序號是 %1!04x!-%2!04x!\n" +"磁碟區序號是 %1!04x!-%2!04x!\n" "\n" #: programs/cmd/cmd.rc:393 msgid "Volume label (11 characters, <Enter> for none)?" -msgstr "卷冊標貼 (11 個字元，<Enter> 表示沒有)？" +msgstr "磁碟區標籤 (11 個字元，<Enter> 表示沒有)?" #: programs/cmd/cmd.rc:394 msgid "PATH not found\n" @@ -14085,19 +13860,19 @@ msgstr "找不到 PATH\n" #: programs/cmd/cmd.rc:395 msgid "Press any key to continue... " -msgstr "按下任何鍵繼續... " +msgstr "按下任意鍵繼續... " #: programs/cmd/cmd.rc:396 msgid "Wine Command Prompt" -msgstr "Wine 命令提示符號" +msgstr "Wine 命令提示字元" #: programs/cmd/cmd.rc:397 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: programs/cmd/cmd.rc:398 msgid "More? " -msgstr "更多？" +msgstr "更多? " #: programs/cmd/cmd.rc:399 msgid "The input line is too long.\n" @@ -14105,26 +13880,24 @@ msgstr "輸入列太長。\n" #: programs/cmd/cmd.rc:400 msgid "Volume in drive %1!c! is %2\n" -msgstr "位於儲存裝置 %1!c! 的卷冊為 %2\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區為 %2\n" #: programs/cmd/cmd.rc:401 msgid "Volume in drive %1!c! has no label.\n" -msgstr "位於儲存裝置 %1!c! 的卷冊沒有任何標貼。\n" +msgstr "位於儲存裝置 %1!c! 的磁碟區沒有任何標籤。\n" #: programs/cmd/cmd.rc:402 programs/reg/reg.rc:129 -#, fuzzy msgid " (Yes|No)" -msgstr " (是|否)" +msgstr " (Yes|No)" #: programs/cmd/cmd.rc:403 programs/reg/reg.rc:130 -#, fuzzy msgid " (Yes|No|All)" -msgstr " (是|否|全部)" +msgstr " (Yes|No|All)" #: programs/cmd/cmd.rc:404 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "無法識別 %1 為內部、外部命令或是批次命令稿。\n" +msgstr "無法識別 %1 為內部、外部命令或是批次命令指令碼。\n" #: programs/cmd/cmd.rc:405 msgid "Division by zero error.\n" @@ -14140,14 +13913,14 @@ msgstr "預期為一個運算子。\n" #: programs/cmd/cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "小括號不匹配。\n" +msgstr "小括號不相符。\n" #: programs/cmd/cmd.rc:409 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" -"不當的數字形式 - 必須是十進位 (12)、\n" +"錯誤的數字形式 - 必須是十進位 (12)、\n" " 十六進位 (0x34) 或八進位 (056) 之一。\n" #: programs/conhost/conhost.rc:54 @@ -14168,23 +13941,19 @@ msgstr "大(&L)" #: programs/conhost/conhost.rc:59 msgid "Command history" -msgstr "指令歷程" +msgstr "命令歷程記錄" #: programs/conhost/conhost.rc:60 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "緩衝區域" +msgstr "緩衝大小(&B):" #: programs/conhost/conhost.rc:63 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "刪除連續相同的指令(&R)" +msgstr "移除重複(&R)" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "彈出功能表" +msgstr "快顯功能表" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -14195,22 +13964,16 @@ msgid "S&hift" msgstr "S&hift" #: programs/conhost/conhost.rc:69 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "關閉虛擬終端(&C)" +msgstr "主控臺" #: programs/conhost/conhost.rc:70 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "快速編輯" +msgstr "快速編輯模式(&Q)" #: programs/conhost/conhost.rc:71 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "專家模式(&E)" +msgstr "插入模式(&I)" #: programs/conhost/conhost.rc:79 msgid "&Font" @@ -14222,7 +13985,7 @@ msgstr "顏色(&C)" #: programs/conhost/conhost.rc:92 msgid "Configuration" -msgstr "組態" +msgstr "設定" #: programs/conhost/conhost.rc:95 msgid "Buffer zone" @@ -14230,11 +13993,11 @@ msgstr "緩衝區域" #: programs/conhost/conhost.rc:96 msgid "&Width:" -msgstr "寬度(&W)：" +msgstr "寬度(&W):" #: programs/conhost/conhost.rc:99 msgid "&Height:" -msgstr "高度(&H)：" +msgstr "高度(&H):" #: programs/conhost/conhost.rc:103 msgid "Window size" @@ -14242,11 +14005,11 @@ msgstr "視窗大小" #: programs/conhost/conhost.rc:104 msgid "W&idth:" -msgstr "寬度(&I)：" +msgstr "寬度(&I):" #: programs/conhost/conhost.rc:107 msgid "H&eight:" -msgstr "高度(&E)：" +msgstr "高度(&E):" #: programs/conhost/conhost.rc:111 msgid "End of program" @@ -14254,19 +14017,19 @@ msgstr "當程式結束後" #: programs/conhost/conhost.rc:112 msgid "&Close console" -msgstr "關閉虛擬終端(&C)" +msgstr "關閉主控臺(&C)" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Edition" +msgstr "版本" #: programs/conhost/conhost.rc:120 msgid "Console parameters" -msgstr "虛擬終端執行參數" +msgstr "主控臺執行參數" #: programs/conhost/conhost.rc:123 msgid "Retain these settings for later sessions" -msgstr "保留當前配置以便下次使用" +msgstr "保留目前設定以便下次使用" #: programs/conhost/conhost.rc:124 msgid "Modify only current session" @@ -14311,8 +14074,6 @@ msgid "Configuration error" msgstr "組態錯誤" #: programs/conhost/conhost.rc:46 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." @@ -14332,17 +14093,15 @@ msgstr "DirectX 診斷工具" #: programs/dxdiag/dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "用法：dxdiag [/whql:off | /whql:on] [/t 檔名 | /x 檔名]" +msgstr "用法: dxdiag [/whql:off | /whql:on] [/t 檔案名稱 | /x 檔案名稱]" #: programs/explorer/explorer.rc:32 msgid "Wine Explorer" msgstr "Wine 檔案總管" #: programs/explorer/explorer.rc:34 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "啟動" +msgstr "開始" #: programs/explorer/explorer.rc:35 programs/winefile/winefile.rc:36 msgid "&Run..." @@ -14354,6 +14113,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- 支援的命令 -\n" +"\n" +"hardlink 永久連結管理\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -14361,38 +14123,39 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - 支援的命令 -\n" +"\n" +"create 建立永久連結\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "語法: fsutil hardlink create <new> <existing>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" -msgstr "用法：主機名稱\n" +msgstr "用法: 主機名稱\n" #: programs/hostname/hostname.rc:31 msgid "Error: Invalid option '%c'.\n" -msgstr "錯誤：無效的選項 %c。\n" +msgstr "錯誤: 無效的選項 '%c'。\n" #: programs/hostname/hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "錯誤：找不到行程 %1。\n" +msgstr "錯誤: 無法取得主機名稱: %u。\n" #: programs/hostname/hostname.rc:33 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" -msgstr "錯誤：不能利用主機名稱公用程式來設定系統主機名稱。\n" +msgstr "錯誤: 無法使用 hostname 工具設定系統的主機名稱。\n" #: programs/ipconfig/ipconfig.rc:30 msgid "Usage: ipconfig [ /? | /all ]\n" -msgstr "用法：ipconfig [ /? | /all ]\n" +msgstr "用法: ipconfig [ /? | /all ]\n" #: programs/ipconfig/ipconfig.rc:31 msgid "Error: Unknown or invalid command line parameters specified\n" -msgstr "錯誤：指定了不明或無效的命令列參數\n" +msgstr "錯誤: 指定了不明或無效的命令列參數\n" #: programs/ipconfig/ipconfig.rc:32 msgid "%1 adapter %2\n" @@ -14474,7 +14237,7 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET command [引數]\n" " 或\n" @@ -14491,12 +14254,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET START [service]\n" "\n" -"如果 service 被省略，就顯示執行中服務的清單，否則 service 表示要啟動的服務名" -"稱。\n" +"如果 'service' 被省略，就顯示執行中服務的清單，否則 'service' 表示要啟動的" +"服務名稱。\n" #: programs/net/net.rc:32 msgid "" @@ -14506,7 +14269,7 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" -"這個命令的語法是：\n" +"這個命令的語法是:\n" "\n" "NET STOP service\n" "\n" @@ -14514,7 +14277,7 @@ msgstr "" #: programs/net/net.rc:33 msgid "Stopping dependent service: %1\n" -msgstr "正在停止附屬服務：%1\n" +msgstr "正在停止附屬服務: %1\n" #: programs/net/net.rc:34 msgid "Could not stop service %1\n" @@ -14522,27 +14285,27 @@ msgstr "無法停止服務 %1。\n" #: programs/net/net.rc:35 msgid "Could not get handle to service control manager.\n" -msgstr "無法獲得服務控制管理員控柄。\n" +msgstr "無法取得服務控制管理員的控制代碼。\n" #: programs/net/net.rc:36 msgid "Could not get handle to service.\n" -msgstr "無法獲得服務控柄。\n" +msgstr "無法取得服務的控制代碼。\n" #: programs/net/net.rc:37 msgid "The %1 service is starting.\n" -msgstr "%1 服務正在開始。\n" +msgstr "正在啟動 %1 服務。\n" #: programs/net/net.rc:38 msgid "The %1 service was started successfully.\n" -msgstr "%1 服務已成功開始。\n" +msgstr "%1 服務已成功啟動。\n" #: programs/net/net.rc:39 msgid "The %1 service failed to start.\n" -msgstr "%1 服務無法開始。\n" +msgstr "無法啟動 %1 服務。\n" #: programs/net/net.rc:40 msgid "The %1 service is stopping.\n" -msgstr "%1 服務正在停止。\n" +msgstr "正在停止 %1 服務。\n" #: programs/net/net.rc:41 msgid "The %1 service was stopped successfully.\n" @@ -14550,11 +14313,11 @@ msgstr "%1 服務已成功停止。\n" #: programs/net/net.rc:42 msgid "The %1 service failed to stop.\n" -msgstr "%1 服務無法停止。\n" +msgstr "無法停止 %1 服務。\n" #: programs/net/net.rc:44 msgid "There are no entries in the list.\n" -msgstr "在清單中沒有條目。\n" +msgstr "在清單中沒有項目。\n" #: programs/net/net.rc:45 msgid "" @@ -14563,12 +14326,12 @@ msgid "" "---------------------------------------------------------------\n" msgstr "" "\n" -"狀態本地遠端\n" +"狀態本機遠端\n" "---------------------------------------------------------------\n" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 開啟資源：%4!u!\n" +msgstr "%1 %2 %3 開啟資源: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -14584,7 +14347,7 @@ msgstr "網路發生了錯誤" #: programs/net/net.rc:51 msgid "Connection is being made" -msgstr "正在進行連接" +msgstr "正在連線" #: programs/net/net.rc:52 msgid "Reconnecting" @@ -14592,7 +14355,7 @@ msgstr "正在重新連線" #: programs/net/net.rc:43 msgid "The following services are running:\n" -msgstr "下列服務正在執行：\n" +msgstr "下列服務正在執行:\n" #: programs/netstat/netstat.rc:30 msgid "Active Connections" @@ -14729,7 +14492,7 @@ msgstr "版面設定(&T)..." #: programs/notepad/notepad.rc:37 msgid "P&rinter Setup..." -msgstr "列印設定(&R)..." +msgstr "印表機設定(&R)..." #: programs/notepad/notepad.rc:42 programs/wordpad/wordpad.rc:44 msgid "&Undo\tCtrl+Z" @@ -14759,11 +14522,11 @@ msgstr "全選(&A)\tCtrl+A" #: programs/notepad/notepad.rc:50 msgid "&Time/Date\tF5" -msgstr "插入日期時間(&T)\tF5" +msgstr "插入日期/時間(&T)\tF5" #: programs/notepad/notepad.rc:52 msgid "&Wrap long lines" -msgstr "自動換列(&W)" +msgstr "自動換行(&W)" #: programs/notepad/notepad.rc:56 msgid "&Search...\tCtrl+F" @@ -14898,9 +14661,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"檔案 %s 不存在\n" +"檔案 '%s' 不存在。\n" "\n" -"您想新增一個檔案嗎？" +"您要建立一個新檔案嗎?" #: programs/notepad/notepad.rc:82 msgid "" @@ -14908,25 +14671,25 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"檔案 %s 正文已更改\n" +"檔案 '%s' 的內容已更改。\n" "\n" -"是否儲存更改？" +"您要儲存更改嗎?" #: programs/notepad/notepad.rc:83 msgid "'%s' could not be found." -msgstr "找不到 %s。" +msgstr "找不到 '%s'。" #: programs/notepad/notepad.rc:85 msgid "Unicode (UTF-16)" -msgstr "萬國碼 (UTF-16)" +msgstr "Unicode (UTF-16)" #: programs/notepad/notepad.rc:86 msgid "Unicode (UTF-16 big-endian)" -msgstr "萬國碼 (UTF-16 大尾序)" +msgstr "Unicode (UTF-16 big-endian)" #: programs/notepad/notepad.rc:87 msgid "Unicode (UTF-8)" -msgstr "萬國碼 (UTF-8)" +msgstr "Unicode (UTF-8)" #: programs/notepad/notepad.rc:94 msgid "" @@ -14938,11 +14701,11 @@ msgid "" "Continue?" msgstr "" "%1\n" -"這個檔案含有萬國碼字元，如果以 %2 編碼\n" -"儲存這個檔案，您將會失去它們。\n" -"要保留這些字元，請按一下取消，然後在編碼\n" -"的下拉選單中選取一個萬國碼選項。\n" -"要繼續嗎？" +"這個檔案含有 Unicode 字元，如果以 %2 編碼儲存這個檔案，\n" +"這些字符將會丟失。\n" +"要保留這些字元，請按一下 [取消]，\n" +"然後在 [編碼] 下拉選單中選取一個 Unicode 選項。\n" +"您要繼續嗎?" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..." @@ -14950,7 +14713,7 @@ msgstr "檔案綁定(&B)..." #: programs/oleview/oleview.rc:33 msgid "&View TypeLib..." -msgstr "查看 &TypeLib..." +msgstr "查看 TypeLib(&V)..." #: programs/oleview/oleview.rc:35 msgid "&System Configuration" @@ -14962,15 +14725,15 @@ msgstr "執行註冊表編輯器(&R)" #: programs/oleview/oleview.rc:42 msgid "&CoCreateInstance Flag" -msgstr "&CoCreateInstance 參數" +msgstr "CoCreateInstance 旗標(&C)" #: programs/oleview/oleview.rc:44 msgid "&In-process server" -msgstr "同行程伺服器(&I)" +msgstr "同處理序伺服程式(&I)" #: programs/oleview/oleview.rc:45 msgid "In-process &handler" -msgstr "同行程處理常式(&H)" +msgstr "同處理序處理常式(&H)" #: programs/oleview/oleview.rc:46 msgid "&Local server" @@ -15035,7 +14798,7 @@ msgstr "關於 OleView(&A)" #: programs/oleview/oleview.rc:82 msgid "&Save as..." -msgstr "另存為(&S)..." +msgstr "另存新檔(&S)..." #: programs/oleview/oleview.rc:87 msgid "&Group by type kind" @@ -15063,7 +14826,7 @@ msgstr "啟用分散式 COM(&E)" #: programs/oleview/oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "啟用遠端連線(&R)(限 Win95)" +msgstr "啟用遠端連線 (限 Win95)(&R)" #: programs/oleview/oleview.rc:173 msgid "" @@ -15123,7 +14886,7 @@ msgstr "TypeLib 檔案 (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: programs/oleview/oleview.rc:105 msgid "Bind to file via a File Moniker" -msgstr "通過檔案綽號綁定到檔案" +msgstr "通過 File Moniker 綁定到檔案" #: programs/oleview/oleview.rc:106 msgid "Open a TypeLib file and view the contents" @@ -15131,7 +14894,7 @@ msgstr "開啟 TypeLib 檔案並查看內容" #: programs/oleview/oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "修改本機分散式 COM 設定" +msgstr "變更本機分散式 COM 設定" #: programs/oleview/oleview.rc:108 msgid "Run the Wine registry editor" @@ -15139,7 +14902,7 @@ msgstr "執行 Wine 註冊表編輯器" #: programs/oleview/oleview.rc:109 msgid "Quit the application. Prompts to save changes" -msgstr "結束程式。提示儲存" +msgstr "結束程式。提示儲存" #: programs/oleview/oleview.rc:110 msgid "Create an instance of the selected object" @@ -15147,19 +14910,19 @@ msgstr "建立目前選擇的物件實例" #: programs/oleview/oleview.rc:111 msgid "Create an instance of the selected object on a specific machine" -msgstr "建立當前選定物件在指定電腦的實例" +msgstr "建立目前選定物件在指定電腦的實例" #: programs/oleview/oleview.rc:112 msgid "Release the currently selected object instance" -msgstr "釋放當前選定物件實例" +msgstr "釋放目前選定物件實例" #: programs/oleview/oleview.rc:113 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "將當前選定項目的 GUID 複製到剪貼簿" +msgstr "將目前選定項目的 GUID 複製到剪貼簿" #: programs/oleview/oleview.rc:114 msgid "Display the viewer for the selected item" -msgstr "顯示選定項目的查看器" +msgstr "顯示選定項目的檢視器" #: programs/oleview/oleview.rc:119 msgid "Toggle between expert and novice display mode" @@ -15184,15 +14947,15 @@ msgstr "重新整理所有清單" #: programs/oleview/oleview.rc:124 msgid "Display program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/oleview/oleview.rc:115 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程伺服器" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序伺服程式" #: programs/oleview/oleview.rc:116 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "呼叫 CoGetClassObject 時要求一個同行程處理常式" +msgstr "呼叫 CoGetClassObject 時要求一個同處理序處理常式" #: programs/oleview/oleview.rc:117 msgid "Ask for a local server when calling CoGetClassObject" @@ -15224,7 +14987,7 @@ msgstr "所有物件" #: programs/oleview/oleview.rc:135 msgid "Application IDs" -msgstr "應用程式 IDs" +msgstr "應用程式識別碼" #: programs/oleview/oleview.rc:136 msgid "Type Libraries" @@ -15256,7 +15019,7 @@ msgstr "CoGetClassObject 失敗。" #: programs/oleview/oleview.rc:145 msgid "Unknown error" -msgstr "未知錯誤" +msgstr "不明錯誤" #: programs/oleview/oleview.rc:148 msgid "bytes" @@ -15272,7 +15035,7 @@ msgstr "繼承介面" #: programs/oleview/oleview.rc:126 msgid "Save as an .IDL or .H file" -msgstr "存為 .IDL 或 .H 檔案" +msgstr "儲存為 .IDL 或 .H 檔案" #: programs/oleview/oleview.rc:127 msgid "Close window" @@ -15300,7 +15063,7 @@ msgstr "複製(&C)...\tF8" #: programs/progman/progman.rc:38 msgid "&Properties\tAlt+Enter" -msgstr "屬性(&P)\tAlt+Enter" +msgstr "內容(&P)\tAlt+Enter" #: programs/progman/progman.rc:40 msgid "&Execute..." @@ -15418,11 +15181,11 @@ msgstr "變更圖示" #: programs/progman/progman.rc:194 msgid "&Filename:" -msgstr "檔案名(&F):" +msgstr "檔案名稱(&F):" #: programs/progman/progman.rc:196 msgid "Current &icon:" -msgstr "當前圖示(&I):" +msgstr "目前圖示(&I):" #: programs/progman/progman.rc:210 msgid "Execute Program" @@ -15442,11 +15205,11 @@ msgstr "資訊" #: programs/progman/progman.rc:68 msgid "Delete group `%s'?" -msgstr "是否刪除程式群組 %s？" +msgstr "是否刪除程式群組 `%s'?" #: programs/progman/progman.rc:69 msgid "Delete program `%s'?" -msgstr "是否刪除程式 %s？" +msgstr "是否刪除程式 `%s'?" #: programs/progman/progman.rc:70 msgid "Not implemented" @@ -15454,19 +15217,19 @@ msgstr "未實作" #: programs/progman/progman.rc:71 msgid "Error reading `%s'." -msgstr "讀取檔案 %s 時發生錯誤。" +msgstr "讀取檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:72 msgid "Error writing `%s'." -msgstr "寫入檔案 %s 時發生錯誤。" +msgstr "寫入檔案 `%s' 時發生錯誤。" #: programs/progman/progman.rc:75 msgid "" "The group file `%s' cannot be opened.\n" "Should it be tried further on?" msgstr "" -"無法開啟群組檔案 %s。\n" -"是否繼續嘗試？" +"無法開啟群組檔案 `%s'。\n" +"是否繼續嘗試開啟?" #: programs/progman/progman.rc:77 msgid "Help not available." @@ -15474,15 +15237,15 @@ msgstr "沒有可用的說明資訊。" #: programs/progman/progman.rc:78 msgid "Unknown feature in %s" -msgstr "在 %s 中發現未知特性" +msgstr "在 %s 中發現不明功能" #: programs/progman/progman.rc:79 msgid "File `%s' exists. Not overwritten." -msgstr "檔案 %s 已經存在。不覆蓋已有檔案。" +msgstr "檔案 `%s' 已經存在。不覆寫已有檔案。" #: programs/progman/progman.rc:80 msgid "Save group as `%s' to prevent overwriting original files." -msgstr "將程式組儲存為 %s 可以避免復蓋已有的檔案。" +msgstr "將程式組儲存為 `%s' 可以避免覆寫已有的檔案。" #: programs/progman/progman.rc:84 msgid "Libraries (*.dll)" @@ -15497,47 +15260,32 @@ msgid "Icons (*.ico)" msgstr "圖示 (*.ico)" #: programs/reg/reg.rc:139 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的語法。 " #: programs/reg/reg.rc:142 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG %1 /?\" 以取得說明。\n" #: programs/reg/reg.rc:181 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to access or create the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 無法存取或建立指定的註冊表鍵\n" #: programs/reg/reg.rc:116 -#, fuzzy -#| msgid "The operation completed successfully\n" msgid "reg: The operation completed successfully\n" -msgstr "作業已成功完成\n" +msgstr "reg: 操作成功完成\n" #: programs/reg/reg.rc:131 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "reg: The registry operation was cancelled\n" -msgstr "作業被使用者取消。\n" +msgstr "reg: 註冊表操作已經取消\n" #: programs/reg/reg.rc:174 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry key\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄機碼\n" #: programs/reg/reg.rc:120 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "reg: Unable to find the specified registry value\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "reg: 找不到指定的登錄值\n" #: programs/reg/reg.rc:132 programs/regedit/regedit.rc:239 msgid "(Default)" @@ -15545,7 +15293,7 @@ msgstr "(預設)" #: programs/reg/reg.rc:141 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "輸入 \"REG /?\" 以取得說明。\n" #: programs/reg/reg.rc:35 msgid "" @@ -15559,6 +15307,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"用法:\n" +" REG [操作] [參數]\n" +"\n" +"支援的操作:\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" +"\n" +"要取得指定操作的說明，請輸入:\n" +" REG [操作] /?\n" +"\n" #: programs/reg/reg.rc:67 msgid "" @@ -15609,6 +15366,52 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <機碼> [/v 值名稱 | /ve] [/t 類型] [/s 分隔符號] [/d 資料] [/f]\n" +"\n" +" 新增一個機碼到註冊表，或新增值到給定的登錄機碼。\n" +"\n" +" <機碼>\n" +" 要新增的機碼，如果指定了 [/v] 或 [/ve]，\n" +" 則會在該機碼新增登錄資料。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要新增的登錄值的名稱。\n" +"\n" +" /ve\n" +" 新增未命名的登錄值。這個選項會修改 (預設) 的\n" +" 登錄值。\n" +"\n" +" /t <類型>\n" +" 要新增到註冊表的資料類型。如果指定了 [/t]，\n" +" <類型> 必須是下列的其中一個:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" 如果未指定 [/t]，資料類型將預設為 REG_SZ。\n" +"\n" +" /s <分隔符號>\n" +" 指定一個用於分隔 REG_MULTI_SZ 資料字串的字元。\n" +" 如果未指定 [/s]，分隔符號會預設為 \\0。\n" +"\n" +" /d <資料>\n" +" 要新增給新的登錄值的資料。\n" +"\n" +" /f\n" +" 修改登錄項目而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:202 msgid "" @@ -15644,6 +15447,35 @@ msgid "" "<key2>.\n" "\n" msgstr "" +"REG COPY <機碼1> <機碼2> [/s] [/f]\n" +"\n" +" 複製指定登錄機碼的內容到另一個位置。\n" +" 預設情況下，這個操作只會複製登錄值。\n" +" 使用 [/s] 來遞迴複製所有子機碼和值。\n" +"\n" +" <機碼1>, <機碼2>\n" +" 指定登錄機碼的來源 (<機碼1>) 和目標 (<機碼2>) 資料。\n" +" 如果 <機碼2> 不存在，系統將會建立它。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /s\n" +" 從 <機碼1> 複製所有子機碼和值到 <機碼2>。\n" +"\n" +" /f\n" +" 覆寫 <機碼2> 內所有的登錄資料而不需確認提示。\n" +" 這個選項不會修改只在 <機碼2> 存在的子機碼和值。\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -15683,6 +15515,41 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <機碼> [/v 值名稱 | /ve | /va] [/f]\n" +"\n" +" 刪除一個登錄機碼 (所有子機碼和值)，\n" +" 或從給定的登錄機碼刪除一個或多個值。\n" +"\n" +" <機碼>\n" +" 要刪除的登錄機碼。如果指定了 [/v]、[/ve] 或 [/va]，\n" +" 則可刪除登錄機碼內的一個或多個值。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要刪除的登錄值的名稱。\n" +"\n" +" /ve\n" +" 刪除未命名的登錄值。這個選項會刪除 (預設) 的\n" +" 登錄值。\n" +"\n" +" /va\n" +" 刪除登錄機碼的所有值。\n" +"\n" +" /f\n" +" 刪除一個登錄機碼 (包括所有子機碼和值)\n" +" 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:170 msgid "" @@ -15714,6 +15581,33 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <機碼> <檔案> [/y]\n" +"\n" +" 將指定的登錄機碼 (包括所有子機碼和值)\n" +" 匯出到一個檔案。\n" +"\n" +" <機碼>\n" +" 要匯出的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" <檔案>\n" +" 要建立的登錄檔案的名稱和路徑。\n" +" 檔案必須是 .reg 的副檔名。\n" +"\n" +" /y\n" +" 覆寫 <檔案> 而不需確認提示。\n" +"\n" #: programs/reg/reg.rc:148 msgid "" @@ -15725,6 +15619,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <檔案>\n" +"\n" +" 從給定的檔案匯入機碼、值和資料到註冊表。\n" +"\n" +" <檔案>\n" +" 要匯入的登錄檔案的名稱和路徑。\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -15760,6 +15661,37 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <機碼> [/v 值名稱 | /ve] [/s]\n" +"\n" +" 查詢指定的登錄機碼，並列出該機碼中的所有即時子機碼、值和資料。\n" +" 使用 [/s] 來遞迴查詢每個子機碼。\n" +"\n" +" <機碼>\n" +" 要查詢的登錄機碼。\n" +"\n" +" 格式: ROOT\\Subkey\n" +"\n" +" ROOT: 預先定義的登錄機碼。這必須是下列的其中一個:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Subkey: 在所選取 ROOT 機碼下的登錄機碼的完整路徑。\n" +"\n" +" /v <值名稱>\n" +" 要查詢的登錄值的名稱。如果未指定 [/v] 或 [/ve]，\n" +" 則會列出 <機碼> 下所有的值。\n" +"\n" +" /ve\n" +" 查詢未命名的登錄值。這個選項會查詢 (預設) 的\n" +" 登錄值。\n" +"\n" +" /s\n" +" 列出 <機碼> 及其子機碼的所有登錄項目。\n" +"\n" #: programs/reg/reg.rc:180 msgid "" @@ -15770,122 +15702,98 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" +" /reg:32\n" +" 使用 32 位元登錄檢視來存取機碼。\n" +"\n" +" /reg:64\n" +" 使用 64 位元登錄檢視來存取機碼。\n" +"\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的登錄機碼\n" #: programs/reg/reg.rc:119 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法存取遠端機器\n" #: programs/reg/reg.rc:172 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid system key\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "reg: 無效的系統金鑰\n" #: programs/reg/reg.rc:140 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "reg: Invalid option [%1]. " -msgstr "錯誤：無效的選項 %c。\n" +msgstr "reg: 無效的選項 [%1]。 " #: programs/reg/reg.rc:122 msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的數字值\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的十六進制值\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" +msgstr "reg: 選項 [/d] 後必須接著一個有效的字串\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: 未處理的登錄資料類型 [/t 0x%1!x!, /d %2]\n" #: programs/reg/reg.rc:121 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "不受支援的型態。\n" +msgstr "reg: 不支援的登錄資料類型 [%1]\n" #: programs/reg/reg.rc:125 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "登錄值 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:118 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "錯誤：無效的命令列參數\n" +msgstr "reg: 無效的命令列參數\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: 來源和目標機碼不可以相同\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "目標機碼內的值 '%1\\%2' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:133 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確定要刪除登錄值 '%1' 嗎?" #: programs/reg/reg.rc:134 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "您確認要刪除這個數值 %s 嗎？" +msgstr "您確定要刪除 '%1' 下的所有登錄值嗎?" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "確定要刪除 %1？" +msgstr "您確定要刪除登錄機碼 '%1' 嗎?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法刪除所有在 '%1' 下的登錄值\n" #: programs/reg/reg.rc:173 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "檔案已經存在。您要取代嗎？" +msgstr "檔案 '%1' 已經存在。您要覆寫它嗎?" #: programs/reg/reg.rc:151 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/reg/reg.rc:175 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "reg: Unable to import the registry key '%1'\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "reg: 無法匯入登錄機碼 '%1'\n" #: programs/reg/reg.rc:150 -#, fuzzy -#| msgid "No command was specified." msgid "reg: The file '%1' was not found.\n" -msgstr "沒有任何命令被指定。" +msgstr "reg: 無法找到檔案 '%1'。\n" #: programs/reg/reg.rc:143 programs/regedit/regedit.rc:240 msgid "(value not set)" @@ -15893,7 +15801,7 @@ msgstr "(沒有設值)" #: programs/reg/reg.rc:138 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "搜尋完成。相符項目的數目: %1!d!\n" #: programs/regedit/regedit.rc:34 msgid "&Registry" @@ -15901,16 +15809,16 @@ msgstr "註冊表(&R)" #: programs/regedit/regedit.rc:36 msgid "&Import Registry File..." -msgstr "匯入註冊表檔案(&I)..." +msgstr "匯入登錄檔案(&I)..." #: programs/regedit/regedit.rc:37 msgid "&Export Registry File..." -msgstr "匯出註冊表檔案(&E)..." +msgstr "匯出登錄檔案(&E)..." #: programs/regedit/regedit.rc:47 programs/regedit/regedit.rc:99 #: programs/regedit/regedit.rc:121 msgid "&Key" -msgstr "索引鍵(&K)" +msgstr "機碼(&K)" #: programs/regedit/regedit.rc:49 programs/regedit/regedit.rc:101 #: programs/regedit/regedit.rc:123 @@ -15920,12 +15828,12 @@ msgstr "字串值(&S)" #: programs/regedit/regedit.rc:50 programs/regedit/regedit.rc:102 #: programs/regedit/regedit.rc:124 msgid "&Binary Value" -msgstr "二進位值(&B)" +msgstr "二進制值(&B)" #: programs/regedit/regedit.rc:51 programs/regedit/regedit.rc:103 #: programs/regedit/regedit.rc:125 msgid "&DWORD Value" -msgstr "雙字組值(&D)" +msgstr "DWORD 值(&D)" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:104 #: programs/regedit/regedit.rc:126 @@ -15944,7 +15852,7 @@ msgstr "重新命名(&R)\tF2" #: programs/regedit/regedit.rc:59 programs/regedit/regedit.rc:114 msgid "&Copy Key Name" -msgstr "複製索引鍵名稱(&C)" +msgstr "複製機碼名稱(&C)" #: programs/regedit/regedit.rc:61 programs/regedit/regedit.rc:107 #: programs/wordpad/wordpad.rc:53 @@ -15974,13 +15882,11 @@ msgstr "關於註冊表編輯器(&A)" #: programs/regedit/regedit.rc:89 programs/regedit/regedit.rc:96 #: programs/regedit/regedit.rc:230 msgid "Expand" -msgstr "" +msgstr "展開" #: programs/regedit/regedit.rc:134 programs/regedit/regedit.rc:233 -#, fuzzy -#| msgid "Modify Binary Data..." msgid "Modify &Binary Data..." -msgstr "修改二進位資料..." +msgstr "修改二進位資料(&B)..." #: programs/regedit/regedit.rc:267 msgid "Export registry" @@ -15988,31 +15894,31 @@ msgstr "匯出註冊表" #: programs/regedit/regedit.rc:269 msgid "S&elected branch:" -msgstr "指定分支(&E)：" +msgstr "指定分支(&E):" #: programs/regedit/regedit.rc:278 msgid "Find:" -msgstr "搜尋：" +msgstr "尋找:" #: programs/regedit/regedit.rc:280 msgid "Find in:" -msgstr "在這找：" +msgstr "在這找:" #: programs/regedit/regedit.rc:281 msgid "Keys" -msgstr "索引鍵" +msgstr "機碼" #: programs/regedit/regedit.rc:282 msgid "Value names" -msgstr "數值名稱" +msgstr "值名稱" #: programs/regedit/regedit.rc:283 msgid "Value content" -msgstr "數值內容" +msgstr "值內容" #: programs/regedit/regedit.rc:284 msgid "Whole string only" -msgstr "整詞匹配" +msgstr "字串須完全相符" #: programs/regedit/regedit.rc:291 msgid "Add Favorite" @@ -16033,20 +15939,20 @@ msgstr "編輯字串" #: programs/regedit/regedit.rc:316 programs/regedit/regedit.rc:329 #: programs/regedit/regedit.rc:345 programs/regedit/regedit.rc:358 msgid "Value name:" -msgstr "數值名稱:" +msgstr "值名稱:" #: programs/regedit/regedit.rc:318 programs/regedit/regedit.rc:331 #: programs/regedit/regedit.rc:347 programs/regedit/regedit.rc:360 msgid "Value data:" -msgstr "數值資料:" +msgstr "值資料:" #: programs/regedit/regedit.rc:326 msgid "Edit DWORD" -msgstr "編輯雙字組" +msgstr "編輯 DWORD" #: programs/regedit/regedit.rc:333 msgid "Base" -msgstr "進位制" +msgstr "Base" #: programs/regedit/regedit.rc:334 msgid "Hexadecimal" @@ -16058,7 +15964,7 @@ msgstr "十進位" #: programs/regedit/regedit.rc:342 msgid "Edit Binary" -msgstr "編輯二進位資料" +msgstr "編輯二進位" #: programs/regedit/regedit.rc:355 msgid "Edit Multi-String" @@ -16081,13 +15987,9 @@ msgid "Contains commands for accessing frequently used keys" msgstr "含有與使用常用索引鍵有關的全部指令" #: programs/regedit/regedit.rc:163 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "含有與說明資訊有關的全部指令" +msgstr "含有顯示登錄編輯程式說明及資訊的命令" #: programs/regedit/regedit.rc:164 msgid "Contains commands for creating new keys or values" @@ -16103,87 +16005,76 @@ msgstr "註冊表編輯器" #: programs/regedit/regedit.rc:221 msgid "Import Registry File" -msgstr "匯入註冊表檔案" +msgstr "匯入登錄檔案" #: programs/regedit/regedit.rc:222 msgid "Export Registry File" -msgstr "匯出註冊表檔案" +msgstr "匯出登錄檔案" #: programs/regedit/regedit.rc:223 msgid "Registry files (*.reg)" -msgstr "註冊表檔案 (*.reg)" +msgstr "登錄檔案 (*.reg)" #: programs/regedit/regedit.rc:224 msgid "Win9x/NT4 Registry files (REGEDIT4)" -msgstr "Win9x/NT4 註冊表檔案 (REGEDIT4)" +msgstr "Win9x/NT4 登錄檔案 (REGEDIT4)" #: programs/regedit/regedit.rc:241 msgid "(cannot display value)" -msgstr "(不能顯示值)" +msgstr "(無法顯示值)" #: programs/regedit/regedit.rc:242 msgid "(unknown %d)" -msgstr "(未知 %d)" +msgstr "(不明 %d)" #: programs/regedit/regedit.rc:247 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to modify the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法編輯選定的登錄值。" #: programs/regedit/regedit.rc:248 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄機碼。" #: programs/regedit/regedit.rc:249 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to create a new registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法建立新的登錄值。" #: programs/regedit/regedit.rc:250 msgid "" "Unable to rename the key '%1'.\n" "The specified key name already exists." msgstr "" +"無法重新命名機碼 '%1'。\n" +"指定的機碼名稱已經存在。" #: programs/regedit/regedit.rc:251 msgid "" "Unable to rename the value '%1'.\n" "The specified value name already exists." msgstr "" +"無法重新命名值 '%1'。\n" +"指定的值名稱已經存在。" #: programs/regedit/regedit.rc:252 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to delete the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法刪除選定的登錄機碼。" #: programs/regedit/regedit.rc:253 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry key." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄機碼。" #: programs/regedit/regedit.rc:254 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to rename the selected registry value." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法重新命名選定的登錄值" #: programs/regedit/regedit.rc:255 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "%1 所包含的機碼和值已成功新增至註冊表。" #: programs/regedit/regedit.rc:256 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "無法匯入 %1。指定的檔案不是有效的登錄檔案。" #: programs/regedit/regedit.rc:408 msgid "" @@ -16215,151 +16106,144 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" msgstr "" +"用法:\n" +" regedit [選項] [檔案名稱] [登錄機碼]\n" +"\n" +"選項:\n" +" [no option] 啟動本程式的圖形介面。\n" +" /L:system.dat 要修改的 system.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /R:user.dat 要修改的 user.dat 檔案位置。\n" +" 與任何其他切換參數相容。已略過。\n" +" /C 匯入登錄檔案的內容。\n" +" /D 刪除指定的登錄機碼。\n" +" /E 匯出指定的登錄機碼內容到檔案。\n" +" 如果沒有指定機碼，則會匯出整個註冊表。\n" +" /S 靜音模式。不會顯示訊息。\n" +" /V 以進階模式啟動圖形介面。已略過。\n" +" /? 顯示這個資訊並結束。\n" +" [檔案名稱] 要匯入的註冊表資訊檔案的位置。\n" +" 當與 [/E] 一起使用時，這個選項會指定\n" +" 註冊表資訊檔案的匯出位置。\n" +" [登錄機碼] 要修改的登錄機碼。\n" +"\n" +"使用範例:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: programs/regedit/regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" +msgstr "regedit: 無效或無法辨識的切換參數 [%1]\n" #: programs/regedit/regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "輸入 \"regedit /?\" 以取得說明。\n" #: programs/regedit/regedit.rc:411 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 未指定檔案名稱。\n" #: programs/regedit/regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: 未指定要移除的登錄機碼。\n" #: programs/regedit/regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" -msgstr "" +msgstr "regedit: 找不到檔案 '%1'。\n" #: programs/regedit/regedit.rc:414 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟檔案 '%1'。\n" #: programs/regedit/regedit.rc:415 -#, fuzzy -#| msgid "Invalid handle operation.\n" msgid "regedit: Unhandled action.\n" -msgstr "無效的控柄作業。\n" +msgstr "regedit: 未處理的操作。\n" #: programs/regedit/regedit.rc:416 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: 記憶體不足! (%1!S!, line %2!u!)\n" #: programs/regedit/regedit.rc:417 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的十六進位值。\n" #: programs/regedit/regedit.rc:418 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: 無法轉換十六進位資料。在 '%1' 遇到錯誤的值。\n" #: programs/regedit/regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: 無法辨識的逸出序列 [\\%1!c!]\n" #: programs/regedit/regedit.rc:420 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 不支援的登錄資料類型 [0x%1!x!]\n" #: programs/regedit/regedit.rc:421 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 在 '%1' 發現意外的結尾。\n" #: programs/regedit/regedit.rc:422 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line '%1' was not recognized.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 無法辨識列 '%1'。\n" #: programs/regedit/regedit.rc:423 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法從 '%1' 新增登錄值到 '%2'。\n" #: programs/regedit/regedit.rc:424 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法開啟登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:425 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "不受支援的型態。\n" +msgstr "regedit: 在 '%2' 遇到不支援的登錄資料類型 [0x%1!x!]。\n" #: programs/regedit/regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: 登錄值 '%1' 將以二進位資料匯出。\n" #: programs/regedit/regedit.rc:427 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "錯誤：無效的索引鍵名稱\n" +msgstr "regedit: 錯誤的系統金鑰 [%1]\n" #: programs/regedit/regedit.rc:428 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "錯誤：系統無法找到指定的註冊表索引鍵或值\n" +msgstr "regedit: 無法匯出 '%1'。找不到指定的登錄機碼。\n" #: programs/regedit/regedit.rc:429 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "regedit: 無法刪除登錄機碼 '%1'。\n" #: programs/regedit/regedit.rc:431 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: The line contains invalid syntax.\n" -msgstr "沒有任何命令被指定。" +msgstr "regedit: 該列有錯誤的語法。\n" #: programs/regedit/regedit.rc:187 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "結束註冊表編輯器" #: programs/regedit/regedit.rc:188 msgid "Adds keys to the favorites list" -msgstr "將索引鍵新增到我的最愛" +msgstr "將機碼新增到我的最愛" #: programs/regedit/regedit.rc:189 msgid "Removes keys from the favorites list" -msgstr "從我的最愛中刪除索引鍵" +msgstr "從我的最愛中刪除機碼" #: programs/regedit/regedit.rc:190 msgid "Shows or hides the status bar" msgstr "顯示或隱藏狀態列" #: programs/regedit/regedit.rc:191 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "改變兩個窗格之間的分隔線位置" +msgstr "變更兩個窗格之間的分隔線位置" #: programs/regedit/regedit.rc:192 msgid "Refreshes the window" @@ -16367,19 +16251,19 @@ msgstr "重新整理視窗" #: programs/regedit/regedit.rc:193 msgid "Deletes the selection" -msgstr "刪除選擇項目" +msgstr "刪除已選項目" #: programs/regedit/regedit.rc:194 msgid "Renames the selection" -msgstr "重新命名選擇項目" +msgstr "重新命名已選項目" #: programs/regedit/regedit.rc:195 msgid "Copies the name of the selected key to the clipboard" -msgstr "將索引鍵的名稱複製到剪貼簿" +msgstr "將機碼的名稱複製到剪貼簿" #: programs/regedit/regedit.rc:196 msgid "Finds a text string in a key, value or data" -msgstr "在索引鍵、值或資料中找字串" +msgstr "在機碼、值或資料中尋找字串" #: programs/regedit/regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" @@ -16391,7 +16275,7 @@ msgstr "修改值的資料" #: programs/regedit/regedit.rc:171 msgid "Adds a new key" -msgstr "新增一個新的索引鍵" +msgstr "新增一個新的機碼" #: programs/regedit/regedit.rc:172 msgid "Adds a new string value" @@ -16402,10 +16286,8 @@ msgid "Adds a new binary value" msgstr "新增一個新的二進制值" #: programs/regedit/regedit.rc:174 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "新增一個新的二進制值" +msgstr "新增一個新的 32 位元值" #: programs/regedit/regedit.rc:177 msgid "Imports a text file into the registry" @@ -16413,118 +16295,92 @@ msgstr "將純文字檔案匯入註冊表" #: programs/regedit/regedit.rc:179 msgid "Exports all or part of the registry to a text file" -msgstr "將註冊表導出到純文字檔案" +msgstr "將註冊表匯出到純文字檔案" #: programs/regedit/regedit.rc:180 msgid "Prints all or part of the registry" msgstr "列印註冊表的全部或部分" #: programs/regedit/regedit.rc:181 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "註冊表編輯器" +msgstr "開啟註冊表編輯器的說明" #: programs/regedit/regedit.rc:182 msgid "Displays program information, version number and copyright" -msgstr "顯示程式資訊、版本號及版權" +msgstr "顯示程式資訊、版本號及著作權" #: programs/regedit/regedit.rc:206 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry value '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄值 '%1'。" #: programs/regedit/regedit.rc:207 -#, fuzzy -#| msgid "Can't edit keys of this type (%u)" msgid "Unable to edit registry keys of this type (%1!u!)." -msgstr "無法編輯這類型的索引鍵 (%u)" +msgstr "無法編輯這種類型的登錄機碼 (%1!u!)。" #: programs/regedit/regedit.rc:208 -#, fuzzy -#| msgid "Value is too big (%u)" msgid "The value is too big (%1!u!)." -msgstr "數值太大 (%u)" +msgstr "登錄值太大 (%1!u!)。" #: programs/regedit/regedit.rc:209 msgid "Confirm Value Delete" -msgstr "確認刪除數值" +msgstr "確認刪除登錄值" #: programs/regedit/regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除已選取的登錄值嗎?" #: programs/regedit/regedit.rc:216 -#, fuzzy -#| msgid "Search string '%s' not found" msgid "Search complete. The string '%1' was not found." -msgstr "找不到搜尋的字串 %s" +msgstr "搜尋完成。找不到字串 '%1'。" #: programs/regedit/regedit.rc:211 msgid "Are you sure you want to delete these values?" -msgstr "您確認要刪除這些數值嗎？" +msgstr "您確認要刪除這些登錄值嗎?" #: programs/regedit/regedit.rc:214 msgid "New Key #%d" -msgstr "索引鍵 #%d" +msgstr "新機碼 #%d" #: programs/regedit/regedit.rc:215 msgid "New Value #%d" -msgstr "新索引鍵 #%d" +msgstr "新登錄值 #%d" #: programs/regedit/regedit.rc:205 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Unable to query the registry key '%1'." -msgstr "錯誤：無法加入索引鍵到遠端機器\n" +msgstr "無法查詢登錄機碼 '%1'。" #: programs/regedit/regedit.rc:170 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "修改值的資料" +msgstr "以二進位修改登錄值的資料" #: programs/regedit/regedit.rc:175 msgid "Adds a new multi-string value" -msgstr "新增一個多字串值" +msgstr "新增一個新的多字串值" #: programs/regedit/regedit.rc:198 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "匯出註冊表的所選分支到文字檔" +msgstr "匯出註冊表中已選取的分支到文字檔案" #: programs/regedit/regedit.rc:176 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "新增一個新的字串值" +msgstr "新增一個新的可擴充字串值" #: programs/regedit/regedit.rc:212 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "確認刪除數值" +msgstr "確認刪除機碼" #: programs/regedit/regedit.rc:213 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "確定要刪除 %1？" +msgstr "您確認要刪除這個登錄機碼及其所有的子機碼嗎?" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "展開或摺疊已選取的節點" #: programs/regedit/regedit.rc:231 -#, fuzzy -#| msgid "C&ollate" msgid "Collapse" -msgstr "自動分頁(&O)" +msgstr "摺疊" #: programs/regsvr32/regsvr32.rc:33 msgid "" @@ -16533,6 +16389,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL 註冊工具\n" +"\n" +"提供 DLL 註冊服務。\n" +"\n" #: programs/regsvr32/regsvr32.rc:41 msgid "" @@ -16547,85 +16407,66 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"用法:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] Dll名稱\n" +"\n" +"選項:\n" +" [/u] 取消註冊伺服器。\n" +" [/s] 靜音模式 (不會顯示訊息)。\n" +" [/i] 呼叫 DllInstall，並將選項傳給它 [cmdline]。\n" +"\t在與 [/u] 一起使用時，會以解除安裝模式呼叫 DllInstall。\n" +" [/n] 不要呼叫 DllRegisterServer。這個選項必須與 [/i] 一起使用。\n" +"\n" #: programs/regsvr32/regsvr32.rc:42 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regedit: 無效或無法辨識的切換參數 [%1]\n" +"\n" #: programs/regsvr32/regsvr32.rc:43 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "開啟 %1 失敗\n" +msgstr "regsvr32: 無法載入 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:44 msgid "regsvr32: '%1!S!' not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: '%1!S!' 尚未於 DLL '%2' 實作\n" #: programs/regsvr32/regsvr32.rc:45 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:46 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:47 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:48 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除註冊 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:49 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:50 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:51 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 無法解除安裝 DLL '%1'\n" #: programs/regsvr32/regsvr32.rc:52 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: 成功解除安裝 DLL '%1'\n" #: programs/start/start.rc:57 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with its " -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows " -#| "explorer.\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -16656,30 +16497,31 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" -"啟始一個程式，或是利用關聯該檔案字尾的程式來開啟文件。\n" -"用法：\n" +"啟動程式，或根據檔案的後綴，使用一般用於開啟該後綴的程式來開啟文件。\n" +"用法:\n" "start [選項] 程式檔案名稱 [...]\n" "start [選項] 文件檔案名稱\n" "\n" -"選項：\n" -"「標題」指定子視窗的標題。\n" -"/d 目錄在指定的目錄中啟始程式。\n" -"/b 無法為程式建立新的主控臺。\n" -"/i 以新的環境變數啟始程式。\n" -"/min 啟始程式時縮到最小。\n" -"/max 啟始程式時放到最大。\n" -"/low 在閒置優先權類別中啟始程式。\n" -"/normal 在一般優先權類別中啟始程式。\n" -"/high 在高優先權類別中啟始程式。\n" -"/realtime 在即時優先權類別中啟始程式。\n" -"/abovenormal 在正常之上優先權類別中啟始程式。\n" -"/belownormal 在正常之下優先權類別中啟始程式。\n" -"/node n 在指定的 NUMA 節點之上啟始程式。\n" -"/affinity 遮罩以指定的近似遮罩啟始程式。\n" -"/wait 等待啟始的程式直到完成，然後以它的離開代碼離開。\n" -"/unix 使用 Unix 檔名並如同 Windows 檔案總管來啟始檔案。\n" -"/ProgIDOpen 使用指定的 progID 開啟文件。\n" -"/? 顯示這份說明然後離開。\n" +"選項:\n" +"\"標題\" 指定子視窗的標題。\n" +"/d 目錄於指定的目錄開啟程式。\n" +"/b 不要為程式建立新的主控臺。\n" +"/i 使用新的環境變數來啟動程式。\n" +"/min 啟動程式時將視窗最小化。\n" +"/max 啟動程式時將視窗最大化。\n" +"/low 在 Idle 優先類別中啟動程式。\n" +"/normal 在 Normal 優先類別中啟動程式。\n" +"/high 在 High 優先類別中啟動程式。\n" +"/realtime 在 Realtime 優先類別中啟動程式。\n" +"/abovenormal 在 Abovenormal 優先類別中啟動程式。\n" +"/belownormal 在 Belownormal 優先類別中啟動程式。\n" +"/node n 以指定的 NUMA 節點啟動程式。\n" +"/affinity mask 以指定的親和性遮罩啟動程式。\n" +"/wait 啟動應用程式並等候它終止，結束時會給予結束代碼。\n" +"/unix 使用 Unix 檔案名稱，並像 Windows 檔案總管一樣開啟檔案\n" +"/exec 對指定檔案進行 Exec (在 Wine 內部使用)。\n" +"/ProgIDOpen 使用指定的 progID 來開啟檔案。\n" +"/? 顯示這個說明並結束。\n" #: programs/start/start.rc:59 msgid "" @@ -16687,12 +16529,12 @@ msgid "" "specified file.\n" "ShellExecuteEx failed" msgstr "" -"無法啟始應用程式，或是沒有與指定檔案關聯的應用程式。\n" +"無法啟動應用程式，或是沒有與指定檔案關聯的應用程式。\n" "ShellExecuteEx 失敗" #: programs/start/start.rc:61 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "無法翻譯指定的 Unix 檔名到 DOS 檔名。" +msgstr "無法翻譯指定的 Unix 檔案名稱到 DOS 檔案名稱。" #: programs/taskkill/taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" -- 2.33.0

1 0

[PATCH 01/14] mshtml: Retry with VT_NULL when removing an attribute.
by Gabriel Ivăncescu 17 Nov '21

17 Nov '21

set_event_handler fails with "attempt to set to VT_EMPTY in quirks mode" intentionally. But it shouldn't throw when removing the builtin attribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 5 ++++ dlls/mshtml/tests/documentmode.js | 40 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 96a776d..bddb0e3 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1466,6 +1466,11 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) V_VT(&var) = VT_EMPTY; hres = builtin_propput(This, func, &dp, NULL); + if(hres == E_NOTIMPL) { + /* Setting event handlers to VT_EMPTY fails in quirks mode */ + V_VT(&var) = VT_NULL; + hres = builtin_propput(This, func, &dp, NULL); + } if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d566223..c197f9b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1087,6 +1087,46 @@ sync_test("elem_attr", function() { ok(r === "cls2", "class attr = " + r); r = elem.getAttribute("className"); ok(r === "cls3", "className attr = " + r); + + var func = function() { }; + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + ok(r === (v < 8 ? func : null), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + todo_wine_if(v < 9). + ok(r === (v < 9 ? false : undefined), "removeAttribute returned " + r); + todo_wine_if(v < 9). + ok(elem.onclick === (v != 8 ? func : null), "removed onclick = " + elem.onclick); + + elem.onclick_test = func; + ok(elem.onclick_test === func, "onclick_test = " + elem.onclick_test); + r = elem.getAttribute("onclick_test"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? func.toString() : null)), "onclick_test attr = " + r); + + elem.setAttribute("onclick", "test"); + r = elem.getAttribute("onclick"); + ok(r === "test", "onclick attr after setAttribute = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute after setAttribute returned " + r); + + elem.setAttribute("onclick", "string"); + r = elem.getAttribute("onclick"); + ok(r === "string", "onclick attr after setAttribute = " + r); + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? null : "string")), "onclick attr = " + r); + elem.onclick = "test"; + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? "test" : "string"), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute returned " + r); + todo_wine_if(v >= 8). + ok(elem.onclick === null, "removed onclick = " + elem.onclick); }); sync_test("__proto__", function() { -- 2.31.1

3 30

[PATCH vkd3d v5 1/6] vkd3d-shader/hlsl: Remove trivial swizzles.
by Giovanni Mascellani 16 Nov '21

16 Nov '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_codegen.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 24b8205c..f8b977b0 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -475,6 +475,27 @@ static bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool remove_trivial_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_swizzle *swizzle; + unsigned int i; + + if (instr->type != HLSL_IR_SWIZZLE) + return false; + swizzle = hlsl_ir_swizzle(instr); + + if (instr->data_type->dimx != swizzle->val.node->data_type->dimx) + return false; + + for (i = 0; i < instr->data_type->dimx; ++i) + if (((swizzle->swizzle >> (2 * i)) & 3) != i) + return false; + + replace_node(instr, swizzle->val.node); + + return true; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { @@ -1355,6 +1376,7 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun } while (progress); while (transform_ir(ctx, fold_constants, body, NULL)); + transform_ir(ctx, remove_trivial_swizzles, body, NULL); if (ctx->profile->major_version < 4) transform_ir(ctx, lower_division, body, NULL); -- 2.33.1

3 11

[PATCH 0/6] Improvements around module handling in dbghelp
by Eric Pouech 16 Nov '21

16 Nov '21

The following series implements: - a couple of bug fixes related to module management - a change in collision detection while loading modules: + logic based on module base address (rather than name) + allow loading several modules with same module names (either multiple times the same module, or different modules with same module name) A+ --- Eric Pouech (6): dbghelp: fix module name construction dbghelp: always search current directory when loading PE modules dbghelp: allow 32bit dbghelp to handle 64 addresses dbghelp: move debug info loading out of image backends into SymLoadModuleEx() dbghelp: detect collision by looking at module's base address in SymLoadModuleEx() dbghelp: improve collision handling in SymLoadModuleEx() dlls/dbghelp/elf_module.c | 7 +- dlls/dbghelp/macho_module.c | 4 - dlls/dbghelp/module.c | 169 +++++++++++++++++++----------------- dlls/dbghelp/pe_module.c | 12 +-- 4 files changed, 95 insertions(+), 97 deletions(-)

1 6

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-devel