November 2011 - Wine-commits

André Hentschel : apphelp: Add stub for ApphelpCheckInstallShieldPackage.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 8cfbcaf1be59237eae70cb95c0c23d160e975b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cfbcaf1be59237eae70cb95c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 4 17:55:41 2011 +0100 apphelp: Add stub for ApphelpCheckInstallShieldPackage. --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index bed3f5c..615f8af 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -39,3 +39,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path ) +{ + FIXME("stub: %p %s\n", ptr, debugstr_w(path)); + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index a6ecf7f..901537f 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -1,6 +1,6 @@ @ stub AllowPermLayer @ stub ApphelpCheckExe -@ stub ApphelpCheckInstallShieldPackage +@ stdcall ApphelpCheckInstallShieldPackage(ptr wstr) @ stub ApphelpCheckMsiPackage @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx

1 0

André Hentschel : apphelp: Add stub for SdbCreateDatabase.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 090649968706358796e00af4588dd1f0a35adbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=090649968706358796e00af45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 4 17:57:47 2011 +0100 apphelp: Add stub for SdbCreateDatabase. --- dlls/apphelp/apphelp.c | 16 ++++++++++++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 615f8af..20ff375 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(apphelp); +/* FIXME: don't know where to place that enum */ +typedef enum _PATH_TYPE { + DOS_PATH, + NT_PATH +} PATH_TYPE; + +/* FIXME: don't know where to place that typedef */ +typedef HANDLE PDB; + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); @@ -45,3 +54,10 @@ BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path ) FIXME("stub: %p %s\n", ptr, debugstr_w(path)); return TRUE; } + +PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) +{ + FIXME("stub: %s %u\n", debugstr_w(path), type); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 901537f..005e39d 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -26,7 +26,7 @@ @ stub SdbCloseDatabaseWrite @ stub SdbCloseLocalDatabase @ stub SdbCommitIndexes -@ stub SdbCreateDatabase +@ stdcall SdbCreateDatabase(wstr long) @ stub SdbCreateHelpCenterURL @ stub SdbCreateMsiTransformFile @ stub SdbDeclareIndex

1 0

André Hentschel : apphelp: Add stub for ApphelpCheckMsiPackage.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: ec56eee03d0e4019643e5fc2f1b1b7b92d07a401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec56eee03d0e4019643e5fc2f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 4 17:57:55 2011 +0100 apphelp: Add stub for ApphelpCheckMsiPackage. --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 20ff375..4a3cd96 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -55,6 +55,12 @@ BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path ) return TRUE; } +BOOL WINAPI ApphelpCheckMsiPackage( void* ptr, LPCWSTR path ) +{ + FIXME("stub: %p %s\n", ptr, debugstr_w(path)); + return TRUE; +} + PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) { FIXME("stub: %s %u\n", debugstr_w(path), type); diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 005e39d..e8ebccb 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -1,7 +1,7 @@ @ stub AllowPermLayer @ stub ApphelpCheckExe @ stdcall ApphelpCheckInstallShieldPackage(ptr wstr) -@ stub ApphelpCheckMsiPackage +@ stdcall ApphelpCheckMsiPackage(ptr wstr) @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx @ stub ApphelpCheckShellObject

1 0

Alexandre Julliard : configure: Remove some no longer used variables.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 7a3c56a941f2e236996cb849eb7cacc28ff8162e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3c56a941f2e236996cb849e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 17:12:38 2011 +0100 configure: Remove some no longer used variables. --- configure | 6 ------ configure.ac | 6 ------ 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 9251e6f..9223d27 100755 --- a/configure +++ b/configure @@ -4043,8 +4043,6 @@ case $host in then CC="$CC -m64" CXX="$CXX -m64" - LD="${LD:-ld} -arch x86_64" - AS="${AS:-as} -arch x86_64" host_cpu="x86_64" notice_platform="64-bit " TARGETFLAGS="-m64" @@ -4052,8 +4050,6 @@ case $host in else CC="$CC -m32" CXX="$CXX -m32" - LD="${LD:-ld} -arch i386" - AS="${AS:-as} -arch i386" host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="-m32" @@ -4090,8 +4086,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LD="${LD:-ld} -m elf_i386" - AS="${AS:-as} --32" host_cpu="i386" notice_platform="32-bit " TARGETFLAGS="-m32" diff --git a/configure.ac b/configure.ac index 1340757..362c2bf 100644 --- a/configure.ac +++ b/configure.ac @@ -132,16 +132,12 @@ case $host in then CC="$CC -m64" CXX="$CXX -m64" - LD="${LD:-ld} -arch x86_64" - AS="${AS:-as} -arch x86_64" host_cpu="x86_64" notice_platform="64-bit " AC_SUBST(TARGETFLAGS,"-m64") else CC="$CC -m32" CXX="$CXX -m32" - LD="${LD:-ld} -arch i386" - AS="${AS:-as} -arch i386" host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32") @@ -157,8 +153,6 @@ case $host in AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]), [AC_MSG_RESULT([no]) AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])]) - LD="${LD:-ld} -m elf_i386" - AS="${AS:-as} --32" host_cpu="i386" notice_platform="32-bit " AC_SUBST(TARGETFLAGS,"-m32")

1 0

Henri Verbeet : comctl32: Avoid using __FUNCTION__ in ranges_check.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: b99a2a9ff87fc158a462ae44e4248d12117256f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99a2a9ff87fc158a462ae44e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:57 2011 +0100 comctl32: Avoid using __FUNCTION__ in ranges_check. --- dlls/comctl32/listview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cc997c1..b0c4646 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3053,14 +3053,14 @@ static INT CALLBACK ranges_cmp(LPVOID range1, LPVOID range2, LPARAM flags) return cmp; } -#define ranges_check(ranges, desc) if (TRACE_ON(listview)) ranges_assert(ranges, desc, __FUNCTION__, __LINE__) +#define ranges_check(ranges, desc) if (TRACE_ON(listview)) ranges_assert(ranges, desc, __FILE__, __LINE__) -static void ranges_assert(RANGES ranges, LPCSTR desc, const char *func, int line) +static void ranges_assert(RANGES ranges, LPCSTR desc, const char *file, int line) { INT i; RANGE *prev, *curr; - TRACE("*** Checking %s:%d:%s ***\n", func, line, desc); + TRACE("*** Checking %s:%d:%s ***\n", file, line, desc); assert (ranges); assert (DPA_GetPtrCount(ranges->hdpa) >= 0); ranges_dump(ranges);

1 0

Henri Verbeet : wined3d: Make the surface parameter to upload_palette() const.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 12268879a2b36cd1eabeccffffe9d5683529e784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12268879a2b36cd1eabeccfff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:58 2011 +0100 wined3d: Make the surface parameter to upload_palette() const. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d32b5f1..4fabeea 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6932,7 +6932,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, } /* Context activation is done by the caller. */ -static void upload_palette(struct wined3d_surface *surface, struct wined3d_context *context) +static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context) { BYTE table[256][4]; struct wined3d_device *device = surface->resource.device;

1 0

Henri Verbeet : wined3d: Make the surface parameter to blit_shader. set_shader() const.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: a64271c07efeecd4ed9db56c3bbfe3ddfac7f608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64271c07efeecd4ed9db56c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:59 2011 +0100 wined3d: Make the surface parameter to blit_shader.set_shader() const. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4fabeea..a4f2e68 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7121,7 +7121,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ } /* Context activation is done by the caller. */ -static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { GLenum shader; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d70e22d..8def5b5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6260,7 +6260,7 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co } /* Context activation is done by the caller. */ -static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); @@ -6409,7 +6409,7 @@ static void cpu_blit_free(struct wined3d_device *device) } /* Context activation is done by the caller. */ -static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface) +static HRESULT cpu_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b560f5..b4bc30d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1201,7 +1201,7 @@ struct blit_shader { HRESULT (*alloc_private)(struct wined3d_device *device); void (*free_private)(struct wined3d_device *device); - HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, struct wined3d_surface *surface); + HRESULT (*set_shader)(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface); void (*unset_shader)(const struct wined3d_gl_info *gl_info); BOOL (*blit_supported)(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, const struct wined3d_format *src_format,

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 9b7178e63352aee5e23c6e2e1d09a1866f64e156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7178e63352aee5e23c6e2e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 7 00:12:09 2011 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/dsurface.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 555ad23..3060379 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1745,12 +1745,12 @@ static void AttachmentTest(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 16; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0xF800; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x07E0; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x001F; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; /* D3DFMT_R5G6B5 */ + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xF800; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07E0; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001F; memset(&ddsd2, 0, sizeof(ddsd2)); ddsd2.dwSize = sizeof(ddsd2); @@ -1758,10 +1758,10 @@ static void AttachmentTest(void) ddsd2.dwWidth = ddsd.dwWidth; ddsd2.dwHeight = ddsd.dwHeight; ddsd2.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(ddsd2).ddpfPixelFormat.dwSize = sizeof(U4(ddsd2).ddpfPixelFormat); - U4(ddsd2).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; - U1(U4(ddsd2).ddpfPixelFormat).dwZBufferBitDepth = 16; - U3(U4(ddsd2).ddpfPixelFormat).dwZBitMask = 0x0000FFFF; + ddsd2.ddpfPixelFormat.dwSize = sizeof(ddsd2.ddpfPixelFormat); + ddsd2.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(ddsd2.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(ddsd2.ddpfPixelFormat).dwZBitMask = 0x0000FFFF; hr = IDirectDraw_CreateSurface(lpDD, (DDSURFACEDESC *)&ddsd, &surface1, NULL); ok(hr == DD_OK, "CreateSurface returned %08x\n", hr);

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: f61fb839280a82a8264699f79ffbfe9e4b52d683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61fb839280a82a8264699f79… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 6 21:48:26 2011 +0900 po: Updated Korean translation. --- po/ko.po | 74 +++++++++++++++++++++----------------------------------------- 1 files changed, 25 insertions(+), 49 deletions(-) diff --git a/po/ko.po b/po/ko.po index 4ad63f2..c5c5475 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6838,9 +6838,8 @@ msgid "Trash" msgstr "휴지통" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld 바이트" +msgstr "%d 바이트" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -7768,9 +7767,8 @@ msgstr "" "\n" #: attrib.rc:28 -#, fuzzy msgid "%1: File Not Found\n" -msgstr "%s :파일을 찾을 수 없습니다\n" +msgstr "%1 :파일을 찾을 수 없습니다\n" #: attrib.rc:47 msgid "" @@ -8690,14 +8688,12 @@ msgstr "" "'서비스'는 정지할 서비스의 이름입니다.\n" #: net.rc:30 -#, fuzzy msgid "Stopping dependent service: %1\n" -msgstr "종속된 서비스 정지중: %s\n" +msgstr "종속된 서비스 정지중: %1\n" #: net.rc:31 -#, fuzzy msgid "Could not stop service %1\n" -msgstr "%s 서비스를 정지할 수 없습니다\n" +msgstr "%1 서비스를 정지할 수 없음\n" #: net.rc:32 msgid "Could not get handle to service control manager.\n" @@ -8708,34 +8704,28 @@ msgid "Could not get handle to service.\n" msgstr "서비스 핸들을 얻을 수 없습니다.\n" #: net.rc:34 -#, fuzzy msgid "The %1 service is starting.\n" -msgstr "%s 서비스는 시작중.\n" +msgstr "%1 서비스는 시작중입니다.\n" #: net.rc:35 -#, fuzzy msgid "The %1 service was started successfully.\n" -msgstr "%s 서비스 시작 성공.\n" +msgstr "%1 서비스 시작 성공했습니다.\n" #: net.rc:36 -#, fuzzy msgid "The %1 service failed to start.\n" -msgstr "%s 서비스 시작 실패.\n" +msgstr "%1 서비스 시작 실패했습니다.\n" #: net.rc:37 -#, fuzzy msgid "The %1 service is stopping.\n" -msgstr "%s 서비스 정지.\n" +msgstr "%1 서비스는 정지하는 중입니다.\n" #: net.rc:38 -#, fuzzy msgid "The %1 service was stopped successfully.\n" -msgstr "%s 서비스 정지 성공.\n" +msgstr "%1 서비스 정지 성공했습니다.\n" #: net.rc:39 -#, fuzzy msgid "The %1 service failed to stop.\n" -msgstr "%s 서비스 정지 실패.\n" +msgstr "%1 서비스 정지 실패했습니다.\n" #: net.rc:41 msgid "There are no entries in the list.\n" @@ -8752,9 +8742,8 @@ msgstr "" "---------------------------------------------------------------\n" #: net.rc:43 -#, fuzzy msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%s %s %s 열린 리소스: %lu\n" +msgstr "%1 %2 %3 열린 리소스: %4!u!\n" #: net.rc:44 notepad.rc:122 oleview.rc:159 oleview.rc:172 wineconsole.rc:131 #: winefile.rc:131 winefile.rc:154 winefile.rc:184 winemine.rc:68 @@ -8901,9 +8890,8 @@ msgid "&Bottom:" msgstr "아래(&B):" #: notepad.rc:131 -#, fuzzy msgid "Encoding:" -msgstr "인코딩(&E)" +msgstr "인코딩:" #: notepad.rc:66 msgid "Page &p" @@ -8931,7 +8919,7 @@ msgstr "제목 없음" #: notepad.rc:76 msgid "Text files (*.txt)" -msgstr "텍스트 문서 (*.txt)" +msgstr "텍스트 파일 (*.txt)" #: notepad.rc:79 msgid "" @@ -11037,9 +11025,8 @@ msgid "Screen buffer size must be greater or equal to the window's one" msgstr "스크린 버퍼 크기는 반드시 창보다 같거나 커야합니다." #: wineconsole.rc:34 -#, fuzzy msgid "Each character is %1!u! pixels wide on %2!u! pixels high" -msgstr "각각의 글자는 %ld 픽셀 너비에 %ld 픽셀 높이를 가집니다" +msgstr "각각의 글자는 %1!u! 픽셀 너비에 %2!u! 픽셀 높이를 가집니다" #: wineconsole.rc:35 msgid "This is a test" @@ -11349,9 +11336,8 @@ msgid "Index/Inode" msgstr "인덱스/아이노드" #: winefile.rc:120 -#, fuzzy msgid "%1 of %2 free" -msgstr "%s of %s 사용가능" +msgstr "%1 의 %2 사용가능" #: winemine.rc:34 msgid "&Game" @@ -11422,9 +11408,8 @@ msgid "Rows" msgstr "가로줄" #: winemine.rc:87 -#, fuzzy msgid "Columns" -msgstr "세로줄(&C)" +msgstr "세로줄" #: winemine.rc:88 msgid "Mines" @@ -11882,59 +11867,50 @@ msgid "Invalid number of parameters - Use xcopy /? for help\n" msgstr "올바르지 않은 매개변수의 갯수 - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" -msgstr "올바르지 않은 매개변수 '%s' - xcopy /?로 도움말을 보시오\n" +msgstr "올바르지 않은 매개변수 '%1' - xcopy /?로 도움말을 보시오\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "<enter> 를 누르면 복사가 시작될 것입니다\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d 파일이 복사될 것입니다\n" +msgstr "%1!d! 파일이 복사될 것입니다\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d 파일이 복사되었습니다\n" +msgstr "%1!d! 파일이 복사되었습니다\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"'%s'이 복사할 파일이나 디렉토리?\n" +"'%1'이 복사할 파일이나 디렉토리\n" "입니까?\n" "(F - 파일, D - 디렉토리)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s? (예|아니오)\n" +msgstr "%1? (예|아니오)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "%s를 덮어쓰겠습니까? (예|아니오|모두)\n" +msgstr "%1를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "r/c %d로 '%s'를 '%s'로 복사 실패 \n" +msgstr "r/c %3!d!로 '%1'를 '%2'로 복사 실패 \n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "'%s' 열기 실패\n" +msgstr "'%1' 열기 실패\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "'%s를 읽지 못했습니다'\n" +msgstr "'%1를 읽지 못했습니다'\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Alexandre Julliard : gdi32/tests: Avoid some array bounds warnings.
by Alexandre Julliard 07 Nov '11

07 Nov '11

Module: wine Branch: master Commit: 6098a0457bff4c68170931f161007dc51004e68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6098a0457bff4c68170931f16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:43:46 2011 +0100 gdi32/tests: Avoid some array bounds warnings. --- dlls/gdi32/tests/pen.c | 74 +++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6098a0457bff4c6817093…

1 0