- 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

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