Ros-diffs

ros-diffs@reactos.org

81390 discussions

[khornicek] 42991: - update wined3d to Wine 1.1.29 - reapply our hack for releasing fake GL context, fixes bug 4836 See issue #4836 for more details.
by khornicek＠svn.reactos.org 04 Sep '09

04 Sep '09

Author: khornicek Date: Fri Sep 4 11:38:44 2009 New Revision: 42991 URL: http://svn.reactos.org/svn/reactos?rev=42991&view=rev Log: - update wined3d to Wine 1.1.29 - reapply our hack for releasing fake GL context, fixes bug 4836 See issue #4836 for more details. Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/directx.c Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c [iso-8859-1] Fri Sep 4 11:38:44 2009 @@ -2994,6 +2994,8 @@ static GLuint create_arb_blt_vertex_program(const struct wined3d_gl_info *gl_info) { GLuint program_id = 0; + GLint pos; + const char *blt_vprogram = "!!ARBvp1.0\n" "PARAM c[1] = { { 1, 0.5 } };\n" @@ -3004,14 +3006,24 @@ GL_EXTCALL(glGenProgramsARB(1, &program_id)); GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, program_id)); - GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(blt_vprogram), blt_vprogram)); - - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(blt_vprogram), blt_vprogram)); + checkGLcall("glProgramStringARB()"); + + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Vertex program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } return program_id; } @@ -3020,6 +3032,8 @@ static GLuint create_arb_blt_fragment_program(const struct wined3d_gl_info *gl_info, enum tex_types tex_type) { GLuint program_id = 0; + GLint pos; + static const char * const blt_fprograms[tex_type_count] = { /* tex_1d */ @@ -3054,13 +3068,23 @@ GL_EXTCALL(glGenProgramsARB(1, &program_id)); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, program_id)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(blt_fprograms[tex_type]), blt_fprograms[tex_type])); - - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(blt_fprograms[tex_type]), blt_fprograms[tex_type])); + checkGLcall("glProgramStringARB()"); + + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); + } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); } return program_id; @@ -3214,6 +3238,7 @@ BOOL dcl_tmp = args->super.srgb_correction, dcl_td = FALSE; BOOL want_nv_prog = FALSE; struct arb_pshader_private *shader_priv = This->backend_priv; + GLint errPos; DWORD map; char srgbtmp[4][4]; @@ -3497,13 +3522,22 @@ /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, buffer->bsize, buffer->buffer)); - - if (glGetError() == GL_INVALID_OPERATION) { - GLint errPos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + checkGLcall("glProgramStringARB()"); + + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + if (errPos != -1) + { FIXME("HW PixelShader Error at position %d: %s\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); retval = 0; + } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); } /* Load immediate constants */ @@ -3781,6 +3815,7 @@ DWORD next_local, *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; unsigned int i; + GLint errPos; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -3890,14 +3925,23 @@ /* Create the program and check for errors */ GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, buffer->bsize, buffer->buffer)); - - if (glGetError() == GL_INVALID_OPERATION) { - GLint errPos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + checkGLcall("glProgramStringARB()"); + + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errPos); + if (errPos != -1) + { FIXME("HW VertexShader Error at position %d: %s\n", errPos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); ret = -1; - } else { + } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + /* Load immediate constants */ if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { @@ -5486,6 +5530,7 @@ BOOL tempreg_used = FALSE, tfactor_used = FALSE; BOOL op_equal; const char *final_combiner_src = "ret"; + GLint pos; /* Find out which textures are read */ for(stage = 0; stage < MAX_TEXTURES; stage++) { @@ -5719,14 +5764,25 @@ /* Generate the shader */ GL_EXTCALL(glGenProgramsARB(1, &ret)); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, ret)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(buffer.buffer), buffer.buffer)); - - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(buffer.buffer), buffer.buffer)); + checkGLcall("glProgramStringARB()"); + + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } + shader_buffer_free(&buffer); return ret; } @@ -6305,6 +6361,7 @@ struct wined3d_shader_buffer buffer; char luminance_component; struct arbfp_blit_priv *priv = device->blit_priv; + GLint pos; /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -6407,14 +6464,25 @@ shader_addline(&buffer, "END\n"); ENTER_GL(); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(buffer.buffer), buffer.buffer)); - - if (glGetError() == GL_INVALID_OPERATION) { - GLint pos; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, + strlen(buffer.buffer), buffer.buffer)); + checkGLcall("glProgramStringARB()"); + + glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); + if (pos != -1) + { FIXME("Fragment program error at position %d: %s\n", pos, debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } + else + { + GLint native; + + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); + checkGLcall("glGetProgramivARB()"); + if (!native) WARN("Program exceeds native resource limits.\n"); + } + shader_buffer_free(&buffer); LEAVE_GL(); Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Fri Sep 4 11:38:44 2009 @@ -235,13 +235,13 @@ { ERR_(d3d_caps)("Failed to disable fake GL context.\n"); } - +#if 0 if (!pwglDeleteContext(ctx->gl_ctx)) { DWORD err = GetLastError(); ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); } - +#endif ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); } @@ -1481,6 +1481,7 @@ TRACE_(d3d_caps)("GL_RENDERER: %s.\n", debugstr_a(gl_string)); if (!gl_string) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_RENDERER.\n"); return FALSE; } @@ -1489,6 +1490,7 @@ gl_renderer = HeapAlloc(GetProcessHeap(), 0, len); if (!gl_renderer) { + LEAVE_GL(); ERR_(d3d_caps)("Failed to allocate gl_renderer memory.\n"); return FALSE; } @@ -1498,6 +1500,7 @@ TRACE_(d3d_caps)("GL_VENDOR: %s.\n", debugstr_a(gl_string)); if (!gl_string) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_VENDOR.\n"); HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; @@ -1510,6 +1513,7 @@ TRACE_(d3d_caps)("GL_VERSION: %s.\n", debugstr_a(gl_string)); if (!gl_string) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_VERSION.\n"); HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; @@ -1560,10 +1564,13 @@ GL_Extensions = (const char *)glGetString(GL_EXTENSIONS); if (!GL_Extensions) { + LEAVE_GL(); ERR_(d3d_caps)("Received a NULL GL_EXTENSIONS.\n"); HeapFree(GetProcessHeap(), 0, gl_renderer); return FALSE; } + + LEAVE_GL(); TRACE_(d3d_caps)("GL_Extensions reported:\n"); @@ -1595,8 +1602,6 @@ } } } - - LEAVE_GL(); /* Now work out what GL support this card really has */ #define USE_GL_FUNC(type, pfn, ext, replace) \

1 0

[dchapyshev] 42990: - Handle memory allocation failure. Found by amine48rz
by dchapyshev＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: dchapyshev Date: Thu Sep 3 17:30:38 2009 New Revision: 42990 URL: http://svn.reactos.org/svn/reactos?rev=42990&view=rev Log: - Handle memory allocation failure. Found by amine48rz Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/mouse.c [iso-8859-1] Thu Sep 3 17:30:38 2009 @@ -40,6 +40,12 @@ pdriver->driver_desc.dev_protocol = 2; // Protocol Info. pdriver->driver_ext = usb_alloc_mem(NonPagedPool, sizeof(MOUSE_DRVR_EXTENSION)); + if (!pdriver->driver_ext) + { + usb_dbg_print(DBGLVL_MAXIMUM, ("mouse_driver_init(): memory allocation failed!\n")); + return FALSE; + } + pdriver->driver_ext_size = sizeof(MOUSE_DRVR_EXTENSION); RtlZeroMemory(pdriver->driver_ext, sizeof(MOUSE_DRVR_EXTENSION));

1 0

[dchapyshev] 42989: - Sync gdiplus with Wine 1.1.29
by dchapyshev＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: dchapyshev Date: Thu Sep 3 17:07:25 2009 New Revision: 42989 URL: http://svn.reactos.org/svn/reactos?rev=42989&view=rev Log: - Sync gdiplus with Wine 1.1.29 Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/include/psdk/gdiplusflat.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageatt… Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h…

1 0

[dreimer] 42988: Bug 4795: Japanese translation for paint by pcds90net, Tomoya Kitagawa Bug 4828: updates for slovak and translation for rapps by Mario Kacmar
by dreimer＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: dreimer Date: Thu Sep 3 17:05:10 2009 New Revision: 42988 URL: http://svn.reactos.org/svn/reactos?rev=42988&view=rev Log: Bug 4795: Japanese translation for paint by pcds90net, Tomoya Kitagawa Bug 4828: updates for slovak and translation for rapps by Mario Kacmar Added: trunk/reactos/base/applications/paint/lang/ja-JP.rc (with props) trunk/reactos/base/applications/rapps/lang/sk-SK.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/paint/rsrc.rc trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Thu Sep 3 17:05:10 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 30-01-2008 - * LAST CHANGE: 27-01-2009 + * LAST CHANGE: 29-08-2009 * --------------------------------------- * TODO: * 1. treba usporiada jednotky pod¾a abecedy @@ -522,24 +522,24 @@ // TYPES OF CURRENCIES STRINGTABLE DISCARDABLE BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakúzsky iling" IDS_CURRENCY_BELGIAN_FRANC "Belgický frank" IDS_CURRENCY_CYPRIOT_POUND "Cyperská libra" IDS_CURRENCY_CZECH_KORUNA "Èeská koruna" + IDS_CURRENCY_DEUTSCHE_MARK "Nemecká marka" + IDS_CURRENCY_DUTCH_GUILDER "Holandský gulden" IDS_CURRENCY_EURO "Euro" IDS_CURRENCY_FINNISH_MARKKA "Finská marka" IDS_CURRENCY_FRENCH_FRANC "Francúzsky frank" IDS_CURRENCY_GREEK_DRACHMA "Grécka drachma" - IDS_CURRENCY_DUTCH_GUILDER "Holandský gulden" IDS_CURRENCY_IRISH_POUND "Irish pound" + IDS_CURRENCY_ITALIAN_LIRA "Italian lira" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_DEUTSCHE_MARK "Nemecká marka" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" - IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakúzsky iling" IDS_CURRENCY_SLOVAK_KORUNA "Slovenská koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský toliar" IDS_CURRENCY_SPANISH_PESETA "panielska peseta" - IDS_CURRENCY_ITALIAN_LIRA "Talianska líra" END // TYPES OF ENERGIES @@ -571,10 +571,14 @@ IDS_LENGTH_CHOU "Chou" IDS_LENGTH_CHR "Chr" IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "Siahy" + IDS_LENGTH_FATHOMS_HUNGARY "Siahy (Maïarsko)" + IDS_LENGTH_FEET "Stopy" IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_GAN "Gan" IDS_LENGTH_HANDS "Hands" IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "Palce" IDS_LENGTH_JA "Ja" IDS_LENGTH_JEONG "Jeong" IDS_LENGTH_KABIET "Kabiet" @@ -582,6 +586,7 @@ IDS_LENGTH_KEUB "Keub" IDS_LENGTH_KILOMETERS "Kilometre" IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "Svetelné roky" IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_METERS "Metre" IDS_LENGTH_MICRONS "Mikróny" @@ -589,7 +594,6 @@ IDS_LENGTH_MILLIMETERS "Milimetre" IDS_LENGTH_NAUTICAL_MILES "Námorné míle" IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_INCHES "Palce" IDS_LENGTH_PARSECS "Parsecy" IDS_LENGTH_PICAS "Picas" IDS_LENGTH_RI_JAPAN "Ri (Japonsko)" @@ -598,12 +602,8 @@ IDS_LENGTH_SAWK "Sawk" IDS_LENGTH_SEN "Sen" IDS_LENGTH_SHAKU "Shaku" - IDS_LENGTH_FATHOMS "Siahy" - IDS_LENGTH_FATHOMS_HUNGARY "Siahy (Maïarsko)" IDS_LENGTH_SPAN "Span" - IDS_LENGTH_FEET "Stopy" IDS_LENGTH_SUN "Sun" - IDS_LENGTH_LIGHT_YEARS "Svetelné roky" IDS_LENGTH_TSUEN "Tsuen" IDS_LENGTH_VA "Va" IDS_LENGTH_YARDS "Yardy" @@ -616,8 +616,8 @@ BEGIN IDS_POWER_BTUS_PER_MINUTE "Britské termálne jednotky za minútu" IDS_POWER_FPS_PER_MINUTE "Foot-Pounds za minútu" + IDS_POWER_HORSEPOWER "Koòské sily" IDS_POWER_KILOWATTS "Kilowatty" - IDS_POWER_HORSEPOWER "Koòské sily" IDS_POWER_MEGAWATTS "Megawatty" IDS_POWER_WATTS "Watty" END @@ -629,9 +629,9 @@ IDS_PRESSURE_BARS "Bary" IDS_PRESSURE_HECTOPASCALS "Hektopascals" IDS_PRESSURE_KILOPASCALS "Kilopascals" - IDS_PRESSURE_PSI "Libry na tvorcový palec" IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PSI "Libry na tvorcový palec" END // TYPES OF TEMPERATURES @@ -651,8 +651,8 @@ IDS_TIME_MICROSECONDS "Mikrosekundy" IDS_TIME_MILLISECONDS "Milisekundy" IDS_TIME_MINUTES "Minúty" + IDS_TIME_SECONDS "Sekundy" IDS_TIME_YEARS "Roky" - IDS_TIME_SECONDS "Sekundy" IDS_TIME_WEEKS "Týdne" END @@ -660,13 +660,13 @@ STRINGTABLE DISCARDABLE BEGIN IDS_VELOCITY_CMS_SECOND "Centimetre/hodinu" + IDS_VELOCITY_FEET_HOUR "Stopy/hodinu" + IDS_VELOCITY_FEET_SECOND "Stopy/sekundu" IDS_VELOCITY_KILOMETERS_HOUR "Kilometre/hodinu" IDS_VELOCITY_KNOTS "Knots" IDS_VELOCITY_MACH "Mach" IDS_VELOCITY_METERS_SECOND "Metre/sekundu" IDS_VELOCITY_MILES_HOUR "Míle/hodinu" - IDS_VELOCITY_FEET_HOUR "Stopy/hodinu" - IDS_VELOCITY_FEET_SECOND "Stopy/sekundu" END // TYPES OF VOLUMES @@ -677,6 +677,11 @@ IDS_VOLUME_BUN "Bun" IDS_VOLUME_BUSHELS_UK "Buely (UK)" //Buel, Bule? Buly? IDS_VOLUME_BUSHELS_US "Buely (USA)" + IDS_VOLUME_CUBIC_CENTIMETERS "Kubické centimetre" + IDS_VOLUME_CUBIC_FEET "Kubické stopy" + IDS_VOLUME_CUBIC_INCHES "Kubické palce" + IDS_VOLUME_CUBIC_METERS "Kubické metre" + IDS_VOLUME_CUBIC_YARDS "Kubické yardy" IDS_VOLUME_DOE "Doe" IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (USA)" @@ -686,11 +691,6 @@ IDS_VOLUME_GOU "Gou" IDS_VOLUME_HOP "Hop" IDS_VOLUME_ICCE "Icce" - IDS_VOLUME_CUBIC_CENTIMETERS "Kubické centimetre" - IDS_VOLUME_CUBIC_FEET "Kubické stopy" - IDS_VOLUME_CUBIC_INCHES "Kubické palce" - IDS_VOLUME_CUBIC_METERS "Kubické metre" - IDS_VOLUME_CUBIC_YARDS "Kubické yardy" IDS_VOLUME_KWIAN "Kwian" IDS_VOLUME_LITERS "Litre" IDS_VOLUME_MAL "Mal" @@ -712,7 +712,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_QUINTAL_METRIC "Cent (metrický)" + IDS_WEIGHT_CARATS "Karáty" IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" @@ -722,19 +722,19 @@ IDS_WEIGHT_JIN_CHINA "Jin (Èína)" IDS_WEIGHT_JIN_TAIWAN "Jin (Tchajvan)" IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_CARATS "Karáty" IDS_WEIGHT_KILOGRAMS "Kilogramy" IDS_WEIGHT_KIN "Kin" IDS_WEIGHT_LIANG_CHINA "Liang (Èína)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Tchajvan)" + IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Unce, anglosaská" + IDS_WEIGHT_OUNCES_TROY "Unce, trójska" IDS_WEIGHT_POUNDS "Libry" - IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_QUINTAL_METRIC "Cent (metrický)" IDS_WEIGHT_SALOUNG "Saloung" IDS_WEIGHT_STONES "Stones" IDS_WEIGHT_TAMLUNG "Tamlung" IDS_WEIGHT_TONNES "Tony" IDS_WEIGHT_TONS_UK "Tony (UK)" IDS_WEIGHT_TONS_US "Tony (USA)" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Unce, anglosaská" - IDS_WEIGHT_OUNCES_TROY "Unce, trójska" -END +END Added: trunk/reactos/base/applications/paint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/paint/lang/ja-JP.rc [iso-8859-1] Thu Sep 3 17:05:10 2009 @@ -1,0 +1,201 @@ +/* + * Japanese Language resource file + * Translated by: pcds90net, Tomoya Kitagawa + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +ID_MENU MENU +BEGIN + POPUP "t@C(&F)" + BEGIN + MENUITEM "VK(&N)\tCtrl+N", IDM_FILENEW + MENUITEM "J(&O)\tCtrl+O", IDM_FILEOPEN + MENUITEM "ã«Û¶(&S)\tCtrl+S", IDM_FILESAVE + MENUITEM "¼Oðt¯ÄÛ¶(&A)...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "wiÉÝè (À×Ä\\¦)", IDM_FILEASWALLPAPERPLANE + MENUITEM "wiÉÝè (É\\¦)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "wiÉÝè (gå)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "yCgÌI¹(&Q)\tAlt+F4", IDM_FILEEXIT + END + + POPUP "ÒW(&E)" + BEGIN + MENUITEM "³Éß·\tCtrl+Z", IDM_EDITUNDO + MENUITEM "âè¼µ\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "Øèæè\tCtrl+X", IDM_EDITCUT + MENUITEM "Rs[\tCtrl+C", IDM_EDITCOPY + MENUITEM "\\èt¯\tCtrl+V", IDM_EDITPASTE + MENUITEM "IðÍÍÌí\tDel", IDM_EDITDELETESELECTION + MENUITEM "IðÍÍÌ}ü", IDM_EDITINVERTSELECTION + MENUITEM "·×ÄIð\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "t@CÖRs[", IDM_EDITCOPYTO + MENUITEM "t@C©ç\\èt¯", IDM_EDITPASTEFROM + END + + POPUP "\\¦(&V)" + BEGIN + MENUITEM "c[ {bNX\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "J[ pbg\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "Xe[^X o[", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "eLXg c[ o[", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "gå" + BEGIN + POPUP "[U[è`" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM SEPARATOR + MENUITEM "Obhð\\¦\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "À¡\\¦", IDM_VIEWSHOWMINIATURE + END + MENUITEM "SæÊ\\¦\tCtrl+F", IDM_VIEWFULLSCREEN + END + + POPUP "æ(&I)" + BEGIN + MENUITEM "ñ]Æ½]\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "TCYÌÏX\tCtrl+W", IDM_IMAGECHANGESIZE + MENUITEM "Øèæè", IDM_IMAGECROP + MENUITEM "FÌ½]\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "æÌ®«\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "æÌí\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "s§¾Fð`æ·é", IDM_IMAGEDRAWOPAQUE + END + + POPUP "F(&C)" + BEGIN + MENUITEM "pbgÌÒW", IDM_COLORSEDITPALETTE + END + + POPUP "&?" + BEGIN + MENUITEM "wv gsbN", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "îñ", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^G", IDM_VIEWSHOWGRID + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGECHANGESIZE + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +CAPTION "ñ]Æ½]" +BEGIN + GROUPBOX "ñ]Æ½]", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "½ûüÉ½]", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "¼ûüÉ½]", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "pxðwè", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "90", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "180", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "270", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 + PUSHBUTTON "LZ", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +CAPTION "æÌ®«" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 40, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12 + LTEXT ":", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 + LTEXT "³:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10 + LTEXT "t@CÌút:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "t@CÌTCY:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "ðx:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "psÂ\\", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 + LTEXT "psÂ\\", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 + LTEXT "psÂ\\", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 + GROUPBOX "PÊ", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 + AUTORADIOBUTTON "C`", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP + AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 + AUTORADIOBUTTON "sNZ", IDD_ATTRIBUTESRB3, 92, 69, 35, 10 + GROUPBOX "F", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27 + AUTORADIOBUTTON "", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "J[", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "LZ", IDCANCEL, 155, 24, 48, 14 + PUSHBUTTON "ftHg", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 +END + +IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +CAPTION "TCYÌÏX" +BEGIN + GROUPBOX "TCYÌÏX", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 + LTEXT "½ûü:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 + LTEXT "¼ûü:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "LZ", IDCANCEL, 155, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME, "yCg" + IDS_WINDOWTITLE, "%s - yCg" + IDS_INFOTITLE, "ReactOS yCg" + IDS_INFOTEXT, "ReactOS yCgÍ GNU Lesser General Public License (LGPL) version 3 (Ú×Í www.gnu.org)ÌºÅpÂ\\Å·B" + IDS_SAVEPROMPTTEXT, "%s ÌÏXàeðÛ¶µÜ·©?" + IDS_DEFAULTFILENAME, "³è.bmp" + IDS_MINIATURETITLE, "k¬}" + IDS_TOOLTIP1, "©RIð" + IDS_TOOLTIP2, "Ið" + IDS_TOOLTIP3, "ÁµS" + IDS_TOOLTIP4, "hèÂÔµ" + IDS_TOOLTIP5, "FÌIð" + IDS_TOOLTIP6, "gåÆk¬" + IDS_TOOLTIP7, "M" + IDS_TOOLTIP8, "uV" + IDS_TOOLTIP9, "GAuV" + IDS_TOOLTIP10, "eLXg" + IDS_TOOLTIP11, "¼ü" + IDS_TOOLTIP12, "Èü" + IDS_TOOLTIP13, "lp`" + IDS_TOOLTIP14, "½p`" + IDS_TOOLTIP15, "È~" + IDS_TOOLTIP16, "pÛlp`" + IDS_OPENFILTER, "rbg}bv t@C (*.bmp;*.dib)\1*.bmp;*.dib\1·×ÄÌt@C (*.*)\1*.*\1" + IDS_SAVEFILTER, "24 rbg rbg}bv (*.bmp;*.dib)\1*.bmp;*.dib\1" +END Propchange: trunk/reactos/base/applications/paint/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs… ============================================================================== --- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Thu Sep 3 17:05:10 2009 @@ -20,6 +20,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Thu Sep 3 17:05:10 2009 @@ -1,0 +1,172 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 29-08-2009 + * LAST CHANGE: 29-08-2009 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDR_MAINMENU MENU +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Nastavenia", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "S&konèi", ID_EXIT + END + POPUP "&Programy" + BEGIN + MENUITEM "&Intalova", ID_INSTALL + MENUITEM "O&dintalova", ID_UNINSTALL + MENUITEM "&Zmeni", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Obnovi", ID_REFRESH + END + POPUP "Pomocník" + BEGIN + MENUITEM "Pomocník", ID_HELP, GRAYED + MENUITEM "Èo je ...", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Otvori linku v prehliadaèi", ID_OPEN_LINK + MENUITEM "&Kopírova linku do schránky", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Intalova", ID_INSTALL + MENUITEM "O&dintalova", ID_UNINSTALL + MENUITEM "&Zmeni", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Obnovi", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavenia" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Zrui", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Stiahnu a naintalova" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Zrui", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Sahujem ..." // Stiahnu ??? +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Zrui", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Èo je Manaér aplikácií systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Manaér aplikácií systému ReactOS\nAutorské práva (C) 2009\nod Dmitry Chapyshev (dmitry(a)reactos.org)\nPreklad: Mário Kaèmár (kario(a)szm.sk)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Zavrie", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Intalova" + IDS_TOOLTIP_UNINSTALL "Odintalova" + IDS_TOOLTIP_MODIFY "Zmeni" + IDS_TOOLTIP_SETTINGS "Nastavenia" + IDS_TOOLTIP_REFRESH "Obnovi" + IDS_TOOLTIP_EXIT "Skonèi" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "Názov" + IDS_APP_INST_VERSION "Verzia" + IDS_APP_DESCRIPTION "Popis" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nVerzia: " + IDS_INFO_DESCRIPTION "\nPopis: " + IDS_INFO_PUBLISHER "\nPublisher: " + IDS_INFO_HELPLINK "\nHelp Link: " + IDS_INFO_HELPPHONE "\nHelp Telephone: " + IDS_INFO_README "\nReadme: " + IDS_INFO_REGOWNER "\nRegistered Owner: " + IDS_INFO_PRODUCTID "\nProductID: " + IDS_INFO_CONTACT "\nKontakt: " + IDS_INFO_UPDATEINFO "\nUpdate Information: " + IDS_INFO_INFOABOUT "\nInformation About: " + IDS_INFO_COMMENTS "\nComments: " + IDS_INFO_INSTLOCATION "\nInstall Location: " + IDS_INFO_INSTALLSRC "\nInstall Source: " + IDS_INFO_UNINSTALLSTR "\nUninstall String: " + IDS_INFO_MODIFYPATH "\nModify Path: " + IDS_INFO_INSTALLDATE "\nInstall Date: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nVerzia: " + IDS_AINFO_DESCRIPTION "\nPopis: " + IDS_AINFO_SIZE "\nVe¾kos: " + IDS_AINFO_URLSITE "\nDomovská stránka: " + IDS_AINFO_LICENCE "\nLicencia: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Audio" + IDS_CAT_DEVEL "Vývojárske" // Development, vývoj?? + IDS_CAT_DRIVERS "Ovládaèe" // Drivers + IDS_CAT_EDU "Vzdelávacie" // Edutainment + IDS_CAT_ENGINEER "Ininierske" // Engineering, kontrukèné?? + IDS_CAT_FINANCE "Finanèné" // Finance, peòaníctvo?? + IDS_CAT_GAMES "Hry & zábava" // Games & Fun, zábavné?? + IDS_CAT_GRAPHICS "Grafické" // Graphics + IDS_CAT_INTERNET "Internet & sie" + IDS_CAT_LIBS "Kninice" + IDS_CAT_OFFICE "Kancelárske" // Office + IDS_CAT_OTHER "Iné" + IDS_CAT_SCIENCE "Vedecké" // Science + IDS_CAT_TOOLS "Nástroje" // Tools + IDS_CAT_VIDEO "Video" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "Manaér aplikácií systému ReactOS" + IDS_SEARCH_TEXT "H¾ada..." + IDS_INSTALL "Intalova" + IDS_UNINSTALL "Odintalova" + IDS_MODIFY "Zmeni" + IDS_APPS_COUNT "Poèet programov: %d" + IDS_WELCOME_TITLE "Víta Vás Manaér aplikácií systému ReactOS!\n\n" // ReactOS Application Manager + IDS_WELCOME_TEXT "Vyberte si kategóriu na ¾avej strane, potom vyberte aplikáciu, ktorú chcete naintalova alebo odintalova.\nWebstránka projektu ReactOS: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Naintalované" + IDS_AVAILABLEFORINST "Dostupné pre naintalovanie" + IDS_UPDATES "Aktualizácie" + IDS_APPLICATIONS "Aplikácie" + IDS_DOWNLOAD_FOLDER "Sahovania" // Downloads +END Propchange: trunk/reactos/base/applications/rapps/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Thu Sep 3 17:05:10 2009 @@ -5,4 +5,5 @@ #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] Thu Sep 3 17:05:10 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 28-04-2008 - * LAST CHANGE: 11-02-2009 + * LAST CHANGE: 26-08-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -239,7 +239,7 @@ IDS_CPLNAME "Zvuk a zvukové zariadenia" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(iadne)" - IDS_NO_DEVICES "No Devices" + IDS_NO_DEVICES "iadne zariadenia" 5825 "Chyba programu" 5826 "Zavrie program" @@ -260,7 +260,7 @@ 5841 "Restore Down" 5842 "Restore Up" 5843 "Hviezdièka" - 5844 "Default sound" + 5844 "Predvolený zvuk" //Default sound 5845 "Výkrik" 5846 "Ukonèenie systému ReactOS" 5847 "Kritické zastavenie"

1 0

[dchapyshev] 42987: - Sync shdocvw with Wine 1.1.29
by dchapyshev＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: dchapyshev Date: Thu Sep 3 16:59:32 2009 New Revision: 42987 URL: http://svn.reactos.org/svn/reactos?rev=42987&view=rev Log: - Sync shdocvw with Wine 1.1.29 Modified: trunk/reactos/dll/win32/shdocvw/client.c trunk/reactos/dll/win32/shdocvw/dochost.c trunk/reactos/dll/win32/shdocvw/frame.c trunk/reactos/dll/win32/shdocvw/navigate.c trunk/reactos/dll/win32/shdocvw/oleobject.c trunk/reactos/dll/win32/shdocvw/shdocvw.h trunk/reactos/dll/win32/shdocvw/shdocvw.inf trunk/reactos/dll/win32/shdocvw/webbrowser.c Modified: trunk/reactos/dll/win32/shdocvw/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/client.c… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/client.c [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -60,6 +60,9 @@ }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); *ppv = CLDISP(This); + }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { + TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppv); + *ppv = PROPNOTIF(This); }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = SERVPROV(This); Modified: trunk/reactos/dll/win32/shdocvw/dochost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/dochost.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/dochost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/dochost.c [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -20,6 +20,7 @@ #include "shdocvw.h" #include "hlink.h" #include "exdispid.h" +#include "mshtml.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -46,7 +47,7 @@ return 0; } -static void navigate_complete(DocHost *This) +static void notif_complete(DocHost *This, DISPID dispid) { DISPPARAMS dispparams; VARIANTARG params[2]; @@ -66,14 +67,15 @@ V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(This->url); - call_sink(This->cps.wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); - call_sink(This->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + TRACE("%d >>>\n", dispid); + call_sink(This->cps.wbe2, dispid, &dispparams); + TRACE("%d <<<\n", dispid); SysFreeString(V_BSTR(&url)); This->busy = VARIANT_FALSE; } -void object_available(DocHost *This) +static void object_available(DocHost *This) { IHlinkTarget *hlink; HRESULT hres; @@ -93,14 +95,152 @@ hres = IHlinkTarget_Navigate(hlink, 0, NULL); IHlinkTarget_Release(hlink); + if(FAILED(hres)) + FIXME("Navigate failed\n"); +} + +static HRESULT get_doc_ready_state(DocHost *This, READYSTATE *ret) +{ + DISPPARAMS dp = {NULL,NULL,0,0}; + IDispatch *disp; + EXCEPINFO ei; + VARIANT var; + HRESULT hres; + + hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) + return hres; + + hres = IDispatch_Invoke(disp, DISPID_READYSTATE, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, + &dp, &var, &ei, NULL); + IDispatch_Release(disp); if(FAILED(hres)) { - FIXME("Navigate failed\n"); + WARN("Invoke(DISPID_READYSTATE failed: %08x\n", hres); + return hres; + } + + if(V_VT(&var) != VT_I4) { + WARN("V_VT(var) = %d\n", V_VT(&var)); + VariantClear(&var); + return E_FAIL; + } + + *ret = V_I4(&var); + return S_OK; +} + +static void advise_prop_notif(DocHost *This, BOOL set) +{ + IConnectionPointContainer *cp_container; + IConnectionPoint *cp; + HRESULT hres; + + hres = IUnknown_QueryInterface(This->document, &IID_IConnectionPointContainer, (void**)&cp_container); + if(FAILED(hres)) return; - } - - navigate_complete(This); - - return; + + hres = IConnectionPointContainer_FindConnectionPoint(cp_container, &IID_IPropertyNotifySink, &cp); + IConnectionPointContainer_Release(cp_container); + if(FAILED(hres)) + return; + + if(set) + hres = IConnectionPoint_Advise(cp, (IUnknown*)PROPNOTIF(This), &This->prop_notif_cookie); + else + hres = IConnectionPoint_Unadvise(cp, This->prop_notif_cookie); + IConnectionPoint_Release(cp); + + if(SUCCEEDED(hres)) + This->is_prop_notif = set; +} + +static void update_ready_state(DocHost *This, READYSTATE ready_state) +{ + if(ready_state > READYSTATE_LOADING && This->ready_state <= READYSTATE_LOADING) { + notif_complete(This, DISPID_NAVIGATECOMPLETE2); + This->ready_state = ready_state; + } + + if(ready_state == READYSTATE_COMPLETE && This->ready_state < READYSTATE_COMPLETE) { + This->ready_state = READYSTATE_COMPLETE; + notif_complete(This, DISPID_DOCUMENTCOMPLETE); + } +} + +typedef struct { + task_header_t header; + IUnknown *doc; + READYSTATE ready_state; +} ready_state_task_t; + +static void ready_state_proc(DocHost *This, task_header_t *_task) +{ + ready_state_task_t *task = (ready_state_task_t*)_task; + + if(task->doc == This->document) + update_ready_state(This, task->ready_state); + + IUnknown_Release(task->doc); +} + +static void push_ready_state_task(DocHost *This, READYSTATE ready_state) +{ + ready_state_task_t *task = heap_alloc(sizeof(ready_state_task_t)); + + IUnknown_AddRef(This->document); + task->doc = This->document; + task->ready_state = ready_state; + + push_dochost_task(This, &task->header, ready_state_proc, FALSE); +} + +static void object_available_proc(DocHost *This, task_header_t *task) +{ + object_available(This); +} + +HRESULT dochost_object_available(DocHost *This, IUnknown *doc) +{ + READYSTATE ready_state; + task_header_t *task; + IOleObject *oleobj; + HRESULT hres; + + IUnknown_AddRef(doc); + This->document = doc; + + hres = IUnknown_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + if(SUCCEEDED(hres)) { + CLSID clsid; + + hres = IOleObject_GetUserClassID(oleobj, &clsid); + if(SUCCEEDED(hres)) + TRACE("Got clsid %s\n", + IsEqualGUID(&clsid, &CLSID_HTMLDocument) ? "CLSID_HTMLDocument" : debugstr_guid(&clsid)); + + hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); + if(FAILED(hres)) + FIXME("SetClientSite failed: %08x\n", hres); + + IOleObject_Release(oleobj); + }else { + FIXME("Could not get IOleObject iface: %08x\n", hres); + } + + /* FIXME: Call SetAdvise */ + + task = heap_alloc(sizeof(*task)); + push_dochost_task(This, task, object_available_proc, FALSE); + + hres = get_doc_ready_state(This, &ready_state); + if(SUCCEEDED(hres)) { + if(ready_state == READYSTATE_COMPLETE) + push_ready_state_task(This, READYSTATE_COMPLETE); + else + advise_prop_notif(This, TRUE); + } + + return S_OK; } static LRESULT resize_document(DocHost *This, LONG width, LONG height) @@ -173,6 +313,9 @@ IOleObject *oleobj = NULL; IHlinkTarget *hlink = NULL; HRESULT hres; + + if(This->is_prop_notif) + advise_prop_notif(This, FALSE); if(This->view) IOleDocumentView_UIActivate(This->view, FALSE); @@ -502,10 +645,78 @@ DocHostUIHandler_GetOverrideKeyPath }; +#define PROPNOTIF_THIS(iface) DEFINE_THIS(DocHost, IPropertyNotifySink, iface) + +static HRESULT WINAPI PropertyNotifySink_QueryInterface(IPropertyNotifySink *iface, + REFIID riid, void **ppv) +{ + DocHost *This = PROPNOTIF_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); +} + +static ULONG WINAPI PropertyNotifySink_AddRef(IPropertyNotifySink *iface) +{ + DocHost *This = PROPNOTIF_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); +} + +static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) +{ + DocHost *This = PROPNOTIF_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); +} + +static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) +{ + DocHost *This = PROPNOTIF_THIS(iface); + + TRACE("(%p)->(%d)\n", This, dispID); + + switch(dispID) { + case DISPID_READYSTATE: { + READYSTATE ready_state; + HRESULT hres; + + hres = get_doc_ready_state(This, &ready_state); + if(FAILED(hres)) + return hres; + + if(ready_state == READYSTATE_COMPLETE) + advise_prop_notif(This, FALSE); + + push_ready_state_task(This, ready_state); + break; + } + default: + FIXME("unimplemented dispid %d\n", dispID); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT WINAPI PropertyNotifySink_OnRequestEdit(IPropertyNotifySink *iface, DISPID dispID) +{ + DocHost *This = PROPNOTIF_THIS(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +#undef PROPNOTIF_THIS + +static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { + PropertyNotifySink_QueryInterface, + PropertyNotifySink_AddRef, + PropertyNotifySink_Release, + PropertyNotifySink_OnChanged, + PropertyNotifySink_OnRequestEdit +}; + void DocHost_Init(DocHost *This, IDispatch *disp) { This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; + This->lpIPropertyNotifySinkVtbl = &PropertyNotifySinkVtbl; This->disp = disp; @@ -521,6 +732,9 @@ This->silent = VARIANT_FALSE; This->offline = VARIANT_FALSE; + + This->ready_state = READYSTATE_UNINITIALIZED; + This->is_prop_notif = FALSE; DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); Modified: trunk/reactos/dll/win32/shdocvw/frame.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/frame.c?… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/frame.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/frame.c [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -135,7 +135,7 @@ LPCOLESTR pszStatusText) { DocHost *This = INPLACEFRAME_THIS(iface); - FIXME("(%p)->(%p)\n", This, debugstr_w(pszStatusText)); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszStatusText)); return E_NOTIMPL; } Modified: trunk/reactos/dll/win32/shdocvw/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/navigate… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/navigate.c [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -22,7 +22,6 @@ #include "wine/debug.h" #include "shdocvw.h" -#include "mshtml.h" #include "exdispid.h" #include "shellapi.h" #include "winreg.h" @@ -220,7 +219,7 @@ FIXME("status code %u\n", ulStatusCode); } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, @@ -270,49 +269,14 @@ return E_NOTIMPL; } -static void object_available_proc(DocHost *This, task_header_t *task) -{ - object_available(This); -} - static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface, REFIID riid, IUnknown *punk) { BindStatusCallback *This = BINDSC_THIS(iface); - task_header_t *task; - IOleObject *oleobj; - HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), punk); - IUnknown_AddRef(punk); - This->doc_host->document = punk; - - hres = IUnknown_QueryInterface(punk, &IID_IOleObject, (void**)&oleobj); - if(SUCCEEDED(hres)) { - CLSID clsid; - - hres = IOleObject_GetUserClassID(oleobj, &clsid); - if(SUCCEEDED(hres)) - TRACE("Got clsid %s\n", - IsEqualGUID(&clsid, &CLSID_HTMLDocument) ? "CLSID_HTMLDocument" : debugstr_guid(&clsid)); - - hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This->doc_host)); - if(FAILED(hres)) - FIXME("SetClientSite failed: %08x\n", hres); - - IOleObject_Release(oleobj); - }else { - FIXME("Could not get IOleObject iface: %08x\n", hres); - } - - /* FIXME: Call SetAdvise */ - /* FIXME: Call Invoke(DISPID_READYSTATE) */ - - task = heap_alloc(sizeof(*task)); - push_dochost_task(This->doc_host, task, object_available_proc, FALSE); - - return S_OK; + return dochost_object_available(This->doc_host, punk); } #undef BSC_THIS @@ -357,7 +321,7 @@ { BindStatusCallback *This = HTTPNEG_THIS(iface); - FIXME("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), + TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); if(This->headers) { @@ -374,9 +338,9 @@ LPWSTR *pszAdditionalRequestHeaders) { BindStatusCallback *This = HTTPNEG_THIS(iface); - FIXME("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), + TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - return E_NOTIMPL; + return S_OK; } #undef HTTPNEG_THIS @@ -511,46 +475,6 @@ exec_info.nShow = SW_SHOW; return ShellExecuteExW(&exec_info); -} - -static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback *callback, IBindCtx *bindctx) -{ - IPersistMoniker *persist; - IUnknown *doc; - HRESULT hres; - - /* - * FIXME: - * We should use URLMoniker's BindToObject instead creating HTMLDocument here. - * This should be fixed when mshtml.dll and urlmon.dll will be good enough. - */ - - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, - CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IUnknown, (void**)&doc); - - if(FAILED(hres)) { - ERR("Could not create HTMLDocument: %08x\n", hres); - return hres; - } - - hres = IUnknown_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist); - if(FAILED(hres)) { - IUnknown_Release(doc); - return hres; - } - - hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0); - IPersistMoniker_Release(persist); - - if(SUCCEEDED(hres)) - hres = IBindStatusCallback_OnObjectAvailable(callback, &IID_IUnknown, doc); - else - WARN("Load failed: %08x\n", hres); - - IUnknown_Release(doc); - - return IBindStatusCallback_OnStopBinding(callback, hres, NULL); } static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) @@ -585,13 +509,8 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCtx *bindctx, IBindStatusCallback *callback) { - WCHAR schema[30]; - DWORD schema_len; + IUnknown *unk = NULL; HRESULT hres; - - static const WCHAR httpW[] = {'h','t','t','p',0}; - static const WCHAR httpsW[] = {'h','t','t','p','s',0}; - static const WCHAR ftpW[]= {'f','t','p',0}; if(mon) { IMoniker_AddRef(mon); @@ -609,24 +528,15 @@ IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)CLIENTSITE(This)); - hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); - if(SUCCEEDED(hres) && - (!strcmpW(schema, httpW) || !strcmpW(schema, httpsW) || !strcmpW(schema, ftpW))) { - hres = http_load_hack(This, mon, callback, bindctx); + hres = IMoniker_BindToObject(mon, bindctx, NULL, &IID_IUnknown, (void**)&unk); + if(SUCCEEDED(hres)) { + hres = S_OK; + if(unk) + IUnknown_Release(unk); + }else if(try_application_url(url)) { + hres = S_OK; }else { - IUnknown *unk = NULL; - - hres = IMoniker_BindToObject(mon, bindctx, NULL, &IID_IUnknown, (void**)&unk); - if(SUCCEEDED(hres)) { - hres = S_OK; - if(unk) - IUnknown_Release(unk); - }else if(try_application_url(url)) { - hres = S_OK; - }else { - FIXME("BindToObject failed: %08x\n", hres); - } + FIXME("BindToObject failed: %08x\n", hres); } IMoniker_Release(mon); @@ -638,6 +548,8 @@ IBindCtx *bindctx; VARIANT_BOOL cancel = VARIANT_FALSE; HRESULT hres; + + This->ready_state = READYSTATE_LOADING; on_before_navigate2(This, bsc->url, bsc->post_data, bsc->post_data_len, bsc->headers, &cancel); if(cancel) { Modified: trunk/reactos/dll/win32/shdocvw/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/oleobjec… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/oleobject.c [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -152,8 +152,16 @@ SWP_NOZORDER | SWP_SHOWWINDOW); if(This->client) { + IOleContainer *container; + IOleClientSite_ShowObject(This->client); - IOleClientSite_GetContainer(This->client, &This->container); + + hres = IOleClientSite_GetContainer(This->client, &container); + if(SUCCEEDED(hres)) { + if(This->container) + IOleContainer_Release(This->container); + This->container = container; + } } if(This->doc_host.frame) @@ -615,7 +623,13 @@ { WebBrowser *This = INPLACEOBJ_THIS(iface); FIXME("(%p)\n", This); - return E_NOTIMPL; + + if(This->inplace) { + IOleInPlaceSite_Release(This->inplace); + This->inplace = NULL; + } + + return S_OK; } static HRESULT WINAPI OleInPlaceObject_UIDeactivate(IOleInPlaceObject *iface) Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -78,6 +78,7 @@ const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IDispatchVtbl *lpDispatchVtbl; + const IPropertyNotifySinkVtbl *lpIPropertyNotifySinkVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; /* Interfaces of InPlaceFrame object */ @@ -100,6 +101,10 @@ VARIANT_BOOL silent; VARIANT_BOOL offline; VARIANT_BOOL busy; + + READYSTATE ready_state; + DWORD prop_notif_cookie; + BOOL is_prop_notif; ConnectionPointContainer cps; }; @@ -184,6 +189,7 @@ #define DOCHOSTUI2(x) ((IDocHostUIHandler2*) &(x)->lpDocHostUIHandlerVtbl) #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) #define CLDISP(x) ((IDispatch*) &(x)->lpDispatchVtbl) +#define PROPNOTIF(x) ((IPropertyNotifySink*) &(x)->lpIPropertyNotifySinkVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl) @@ -211,7 +217,7 @@ void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); -void object_available(DocHost*); +HRESULT dochost_object_available(DocHost*,IUnknown*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); HRESULT go_home(DocHost*); Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.inf [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -142,6 +142,7 @@ [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" +HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;" Modified: trunk/reactos/dll/win32/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/webbrows… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/webbrowser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/webbrowser.c [iso-8859-1] Thu Sep 3 16:59:32 2009 @@ -724,6 +724,7 @@ VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { WebBrowser *This = WEBBROWSER_THIS(iface); + LPCWSTR url; TRACE("(%p)->(%p %p %p %p %p)\n", This, URL, Flags, TargetFrameName, PostData, Headers); @@ -733,12 +734,20 @@ if(!URL) return S_OK; - if(V_VT(URL) != VT_BSTR) { + switch (V_VT(URL)) + { + case VT_BSTR: + url = V_BSTR(URL); + break; + case VT_BSTR|VT_BYREF: + url = *V_BSTRREF(URL); + break; + default: FIXME("Unsupported V_VT(URL) %d\n", V_VT(URL)); return E_INVALIDARG; } - return navigate_url(&This->doc_host, V_BSTR(URL), Flags, TargetFrameName, PostData, Headers); + return navigate_url(&This->doc_host, url, Flags, TargetFrameName, PostData, Headers); } static HRESULT WINAPI WebBrowser_QueryStatusWB(IWebBrowser2 *iface, OLECMDID cmdID, OLECMDF *pcmdf) @@ -767,9 +776,10 @@ static HRESULT WINAPI WebBrowser_get_ReadyState(IWebBrowser2 *iface, READYSTATE *lpReadyState) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%p)\n", This, lpReadyState); - - *lpReadyState = READYSTATE_COMPLETE; + + TRACE("(%p)->(%p)\n", This, lpReadyState); + + *lpReadyState = This->doc_host.ready_state; return S_OK; }

1 0

[dchapyshev] 42986: - Sync windowscodecs with Wine 1.1.29
by dchapyshev＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: dchapyshev Date: Thu Sep 3 16:54:19 2009 New Revision: 42986 URL: http://svn.reactos.org/svn/reactos?rev=42986&view=rev Log: - Sync windowscodecs with Wine 1.1.29 Added: trunk/reactos/dll/win32/windowscodecs/jpegformat.c (with props) trunk/reactos/dll/win32/windowscodecs/pngformat.c (with props) Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild trunk/reactos/include/psdk/wincodec.idl Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -333,8 +333,8 @@ bih.bV5BitCount = This->format->bpp; bih.bV5Compression = This->format->compression; bih.bV5SizeImage = This->stride*This->height; - bih.bV5XPelsPerMeter = (This->xres-0.0127) / 0.0254; - bih.bV5YPelsPerMeter = (This->yres-0.0127) / 0.0254; + bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; + bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; bih.bV5ClrUsed = 0; bih.bV5ClrImportant = 0; Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -44,9 +44,11 @@ static classinfo wic_classes[] = { {&CLSID_WICImagingFactory, ImagingFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, + {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, {&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance}, {&CLSID_WICGifDecoder, GifDecoder_CreateInstance}, {&CLSID_WICIcoDecoder, IcoDecoder_CreateInstance}, + {&CLSID_WICJpegDecoder, JpegDecoder_CreateInstance}, {&CLSID_WICDefaultFormatConverter, FormatConverter_CreateInstance}, {0}}; Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -37,13 +37,21 @@ enum pixelformat { format_1bppIndexed, + format_2bppIndexed, format_4bppIndexed, format_8bppIndexed, + format_BlackWhite, + format_2bppGray, + format_4bppGray, + format_8bppGray, + format_16bppGray, format_16bppBGR555, format_16bppBGR565, format_24bppBGR, format_32bppBGR, - format_32bppBGRA + format_32bppBGRA, + format_48bppRGB, + format_64bppRGBA, }; typedef HRESULT (*copyfunc)(struct FormatConverter *This, const WICRect *prc, @@ -65,12 +73,23 @@ WICBitmapPaletteType palette_type; } FormatConverter; +static void make_grayscale_palette(WICColor *colors, UINT num_colors) +{ + int i, v; + for (i=0; i<num_colors; i++) + { + v = i * 255 / (num_colors-1); + colors[i] = 0xff000000 | v<<16 | v<<8 | v; + } +} + static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { switch (source_format) { case format_1bppIndexed: + case format_BlackWhite: if (prc) { HRESULT res; @@ -85,16 +104,24 @@ IWICPalette *palette; UINT actualcolors; - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; - - res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); - - IWICPalette_Release(palette); - - if (FAILED(res)) return res; + if (source_format == format_1bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); + + IWICPalette_Release(palette); + + if (FAILED(res)) return res; + } + else + { + colors[0] = 0xff000000; + colors[1] = 0xffffffff; + } srcstride = (prc->Width+7)/8; srcdatasize = srcstride * prc->Height; @@ -133,7 +160,73 @@ return res; } return S_OK; + case format_2bppIndexed: + case format_2bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + WICColor colors[4]; + IWICPalette *palette; + UINT actualcolors; + + if (source_format == format_2bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); + + IWICPalette_Release(palette); + + if (FAILED(res)) return res; + } + else + make_grayscale_palette(colors, 4); + + srcstride = (prc->Width+3)/4; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x+=4) { + BYTE srcval; + srcval=*srcbyte++; + *dstpixel++ = colors[srcval>>6]; + if (x+1 < prc->Width) *dstpixel++ = colors[srcval>>4&0x3]; + if (x+2 < prc->Width) *dstpixel++ = colors[srcval>>2&0x3]; + if (x+1 < prc->Width) *dstpixel++ = colors[srcval&0x3]; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_4bppIndexed: + case format_4bppGray: if (prc) { HRESULT res; @@ -148,16 +241,21 @@ IWICPalette *palette; UINT actualcolors; - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; - - res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); - - IWICPalette_Release(palette); - - if (FAILED(res)) return res; + if (source_format == format_4bppIndexed) + { + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + + res = IWICBitmapSource_CopyPalette(This->source, palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); + + IWICPalette_Release(palette); + + if (FAILED(res)) return res; + } + else + make_grayscale_palette(colors, 16); srcstride = (prc->Width+1)/2; srcdatasize = srcstride * prc->Height; @@ -190,6 +288,48 @@ return res; } return S_OK; + case format_8bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) + { + *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; + srcbyte++; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_8bppIndexed: if (prc) { @@ -233,6 +373,48 @@ dstpixel=(DWORD*)dstrow; for (x=0; x<prc->Width; x++) *dstpixel++ = colors[*srcbyte++]; + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + case format_16bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = prc->Width * 2; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) + { + *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; + srcbyte+=2; + } srcrow += srcstride; dstrow += cbStride; } @@ -401,6 +583,95 @@ if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return S_OK; + case format_48bppRGB: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = 6 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) { + BYTE red, green, blue; + red = *srcpixel++; srcpixel++; + green = *srcpixel++; srcpixel++; + blue = *srcpixel++; srcpixel++; + *dstpixel++=0xff000000|red<<16|green<<8|blue; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; + case format_64bppRGBA: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcpixel; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = 8 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcpixel=srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) { + BYTE red, green, blue, alpha; + red = *srcpixel++; srcpixel++; + green = *srcpixel++; srcpixel++; + blue = *srcpixel++; srcpixel++; + alpha = *srcpixel++; srcpixel++; + *dstpixel++=alpha<<24|red<<16|green<<8|blue; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; default: return WINCODEC_ERR_UNSUPPORTEDOPERATION; } @@ -423,13 +694,21 @@ static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, + {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, + {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, + {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, + {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, + {format_16bppGray, &GUID_WICPixelFormat16bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, + {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {0} }; Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -1064,6 +1064,7 @@ } else { + FIXME("cannot convert %s to %s\n", debugstr_guid(&srcFormat), debugstr_guid(dstFormat)); *ppIDst = NULL; return WINCODEC_ERR_COMPONENTNOTFOUND; } Added: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c (added) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -1,0 +1,577 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#ifdef SONAME_LIBJPEG +/* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ +#define XMD_H +#define UINT8 JPEG_UINT8 +#define UINT16 JPEG_UINT16 +#define boolean jpeg_boolean +#undef HAVE_STDLIB_H +# include <jpeglib.h> +#undef HAVE_STDLIB_H +#define HAVE_STDLIB_H 1 +#undef UINT8 +#undef UINT16 +#undef boolean +#endif + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" +#include "wine/library.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#ifdef SONAME_LIBJPEG + +static void *libjpeg_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(jpeg_CreateDecompress); +MAKE_FUNCPTR(jpeg_destroy_decompress); +MAKE_FUNCPTR(jpeg_read_header); +MAKE_FUNCPTR(jpeg_read_scanlines); +MAKE_FUNCPTR(jpeg_resync_to_restart); +MAKE_FUNCPTR(jpeg_start_decompress); +MAKE_FUNCPTR(jpeg_std_error); +#undef MAKE_FUNCPTR + +static void *load_libjpeg(void) +{ + if((libjpeg_handle = wine_dlopen(SONAME_LIBJPEG, RTLD_NOW, NULL, 0)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = wine_dlsym(libjpeg_handle, #f, NULL, 0)) == NULL) { \ + libjpeg_handle = NULL; \ + return NULL; \ + } + + LOAD_FUNCPTR(jpeg_CreateDecompress); + LOAD_FUNCPTR(jpeg_destroy_decompress); + LOAD_FUNCPTR(jpeg_read_header); + LOAD_FUNCPTR(jpeg_read_scanlines); + LOAD_FUNCPTR(jpeg_resync_to_restart); + LOAD_FUNCPTR(jpeg_start_decompress); + LOAD_FUNCPTR(jpeg_std_error); +#undef LOAD_FUNCPTR + } + return libjpeg_handle; +} + +typedef struct { + const IWICBitmapDecoderVtbl *lpVtbl; + const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; + LONG ref; + BOOL initialized; + BOOL cinfo_initialized; + IStream *stream; + struct jpeg_decompress_struct cinfo; + struct jpeg_error_mgr jerr; + struct jpeg_source_mgr source_mgr; + BYTE source_buffer[1024]; + BYTE *image_data; +} JpegDecoder; + +static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) +{ + return CONTAINING_RECORD(decompress, JpegDecoder, cinfo); +} + +static inline JpegDecoder *decoder_from_frame(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, JpegDecoder, lpFrameVtbl); +} + +static HRESULT WINAPI JpegDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, + void **ppv) +{ + JpegDecoder *This = (JpegDecoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JpegDecoder_AddRef(IWICBitmapDecoder *iface) +{ + JpegDecoder *This = (JpegDecoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) +{ + JpegDecoder *This = (JpegDecoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + if (This->cinfo_initialized) pjpeg_destroy_decompress(&This->cinfo); + if (This->stream) IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This->image_data); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI JpegDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, + DWORD *pdwCapability) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); + return E_NOTIMPL; +} + +static void source_mgr_init_source(j_decompress_ptr cinfo) +{ +} + +static jpeg_boolean source_mgr_fill_input_buffer(j_decompress_ptr cinfo) +{ + JpegDecoder *This = decoder_from_decompress(cinfo); + HRESULT hr; + ULONG bytesread; + + hr = IStream_Read(This->stream, This->source_buffer, 1024, &bytesread); + + if (hr != S_OK || bytesread == 0) + { + return FALSE; + } + else + { + This->source_mgr.next_input_byte = This->source_buffer; + This->source_mgr.bytes_in_buffer = bytesread; + return TRUE; + } +} + +static void source_mgr_skip_input_data(j_decompress_ptr cinfo, long num_bytes) +{ + JpegDecoder *This = decoder_from_decompress(cinfo); + LARGE_INTEGER seek; + + if (num_bytes > This->source_mgr.bytes_in_buffer) + { + seek.QuadPart = num_bytes - This->source_mgr.bytes_in_buffer; + IStream_Seek(This->stream, seek, STREAM_SEEK_CUR, NULL); + This->source_mgr.bytes_in_buffer = 0; + } + else if (num_bytes > 0) + { + This->source_mgr.next_input_byte += num_bytes; + This->source_mgr.bytes_in_buffer -= num_bytes; + } +} + +static void source_mgr_term_source(j_decompress_ptr cinfo) +{ +} + +static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + JpegDecoder *This = (JpegDecoder*)iface; + int ret; + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); + + if (This->cinfo_initialized) return WINCODEC_ERR_WRONGSTATE; + + This->cinfo.err = pjpeg_std_error(&This->jerr); + + pjpeg_CreateDecompress(&This->cinfo, JPEG_LIB_VERSION, sizeof(struct jpeg_decompress_struct)); + + This->cinfo_initialized = TRUE; + + This->stream = pIStream; + IStream_AddRef(pIStream); + + This->source_mgr.bytes_in_buffer = 0; + This->source_mgr.init_source = source_mgr_init_source; + This->source_mgr.fill_input_buffer = source_mgr_fill_input_buffer; + This->source_mgr.skip_input_data = source_mgr_skip_input_data; + This->source_mgr.resync_to_restart = pjpeg_resync_to_restart; + This->source_mgr.term_source = source_mgr_term_source; + + This->cinfo.src = &This->source_mgr; + + ret = pjpeg_read_header(&This->cinfo, TRUE); + + if (ret != JPEG_HEADER_OK) { + WARN("Jpeg image in stream has bad format, read header returned %d.\n",ret); + return E_FAIL; + } + + if (This->cinfo.jpeg_color_space == JCS_GRAYSCALE) + This->cinfo.out_color_space = JCS_GRAYSCALE; + else + This->cinfo.out_color_space = JCS_RGB; + + if (!pjpeg_start_decompress(&This->cinfo)) + { + ERR("jpeg_start_decompress failed\n"); + return E_FAIL; + } + + This->initialized = TRUE; + + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_GetContainerFormat(IWICBitmapDecoder *iface, + GUID *pguidContainerFormat) +{ + memcpy(pguidContainerFormat, &GUID_ContainerFormatJpeg, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, + IWICBitmapDecoderInfo **ppIDecoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, + IWICPalette *pIPalette) +{ + TRACE("(%p,%p)\n", iface, pIPalette); + + return WINCODEC_ERR_PALETTEUNAVAILABLE; +} + +static HRESULT WINAPI JpegDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_GetPreview(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIBitmapSource) +{ + FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_GetColorContexts(IWICBitmapDecoder *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_GetThumbnail(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static HRESULT WINAPI JpegDecoder_GetFrameCount(IWICBitmapDecoder *iface, + UINT *pCount) +{ + *pCount = 1; + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) +{ + JpegDecoder *This = (JpegDecoder*)iface; + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + + if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + + if (index != 0) return E_INVALIDARG; + + IWICBitmapDecoder_AddRef(iface); + *ppIBitmapFrame = (IWICBitmapFrameDecode*)&This->lpFrameVtbl; + + return S_OK; +} + +static const IWICBitmapDecoderVtbl JpegDecoder_Vtbl = { + JpegDecoder_QueryInterface, + JpegDecoder_AddRef, + JpegDecoder_Release, + JpegDecoder_QueryCapability, + JpegDecoder_Initialize, + JpegDecoder_GetContainerFormat, + JpegDecoder_GetDecoderInfo, + JpegDecoder_CopyPalette, + JpegDecoder_GetMetadataQueryReader, + JpegDecoder_GetPreview, + JpegDecoder_GetColorContexts, + JpegDecoder_GetThumbnail, + JpegDecoder_GetFrameCount, + JpegDecoder_GetFrame +}; + +static HRESULT WINAPI JpegDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI JpegDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) +{ + JpegDecoder *This = decoder_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI JpegDecoder_Frame_Release(IWICBitmapFrameDecode *iface) +{ + JpegDecoder *This = decoder_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI JpegDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + JpegDecoder *This = decoder_from_frame(iface); + *puiWidth = This->cinfo.output_width; + *puiHeight = This->cinfo.output_height; + TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + JpegDecoder *This = decoder_from_frame(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + if (This->cinfo.out_color_space == JCS_RGB) + memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); + else /* This->cinfo.out_color_space == JCS_GRAYSCALE */ + memcpy(pPixelFormat, &GUID_WICPixelFormat8bppGray, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + JpegDecoder *This = decoder_from_frame(iface); + UINT bpp; + UINT stride; + UINT data_size; + UINT max_row_needed; + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; + else bpp = 24; + + stride = bpp * This->cinfo.output_width; + data_size = stride * This->cinfo.output_height; + + max_row_needed = prc->Y + prc->Height; + if (max_row_needed > This->cinfo.output_height) return E_INVALIDARG; + + if (!This->image_data) + { + This->image_data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!This->image_data) return E_OUTOFMEMORY; + } + + while (max_row_needed > This->cinfo.output_scanline) + { + UINT first_scanline = This->cinfo.output_scanline; + UINT max_rows; + JSAMPROW out_rows[4]; + UINT i, j; + JDIMENSION ret; + + max_rows = min(This->cinfo.output_height-first_scanline, 4); + for (i=0; i<max_rows; i++) + out_rows[i] = This->image_data + stride * (first_scanline+i); + + ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); + + if (ret == 0) + { + ERR("read_scanlines failed\n"); + return E_FAIL; + } + + if (bpp == 24) + { + /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ + for (i=first_scanline; i<This->cinfo.output_scanline; i++) + { + BYTE *pixel = This->image_data + stride * i; + for (j=0; j<This->cinfo.output_width; j++) + { + BYTE red=pixel[0]; + BYTE blue=pixel[2]; + pixel[0]=blue; + pixel[2]=red; + pixel+=3; + } + } + } + } + + return copy_pixels(bpp, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, stride, + prc, cbStride, cbBufferSize, pbBuffer); +} + +static HRESULT WINAPI JpegDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI JpegDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static const IWICBitmapFrameDecodeVtbl JpegDecoder_Frame_Vtbl = { + JpegDecoder_Frame_QueryInterface, + JpegDecoder_Frame_AddRef, + JpegDecoder_Frame_Release, + JpegDecoder_Frame_GetSize, + JpegDecoder_Frame_GetPixelFormat, + JpegDecoder_Frame_GetResolution, + JpegDecoder_Frame_CopyPalette, + JpegDecoder_Frame_CopyPixels, + JpegDecoder_Frame_GetMetadataQueryReader, + JpegDecoder_Frame_GetColorContexts, + JpegDecoder_Frame_GetThumbnail +}; + +HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + JpegDecoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + if (!libjpeg_handle && !load_libjpeg()) + { + ERR("Failed reading JPEG because unable to find %s\n", SONAME_LIBJPEG); + return E_FAIL; + } + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(JpegDecoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &JpegDecoder_Vtbl; + This->lpFrameVtbl = &JpegDecoder_Frame_Vtbl; + This->ref = 1; + This->initialized = FALSE; + This->cinfo_initialized = FALSE; + This->stream = NULL; + This->image_data = NULL; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + +#else /* !defined(SONAME_LIBJPEG) */ + +HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to load JPEG picture, but JPEG supported not compiled in.\n"); + return E_FAIL; +} + +#endif Propchange: trunk/reactos/dll/win32/windowscodecs/jpegformat.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c (added) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -1,0 +1,650 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#ifdef HAVE_PNG_H +#include <png.h> +#endif + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" +#include "wine/library.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +#ifdef SONAME_LIBPNG + +static void *libpng_handle; +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(png_create_read_struct); +MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_error); +MAKE_FUNCPTR(png_get_bit_depth); +MAKE_FUNCPTR(png_get_color_type); +MAKE_FUNCPTR(png_get_image_height); +MAKE_FUNCPTR(png_get_image_width); +MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_get_PLTE); +MAKE_FUNCPTR(png_get_tRNS); +MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); +MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_read_fn); +MAKE_FUNCPTR(png_set_strip_16); +MAKE_FUNCPTR(png_set_tRNS_to_alpha); +MAKE_FUNCPTR(png_read_end); +MAKE_FUNCPTR(png_read_image); +MAKE_FUNCPTR(png_read_info); +#undef MAKE_FUNCPTR + +static void *load_libpng(void) +{ + if((libpng_handle = wine_dlopen(SONAME_LIBPNG, RTLD_NOW, NULL, 0)) != NULL) { + +#define LOAD_FUNCPTR(f) \ + if((p##f = wine_dlsym(libpng_handle, #f, NULL, 0)) == NULL) { \ + libpng_handle = NULL; \ + return NULL; \ + } + LOAD_FUNCPTR(png_create_read_struct); + LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_error); + LOAD_FUNCPTR(png_get_bit_depth); + LOAD_FUNCPTR(png_get_color_type); + LOAD_FUNCPTR(png_get_image_height); + LOAD_FUNCPTR(png_get_image_width); + LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_get_PLTE); + LOAD_FUNCPTR(png_get_tRNS); + LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); + LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_read_fn); + LOAD_FUNCPTR(png_set_strip_16); + LOAD_FUNCPTR(png_set_tRNS_to_alpha); + LOAD_FUNCPTR(png_read_end); + LOAD_FUNCPTR(png_read_image); + LOAD_FUNCPTR(png_read_info); + +#undef LOAD_FUNCPTR + } + return libpng_handle; +} + +typedef struct { + const IWICBitmapDecoderVtbl *lpVtbl; + const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; + LONG ref; + png_structp png_ptr; + png_infop info_ptr; + png_infop end_info; + BOOL initialized; + int bpp; + int width, height; + UINT stride; + const WICPixelFormatGUID *format; + BYTE *image_bits; +} PngDecoder; + +static inline PngDecoder *impl_from_frame(IWICBitmapFrameDecode *iface) +{ + return CONTAINING_RECORD(iface, PngDecoder, lpFrameVtbl); +} + +static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl; + +static HRESULT WINAPI PngDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, + void **ppv) +{ + PngDecoder *This = (PngDecoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapDecoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngDecoder_AddRef(IWICBitmapDecoder *iface) +{ + PngDecoder *This = (PngDecoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) +{ + PngDecoder *This = (PngDecoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + if (This->png_ptr) + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + HeapFree(GetProcessHeap(), 0, This->image_bits); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI PngDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, + DWORD *pdwCapability) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); + return E_NOTIMPL; +} + +static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + IStream *stream = ppng_get_io_ptr(png_ptr); + HRESULT hr; + ULONG bytesread; + + hr = IStream_Read(stream, data, length, &bytesread); + if (FAILED(hr) || bytesread != length) + { + ppng_error(png_ptr, "failed reading data"); + } +} + +static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, + WICDecodeOptions cacheOptions) +{ + PngDecoder *This = (PngDecoder*)iface; + LARGE_INTEGER seek; + HRESULT hr; + png_bytep *row_pointers=NULL; + UINT image_size; + UINT i; + int color_type, bit_depth; + png_bytep trans; + int num_trans; + png_uint_32 transparency; + png_color_16p trans_values; + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); + + /* initialize libpng */ + This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!This->png_ptr) return E_FAIL; + + This->info_ptr = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_read_struct(&This->png_ptr, (png_infopp)NULL, (png_infopp)NULL); + This->png_ptr = NULL; + return E_FAIL; + } + + This->end_info = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, (png_infopp)NULL); + This->png_ptr = NULL; + return E_FAIL; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + HeapFree(GetProcessHeap(), 0, row_pointers); + This->png_ptr = NULL; + return E_FAIL; + } + + /* seek to the start of the stream */ + seek.QuadPart = 0; + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) return hr; + + /* set up custom i/o handling */ + ppng_set_read_fn(This->png_ptr, pIStream, user_read_data); + + /* read the header */ + ppng_read_info(This->png_ptr, This->info_ptr); + + /* choose a pixel format */ + color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); + bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); + + /* check for color-keyed alpha */ + transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); + + if (transparency && color_type != PNG_COLOR_TYPE_PALETTE) + { + /* expand to RGBA */ + if (color_type == PNG_COLOR_TYPE_GRAY) + { + if (bit_depth < 8) + { + ppng_set_gray_1_2_4_to_8(This->png_ptr); + bit_depth = 8; + } + ppng_set_gray_to_rgb(This->png_ptr); + } + ppng_set_tRNS_to_alpha(This->png_ptr); + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + } + + switch (color_type) + { + case PNG_COLOR_TYPE_GRAY: + This->bpp = bit_depth; + switch (bit_depth) + { + case 1: This->format = &GUID_WICPixelFormatBlackWhite; break; + case 2: This->format = &GUID_WICPixelFormat2bppGray; break; + case 4: This->format = &GUID_WICPixelFormat4bppGray; break; + case 8: This->format = &GUID_WICPixelFormat8bppGray; break; + case 16: This->format = &GUID_WICPixelFormat16bppGray; break; + default: + ERR("invalid grayscale bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: + /* WIC does not support grayscale alpha formats so use RGBA */ + ppng_set_gray_to_rgb(This->png_ptr); + case PNG_COLOR_TYPE_RGB_ALPHA: + This->bpp = bit_depth * 4; + switch (bit_depth) + { + case 8: + ppng_set_bgr(This->png_ptr); + This->format = &GUID_WICPixelFormat32bppBGRA; + break; + case 16: This->format = &GUID_WICPixelFormat64bppRGBA; break; + default: + ERR("invalid RGBA bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + case PNG_COLOR_TYPE_PALETTE: + This->bpp = bit_depth; + switch (bit_depth) + { + case 1: This->format = &GUID_WICPixelFormat1bppIndexed; break; + case 2: This->format = &GUID_WICPixelFormat2bppIndexed; break; + case 4: This->format = &GUID_WICPixelFormat4bppIndexed; break; + case 8: This->format = &GUID_WICPixelFormat8bppIndexed; break; + default: + ERR("invalid indexed color bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + case PNG_COLOR_TYPE_RGB: + This->bpp = bit_depth * 3; + switch (bit_depth) + { + case 8: + ppng_set_bgr(This->png_ptr); + This->format = &GUID_WICPixelFormat24bppBGR; + break; + case 16: This->format = &GUID_WICPixelFormat48bppRGB; break; + default: + ERR("invalid RGB color bit depth: %i\n", bit_depth); + return E_FAIL; + } + break; + default: + ERR("invalid color type %i\n", color_type); + return E_FAIL; + } + + /* read the image data */ + This->width = ppng_get_image_width(This->png_ptr, This->info_ptr); + This->height = ppng_get_image_height(This->png_ptr, This->info_ptr); + This->stride = This->width * This->bpp; + image_size = This->stride * This->height; + + This->image_bits = HeapAlloc(GetProcessHeap(), 0, image_size); + if (!This->image_bits) return E_OUTOFMEMORY; + + row_pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(png_bytep)*This->height); + if (!row_pointers) return E_OUTOFMEMORY; + + for (i=0; i<This->height; i++) + row_pointers[i] = This->image_bits + i * This->stride; + + ppng_read_image(This->png_ptr, row_pointers); + + HeapFree(GetProcessHeap(), 0, row_pointers); + row_pointers = NULL; + + ppng_read_end(This->png_ptr, This->end_info); + + This->initialized = TRUE; + + return S_OK; +} + +static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, + GUID *pguidContainerFormat) +{ + memcpy(pguidContainerFormat, &GUID_ContainerFormatPng, sizeof(GUID)); + return S_OK; +} + +static HRESULT WINAPI PngDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, + IWICBitmapDecoderInfo **ppIDecoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIBitmapSource) +{ + FIXME("(%p,%p): stub\n", iface, ppIBitmapSource); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, + IWICBitmapSource **ppIThumbnail) +{ + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return WINCODEC_ERR_CODECNOTHUMBNAIL; +} + +static HRESULT WINAPI PngDecoder_GetFrameCount(IWICBitmapDecoder *iface, + UINT *pCount) +{ + *pCount = 1; + return S_OK; +} + +static HRESULT WINAPI PngDecoder_GetFrame(IWICBitmapDecoder *iface, + UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) +{ + PngDecoder *This = (PngDecoder*)iface; + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + + if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + + if (index != 0) return E_INVALIDARG; + + IWICBitmapDecoder_AddRef(iface); + + *ppIBitmapFrame = (void*)(&This->lpFrameVtbl); + + return S_OK; +} + +static const IWICBitmapDecoderVtbl PngDecoder_Vtbl = { + PngDecoder_QueryInterface, + PngDecoder_AddRef, + PngDecoder_Release, + PngDecoder_QueryCapability, + PngDecoder_Initialize, + PngDecoder_GetContainerFormat, + PngDecoder_GetDecoderInfo, + PngDecoder_CopyPalette, + PngDecoder_GetMetadataQueryReader, + PngDecoder_GetPreview, + PngDecoder_GetColorContexts, + PngDecoder_GetThumbnail, + PngDecoder_GetFrameCount, + PngDecoder_GetFrame +}; + +static HRESULT WINAPI PngDecoder_Frame_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngDecoder_Frame_AddRef(IWICBitmapFrameDecode *iface) +{ + PngDecoder *This = impl_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI PngDecoder_Frame_Release(IWICBitmapFrameDecode *iface) +{ + PngDecoder *This = impl_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI PngDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + PngDecoder *This = impl_from_frame(iface); + *puiWidth = This->width; + *puiHeight = This->height; + TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); + return S_OK; +} + +static HRESULT WINAPI PngDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + PngDecoder *This = impl_from_frame(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); + + memcpy(pPixelFormat, This->format, sizeof(GUID)); + + return S_OK; +} + +static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + PngDecoder *This = impl_from_frame(iface); + png_uint_32 ret; + png_colorp png_palette; + int num_palette; + WICColor palette[256]; + png_bytep trans; + int num_trans; + png_color_16p trans_values; + int i; + + TRACE("(%p,%p)\n", iface, pIPalette); + + ret = ppng_get_PLTE(This->png_ptr, This->info_ptr, &png_palette, &num_palette); + if (!ret) return WINCODEC_ERR_PALETTEUNAVAILABLE; + + if (num_palette > 256) + { + ERR("palette has %i colors?!\n", num_palette); + return E_FAIL; + } + + for (i=0; i<num_palette; i++) + { + palette[i] = (0xff000000| + png_palette[i].red << 16| + png_palette[i].green << 8| + png_palette[i].blue); + } + + ret = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); + if (ret) + { + for (i=0; i<num_trans; i++) + { + palette[trans[i]] = 0x00000000; + } + } + + return IWICPalette_InitializeCustom(pIPalette, palette, num_palette); +} + +static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + PngDecoder *This = impl_from_frame(iface); + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return copy_pixels(This->bpp, This->image_bits, + This->width, This->height, This->stride, + prc, cbStride, cbBufferSize, pbBuffer); +} + +static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return E_NOTIMPL; +} + +static const IWICBitmapFrameDecodeVtbl PngDecoder_FrameVtbl = { + PngDecoder_Frame_QueryInterface, + PngDecoder_Frame_AddRef, + PngDecoder_Frame_Release, + PngDecoder_Frame_GetSize, + PngDecoder_Frame_GetPixelFormat, + PngDecoder_Frame_GetResolution, + PngDecoder_Frame_CopyPalette, + PngDecoder_Frame_CopyPixels, + PngDecoder_Frame_GetMetadataQueryReader, + PngDecoder_Frame_GetColorContexts, + PngDecoder_Frame_GetThumbnail +}; + +HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + PngDecoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + if (!libpng_handle && !load_libpng()) + { + ERR("Failed reading PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngDecoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &PngDecoder_Vtbl; + This->lpFrameVtbl = &PngDecoder_FrameVtbl; + This->ref = 1; + This->png_ptr = NULL; + This->info_ptr = NULL; + This->end_info = NULL; + This->initialized = FALSE; + This->image_bits = NULL; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + +#else /* !HAVE_PNG_H */ + +HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to load PNG picture, but PNG supported not compiled in.\n"); + return E_FAIL; +} + +#endif Propchange: trunk/reactos/dll/win32/windowscodecs/pngformat.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -735,6 +735,12 @@ "windowscodecs.dll", "Apartment" }, + { &CLSID_WICPngDecoder, + "WIC PNG Decoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { &CLSID_WICBmpEncoder, "WIC BMP Encoder", NULL, @@ -753,6 +759,12 @@ "windowscodecs.dll", "Apartment" }, + { &CLSID_WICJpegDecoder, + "WIC JPEG Decoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { &CLSID_WICDefaultFormatConverter, "WIC Default Format Converter", NULL, @@ -765,7 +777,7 @@ /*********************************************************************** * decoder list */ -static const BYTE mask_all[] = {0xff,0xff,0xff,0xff,0xff,0xff}; +static const BYTE mask_all[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const BYTE bmp_magic[] = {0x42,0x4d}; @@ -813,6 +825,43 @@ {0} }; +static const BYTE jpeg_magic[] = {0xff, 0xd8, 0xff, 0xe0}; + +static GUID const * const jpeg_formats[] = { + &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat8bppGray, + NULL +}; + +static struct decoder_pattern const jpeg_patterns[] = { + {4,0,jpeg_magic,mask_all,0}, + {0} +}; + +static const BYTE png_magic[] = {137,80,78,71,13,10,26,10}; + +static GUID const * const png_formats[] = { + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat2bppGray, + &GUID_WICPixelFormat4bppGray, + &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, + &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat64bppRGBA, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormat24bppBGR, + &GUID_WICPixelFormat48bppRGB, + NULL +}; + +static struct decoder_pattern const png_patterns[] = { + {8,0,png_magic,mask_all,0}, + {0} +}; + static struct regsvr_decoder const decoder_list[] = { { &CLSID_WICBmpDecoder, "The Wine Project", @@ -844,18 +893,46 @@ ico_formats, ico_patterns }, + { &CLSID_WICJpegDecoder, + "The Wine Project", + "JPEG Decoder", + "1.0.0.0", + &GUID_VendorMicrosoft, + "image/jpeg", + ".jpg;.jpeg;.jfif", + jpeg_formats, + jpeg_patterns + }, + { &CLSID_WICPngDecoder, + "The Wine Project", + "PNG Decoder", + "1.0.0.0", + &GUID_VendorMicrosoft, + "image/png", + ".png", + png_formats, + png_patterns + }, { NULL } /* list terminator */ }; static GUID const * const converter_formats[] = { &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat2bppGray, + &GUID_WICPixelFormat4bppGray, + &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat16bppGray, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat48bppRGB, + &GUID_WICPixelFormat64bppRGBA, NULL }; Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -138,7 +138,7 @@ if (NewPosition.QuadPart > This->dwMemsize) return E_INVALIDARG; if (NewPosition.QuadPart < 0) return E_INVALIDARG; - This->dwCurPos = NewPosition.LowPart; + This->dwCurPos = NewPosition.u.LowPart; if(plibNewPosition) plibNewPosition->QuadPart = This->dwCurPos; return S_OK; Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -22,9 +22,11 @@ extern HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); +extern HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT PaletteImpl_Create(IWICPalette **palette); extern HRESULT StreamImpl_Create(IWICStream **stream); Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/windowscodecs.rbuild [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -3,6 +3,7 @@ <importlibrary definition="windowscodecs.spec" /> <include base="windowscodecs">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS">include/reactos/libs/libjpeg</include> <define name="__WINESRC__" /> <redefine name="_WIN32_WINNT">0x600</redefine> @@ -21,8 +22,10 @@ <file>icoformat.c</file> <file>imgfactory.c</file> <file>info.c</file> + <file>jpegformat.c</file> <file>main.c</file> <file>palette.c</file> + <file>pngformat.c</file> <file>propertybag.c</file> <file>regsvr.c</file> <file>stream.c</file> Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… ============================================================================== --- trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] Thu Sep 3 16:54:19 2009 @@ -126,12 +126,21 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x03);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppIndexed, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x04);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormatBlackWhite, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x05);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat2bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x06);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat4bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x07);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat8bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x08);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppGray, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0b);") + cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR555, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x09);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat16bppBGR565, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0a);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat24bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0c);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);") + +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") typedef struct WICRect { INT X;

1 0

[dreimer] 42985: Updated ChangeLog.txt TBD for RosBE 1.5: - GCC 4.4.X working on Ros Tree. - options Tool update. - Stuff the others want included, if existent.
by dreimer＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: dreimer Date: Thu Sep 3 16:47:44 2009 New Revision: 42985 URL: http://svn.reactos.org/svn/reactos?rev=42985&view=rev Log: Updated ChangeLog.txt TBD for RosBE 1.5: - GCC 4.4.X working on Ros Tree. - options Tool update. - Stuff the others want included, if existent. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu Sep 3 16:47:44 2009 @@ -1,4 +1,4 @@ -*** Oct XXth, 2009 - RosBE 1.4.5 Released +*** Sep XXth, 2009 - RosBE 1.5 Released - Installer Fixes: * Installer starts the Uninstaller of the old Version again. @@ -11,7 +11,28 @@ * Fix the args not checked bug. (Samuel Serapion) - Prepare scripts for RosBE64 1.1 which is compatible with the new RosBE Versions (Daniel Reimer) - +- Bugfixes in ssvn (Shashkov Maxim, Daniel Reimer) +- Fix confusion between %_ROSBE_ROSPREFIX% and %_ROSBE_PREFIX%. (Colin Finck) + We only use %_ROSBE_PREFIX% now, which should fix building with amd64. (Colin Finck) +- Readd chdefdir's feature to switch to the new default directory after changing it. (Colin Finck) +- Fix inability to switch back to i386. (Colin Finck) +- Fix Variables to be able to use more recent GCCs. (Daniel Reimer) +- Fix up the call of the i386 config file in charch. (Daniel Reimer) +- Fix up default color of the 64 bit RosBE. (Daniel Reimer) +- "Only" call the 64 bit config file when you are in 64 bit mode. (Daniel Reimer) +- Fix the 64 bit options tool to be useable. (Daniel Reimer) +- Tidy up work on all files. (Daniel Reimer) +- Added RBuild Flags Setting possibility into the "config" command. They will be loaded at RosBE + startup and thus behave the same way like the other settings you can set in there. (Daniel Reimer) +- Made the "update" command stop when it found the last existant update online. Theres no use in trying + the full update 1-9 if theres none/one. This speeds up the status generation process. (Daniel Reimer) +- Get rid of the Doskey macro file, just add %_ROSBE_BASEDIR% (and %_ROSBE_BASEDIR%\Tools for svn.exe) + to the PATH and call all .cmd files directly. Renamed some batch files to match the macro names and + added some new ones, for which no batch file existed. (except "env", this command has been removed) + Now these commands can be called from other batch files and stuff like "clean & make" will work as well. + (Colin Finck, Gunnar) +- Fix raddr2line.cmd to properly handle spaces in the path. (Colin Finck) +- Added rosapps and rostests support to ssvn. (Daniel Reimer) *** Jun 29th, 2009 - RosBE 1.4.4 Released

1 0

[dreimer] 42984: Added rosapps and rostests support to ssvn. Request by JaixBly
by dreimer＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: dreimer Date: Thu Sep 3 15:44:45 2009 New Revision: 42984 URL: http://svn.reactos.org/svn/reactos?rev=42984&view=rev Log: Added rosapps and rostests support to ssvn. Request by JaixBly Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -190,11 +190,13 @@ " Creates, updates or cleans up your ReactOS source tree or shows the revision" " number of the local and online trees." "" - " update - Updates to HEAD revision or to a specific one when the second" - " parameter specifies one." - " create - Creates a new ReactOS source tree." - " cleanup - Cleans up and fixes errors in the source tree." - " status - Show the current local and online revision numbers." + " update - Updates to HEAD revision or to a specific one when the second" + " parameter specifies one." + " create - Creates a new ReactOS source tree." + " rosapps - Creates a new ReactOS RosApps source tree." + " rostests - Creates a new ReactOS RosTests source tree." + " cleanup - Cleans up and fixes errors in the source tree." + " status - Show the current local and online revision numbers." } } elseif ("$args" -eq "options") { if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -29,8 +29,28 @@ if ("$($arg[1])" -ne "") { $temparg = $arg[1] IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + if (Test-Path "modules\rosapps\.") { + Set-Location modules\rosapps + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location modules\rostests + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $temparg" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } } else { IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + if (Test-Path "modules\rosapps\.") { + Set-Location modules\rosapps + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } + if (Test-Path "modules\rostests\.") { + Set-Location modules\rostests + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' update" + Set-Location "$_ROSBE_ROSSOURCEDIR" + } } "Do you want to see the changelog?" $CL = Read-Host "Please enter 'yes' or 'no': " @@ -81,6 +101,46 @@ } } +# Check if the folder is empty. If not, output an error. +elseif ("$($args[0])" -eq "rosapps") { + $host.ui.RawUI.WindowTitle = "SVN RosApps Creating..." + if (Test-Path "modules\rosapps\.svn\.") { + "ERROR: Folder already contains a RosApps repository." + } else { + if (!(Test-Path "modules\rosapps\.")) { + new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory + } + Set-Location modules\rosapps + $dir = get-childitem + if ("$dir" -eq "") { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rosapps ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } + } + Set-Location "$_ROSBE_ROSSOURCEDIR" +} + +# Check if the folder is empty. If not, output an error. +elseif ("$($args[0])" -eq "rostests") { + $host.ui.RawUI.WindowTitle = "SVN RosTests Creating..." + if (Test-Path "modules\rostests\.svn\.") { + "ERROR: Folder already contains a RosTests repository." + } else { + if (!(Test-Path "modules\rostests\.")) { + new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory + } + Set-Location modules\rostests + $dir = get-childitem + if ("$dir" -eq "") { + IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/rostests ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } + } + Set-Location "$_ROSBE_ROSSOURCEDIR" +} + # Output the revision of the local and online trees and tell the user if # its up to date or not. elseif ("$($args[0])" -eq "status") { Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -196,11 +196,13 @@ echo Creates, updates or cleans up your ReactOS source tree or shows the revision echo number of the local and online trees. echo. - echo update - Updates to HEAD revision or to a specific one when the second - echo parameter specifies one. - echo create - Creates a new ReactOS source tree. - echo cleanup - Cleans up and fixes errors in the source tree. - echo status - Show the current local and online revision numbers. + echo update - Updates to HEAD revision or to a specific one when the second + echo parameter specifies one. + echo create - Creates a new ReactOS source tree. + echo rosapps - Creates a new ReactOS RosApps source tree. + echo rostests - Creates a new ReactOS RosTests source tree. + echo cleanup - Cleans up and fixes errors in the source tree. + echo status - Show the current local and online revision numbers. ) ) else if /i "%1" == "options" ( if exist "%_ROSBE_BASEDIR%\options.cmd" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Thu Sep 3 15:44:45 2009 @@ -51,7 +51,48 @@ ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) + goto :EOC +) +:: Check if the folder is empty. If not, output an error. +if /i "%1" == "rosapps" ( + title SVN RosApps Creating... + if exist "modules\rosapps\.svn\." ( + echo ERROR: Folder already contains a RosApps repository. + goto :EOC + ) + if not exist "modules\rosapps\." ( + md modules\rosapps + ) + cd modules\rosapps + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps . + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + cd "%_ROSBE_ROSSOURCEDIR%" + goto :EOC +) + +:: Check if the folder is empty. If not, output an error. +if /i "%1" == "rostests" ( + title SVN RosTests Creating... + if exist "modules\rostests\.svn\." ( + echo ERROR: Folder already contains a RosTests repository. + goto :EOC + ) + if not exist "modules\rostests\." ( + md modules\rostests + ) + cd modules\rostests + dir /b 2>nul | findstr "." >nul + if errorlevel 1 ( + "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests . + ) else ( + echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED + ) + cd "%_ROSBE_ROSSOURCEDIR%" goto :EOC ) @@ -86,8 +127,28 @@ if "!_ROSBE_SSVN_JOB!" == "update" ( if not "%2" == "" ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + if exist "modules\rosapps\." ( + cd modules\rosapps + "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + cd "%_ROSBE_ROSSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd modules\rostests + "%_ROSBE_BASEDIR%\Tools\svn.exe" update -r %2 + cd "%_ROSBE_ROSSOURCEDIR%" + ) ) else ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update + if exist "modules\rosapps\." ( + cd modules\rosapps + "%_ROSBE_BASEDIR%\Tools\svn.exe" update + cd "%_ROSBE_ROSSOURCEDIR%" + ) + if exist "modules\rostests\." ( + cd modules\rostests + "%_ROSBE_BASEDIR%\Tools\svn.exe" update + cd "%_ROSBE_ROSSOURCEDIR%" + ) ) ) echo Do you want to see the changelog?

1 0

[khornicek] 42983: - update wined3d, d3d8, d3d9, ddraw to Wine 1.1.28
by khornicek＠svn.reactos.org 03 Sep '09

03 Sep '09

Author: khornicek Date: Thu Sep 3 11:18:38 2009 New Revision: 42983 URL: http://svn.reactos.org/svn/reactos?rev=42983&view=rev Log: - update wined3d, d3d8, d3d9, ddraw to Wine 1.1.28 Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/stateblock.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/light.c trunk/reactos/dll/directx/wine/ddraw/parent.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/baseshader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/pixelshader.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexshader.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Modified: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Modified: trunk/reactos/dll/directx/wine/d3d8/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/stat… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Modified: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig… Modified: trunk/reactos/dll/directx/wine/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/par… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/baseshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[dchapyshev] 42982: - Update applications information. Patch by Maciej Bialas (bjauy[at]tlen[dot]pl)
by dchapyshev＠svn.reactos.org 02 Sep '09

02 Sep '09

Author: dchapyshev Date: Wed Sep 2 16:59:50 2009 New Revision: 42982 URL: http://svn.reactos.org/svn/reactos?rev=42982&view=rev Log: - Update applications information. Patch by Maciej Bialas (bjauy[at]tlen[dot]pl) Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/diablo2.txt trunk/reactos/base/applications/rapps/rapps/dosbox.txt trunk/reactos/base/applications/rapps/rapps/firefox2.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -5,7 +5,7 @@ Version = 2.6.4 Licence = GPL Description = Word processor. -Size = Unknown +Size = 5.9MB Category = 6 URLSite = http://www.abiword.org URLDownload = http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.… @@ -13,8 +13,6 @@ [Section.0407] Description = Textverarbeitung -Size = Unbekannt [Section.0415] Description = Edytor tekstu -Size = Nieznany Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -5,7 +5,7 @@ Version = 5.10.00.3610 Licence = Unknown Description = Unzip in the "ReactOS" folder then restart ReactOS twice. -Size = Unknown +Size = 186kB Category = 13 URLSite = Unknown URLDownload = http://svn.reactos.org/packages/ac97_vbox.exe @@ -16,5 +16,10 @@ Name = AC97 Treiber fÃ¼r VirtualBox Licence = Unbekannt Description = Entpacken in das "ReactOS"-Verzeichnis und ReactOS zweimal neustarten. -Size = Unbekannt URLSite = Unbekannt + +[Section.0415] +Name = Sterownik AC97 dla VirtualBox +Licence = Nieznana +Description = Rozpakuj zawartoÅÄ w folderze "ReactOS" i dwukrotnie zrestartuj system. +URLSite = Nieznana Modified: trunk/reactos/base/applications/rapps/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/diablo2.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -5,15 +5,15 @@ Version = 1.4 Licence = Shareware Description = Diablo 2 Shareware. zeckensack's glide wrapper is req. to run it. -Size = Unknown +Size = 132MB Category = 4 -URLSite = Unknown +URLSite = http://www.blizzard.com/diablo2 URLDownload = http://ftp.freenet.de./pub/filepilot/windows/spiele/diabloiidemo.exe CDPath = none [Section.0407] -Licence = Unbekannt Description = Diablo 2 Shareware. zeckensacks glide wrapper wird zum AusfÃ¼hren benÃ¶tigt. -URLSite = Unbekannt -Size = Unbekannt + +[Section.0415] +Description = Diablo 2 Shareware. Do poprawnego dziaÅania wymagany jest zainstalowany zeckensacks glide wrapper. Modified: trunk/reactos/base/applications/rapps/rapps/dosbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/dosbox.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,10 +2,10 @@ [Section] Name = DOSBox -Version = 0.72 +Version = 0.73 Licence = GPL Description = DOSBox is a DOS emulator. -Size = Unknown +Size = 1.4MB Category = 15 URLSite = http://www.dosbox.com URLDownload = http://ovh.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.73-win32-installer… @@ -14,8 +14,6 @@ [Section.0407] Description = DOSBox ist ein DOS Emulator. -Size = Unbekannt [Section.0415] Description = DOSBox - emulator DOSa. -Size = Nieznany Modified: trunk/reactos/base/applications/rapps/rapps/firefox2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox2.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -31,7 +31,7 @@ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… [Section.0415] -Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÐâ¦darek internetowych. +Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 6.3M URLSite = http://www.mozilla-europe.org/pl/ URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32… Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,30 +2,36 @@ [Section] Name = Mozilla Firefox 3.0 -Version = 3.0.9 +Version = 3.0.13 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. -Size = 7.2M +Size = 7.1M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/e… CDPath = none [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 7.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/ru… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/r… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. -Size = 7.0M +Size = 6.9M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/de… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/d… [Section.0405] Description = Mest populÃÂ¦re og best ogsÃÂ¥ gratis nettleserene der ute. -Size = 7.0M +Size = 6.9M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/nb… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/n… + +[Section.0415] +Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. +Size = 7.8M +URLSite = http://www.mozilla-europe.org/pl/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/p… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/freebasic.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -16,4 +16,4 @@ Description = Open Source BASIC Compiler. Die BASIC Syntax ist kompatibel zu QBASIC. [Section.0415] -Description = Otwarty kompilator BASIC, ze skÐâadniÐâ¦ kompatybilnÐâ¦ z QBASIC. +Description = Otwarty kompilator BASIC, ze skÅadniÄ kompatybilnÄ z QBASIC. Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -16,3 +16,6 @@ [Section.0407] Description = Der populÃ¤re Opera Browser mit vielen fortschrittlichen Eigenschaften, enthÃ¤lt einen Mail und BitTorrent Client. + +[Section.0415] +Description = Popularna przeglÄdarka internetowa z wieloma zaawansowanymi funkcjami, zawierajÄca klientÃ³w: poczty oraz BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,23 +2,26 @@ [Section] Name = Mozilla SeaMonkey -Version = 1.1.16 -Licence = Unknown +Version = 1.1.17 +Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. -Size = 12.4M +Size = 12.4MB Category = 5 -URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/seamonkey-1.1.16.en-… +URLSite = http://www.seamonkey-project.org/ +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/seamonkey-1.1.17.en-… CDPath = none [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. -Licence = ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾ -URLSite = http://www.mozilla-europe.org/ru/ +Size = 9.0MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… [Section.0407] -Licence = Unbekannt Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. -Size = 8.9M -URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.16/contrib-localized/se… +Size = 9.0MB +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/contrib-localized/se… + +[Section.0415] +Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. +Size = 12.4MB +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,23 +2,29 @@ [Section] Name = Mozilla Thunderbird 2.0 -Version = 2.0.0.19 +Version = 2.0.0.23 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. -Size = 6.4M +Size = 6.2M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… CDPath = none [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². -Size = 7.0M +Size = 7.1M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. -Size = 6.2M +Size = 6.4M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.19/w… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… + +[Section.0415] +Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. +Size = 7.2M +URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.23/w… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -2,10 +2,10 @@ [Section] Name = ÂµTorrent -Version = 1.8.3 +Version = 1.8.4 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 281K +Size = 282K Category = 5 URLSite = http://www.utorrent.com/ URLDownload = http://download.utorrent.com/1.8.3/utorrent.exe @@ -18,3 +18,7 @@ [Section.0407] Licence = Freeware fÃ¼r nichtkommerzielle Nutzung Description = Kleiner und schneller BitTorrent Client. + +[Section.0415] +Licence = Freeware (do uÅ¼ytku domowego) +Description = MaÅy i szybki klient BitTorrent. Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Wed Sep 2 16:59:50 2009 @@ -15,6 +15,6 @@ Licence = Unbekannt Description = Visual Studio 6 Laufzeitsystem -[Section.0407] +[Section.0415] Licence = Nieznana Description = Biblioteki uruchomieniowe Visual Studio 6

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs