wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Vincent Povirk : windowscodecs: Add support for reading tiled TIFF images.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 10080298dc7fb1ca3dee7903101dfd1de8fcfa5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=10080298dc7fb1ca3dee79031… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 25 15:59:41 2011 -0500 windowscodecs: Add support for reading tiled TIFF images. --- dlls/windowscodecs/tiffformat.c | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 976870a..b1dd152 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -62,6 +62,7 @@ MAKE_FUNCPTR(TIFFGetField); MAKE_FUNCPTR(TIFFIsByteSwapped); MAKE_FUNCPTR(TIFFReadDirectory); MAKE_FUNCPTR(TIFFReadEncodedStrip); +MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); #undef MAKE_FUNCPTR @@ -89,6 +90,7 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFIsByteSwapped); LOAD_FUNCPTR(TIFFReadDirectory); LOAD_FUNCPTR(TIFFReadEncodedStrip); + LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); #undef LOAD_FUNCPTR @@ -215,6 +217,8 @@ typedef struct { UINT tile_width, tile_height; UINT tile_stride; UINT tile_size; + int tiled; + UINT tiles_across; } tiff_decode_info; typedef struct { @@ -248,6 +252,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->indexed = 0; decode_info->reverse_bgr = 0; decode_info->invert_grayscale = 0; + decode_info->tiled = 0; ret = pTIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric); if (!ret) @@ -418,8 +423,28 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } - ret = pTIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &decode_info->tile_height); - if (ret) + if ((ret = pTIFFGetField(tiff, TIFFTAG_TILEWIDTH, &decode_info->tile_width))) + { + decode_info->tiled = 1; + + if (!ret) + { + WARN("missing tile width\n"); + return E_FAIL; + } + + ret = pTIFFGetField(tiff, TIFFTAG_TILELENGTH, &decode_info->tile_height); + if (!ret) + { + WARN("missing tile height\n"); + return E_FAIL; + } + + decode_info->tile_stride = ((decode_info->bpp * decode_info->tile_width + 7)/8); + decode_info->tile_size = decode_info->tile_height * decode_info->tile_stride; + decode_info->tiles_across = (decode_info->width + decode_info->tile_width - 1) / decode_info->tile_width; + } + else if ((ret = pTIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &decode_info->tile_height))) { if (decode_info->tile_height > decode_info->height) decode_info->tile_height = decode_info->height; @@ -429,7 +454,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) } else { - /* Probably a tiled image */ FIXME("missing RowsPerStrip value\n"); return E_FAIL; } @@ -797,7 +821,14 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT if (hr == S_OK) { - ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); + if (This->decode_info.tiled) + { + ret = pTIFFReadEncodedTile(This->parent->tiff, tile_x + tile_y * This->decode_info.tiles_across, This->cached_tile, This->decode_info.tile_size); + } + else + { + ret = pTIFFReadEncodedStrip(This->parent->tiff, tile_y, This->cached_tile, This->decode_info.tile_size); + } if (ret == -1) hr = E_FAIL;

1 0

Vincent Povirk : gdiplus: Implement gamma adjustment.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 19b71b035ed81bb65f00ae84a263a9ff404a9c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b71b035ed81bb65f00ae84a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 24 17:31:57 2011 -0500 gdiplus: Implement gamma adjustment. --- dlls/gdiplus/graphics.c | 28 +++++++++++++++++++++++++--- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 840825a..eb74021 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -467,9 +467,31 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d if (attributes->gamma_enabled[type] || attributes->gamma_enabled[ColorAdjustTypeDefault]) { - static int fixme; - if (!fixme++) - FIXME("Gamma adjustment not implemented\n"); + REAL gamma; + + if (attributes->gamma_enabled[type]) + gamma = attributes->gamma[type]; + else + gamma = attributes->gamma[ColorAdjustTypeDefault]; + + for (x=0; x<width; x++) + for (y=0; y<height; y++) + { + ARGB *src_color; + BYTE blue, green, red; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + + blue = *src_color&0xff; + green = (*src_color>>8)&0xff; + red = (*src_color>>16)&0xff; + + /* FIXME: We should probably use a table for this. */ + blue = floorf(powf(blue / 255.0, gamma) * 255.0); + green = floorf(powf(green / 255.0, gamma) * 255.0); + red = floorf(powf(red / 255.0, gamma) * 255.0); + + *src_color = (*src_color & 0xff000000) | (red << 16) | (green << 8) | blue; + } } } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cbae047..1e6a9e9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2085,7 +2085,7 @@ static void test_gamma(void) stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); expect(Ok, stat); - todo_wine ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8x\n", color); + ok(color_match(0xff20ffff, color, 1), "Expected ff20ffff, got %.8x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1);

1 0

Vincent Povirk : gdiplus: Implement color transforms.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 805f0321ebffe0db2d39f414c0f19c21958bb3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805f0321ebffe0db2d39f414c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 24 16:50:05 2011 -0500 gdiplus: Implement color transforms. --- dlls/gdiplus/graphics.c | 65 +++++++++++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/image.c | 30 +++++++++++++++++--- 2 files changed, 88 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7d2dbcd..840825a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -331,6 +331,45 @@ static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) } } +static ARGB transform_color(ARGB color, const ColorMatrix *matrix) +{ + REAL val[5], res[4]; + int i, j; + unsigned char a, r, g, b; + + val[0] = ((color >> 16) & 0xff) / 255.0; /* red */ + val[1] = ((color >> 8) & 0xff) / 255.0; /* green */ + val[2] = (color & 0xff) / 255.0; /* blue */ + val[3] = ((color >> 24) & 0xff) / 255.0; /* alpha */ + val[4] = 1.0; /* translation */ + + for (i=0; i<4; i++) + { + res[i] = 0.0; + + for (j=0; j<5; j++) + res[i] += matrix->m[j][i] * val[j]; + } + + a = min(max(floorf(res[3]*255.0), 0.0), 255.0); + r = min(max(floorf(res[0]*255.0), 0.0), 255.0); + g = min(max(floorf(res[1]*255.0), 0.0), 255.0); + b = min(max(floorf(res[2]*255.0), 0.0), 255.0); + + return (a << 24) | (r << 16) | (g << 8) | b; +} + +static int color_is_gray(ARGB color) +{ + unsigned char r, g, b; + + r = (color >> 16) & 0xff; + g = (color >> 8) & 0xff; + b = color & 0xff; + + return (r == g) && (g == b); +} + static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type) { @@ -400,9 +439,29 @@ static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE d if (attributes->colormatrices[type].enabled || attributes->colormatrices[ColorAdjustTypeDefault].enabled) { - static int fixme; - if (!fixme++) - FIXME("Color transforms not implemented\n"); + const struct color_matrix *colormatrices; + + if (attributes->colormatrices[type].enabled) + colormatrices = &attributes->colormatrices[type]; + else + colormatrices = &attributes->colormatrices[ColorAdjustTypeDefault]; + + for (x=0; x<width; x++) + for (y=0; y<height; y++) + { + ARGB *src_color; + src_color = (ARGB*)(data + stride * y + sizeof(ARGB) * x); + + if (colormatrices->flags == ColorMatrixFlagsDefault || + !color_is_gray(*src_color)) + { + *src_color = transform_color(*src_color, &colormatrices->colormatrix); + } + else if (colormatrices->flags == ColorMatrixFlagsAltGray) + { + *src_color = transform_color(*src_color, &colormatrices->graymatrix); + } + } } if (attributes->gamma_enabled[type] || diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 71a99ea..cbae047 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1923,6 +1923,12 @@ static void test_colormatrix(void) {0.0,0.0,1.0,0.0,0.0}, {0.0,0.0,0.0,1.0,0.0}, {0.0,0.0,0.0,0.0,1.0}}}; + const ColorMatrix asymmetric = {{ + {0.0,1.0,0.0,0.0,0.0}, + {0.0,0.0,1.0,0.0,0.0}, + {0.0,0.0,0.0,1.0,0.0}, + {1.0,0.0,0.0,0.0,0.0}, + {0.0,0.0,0.0,0.0,1.0}}}; GpBitmap *bitmap1, *bitmap2; GpGraphics *graphics; ARGB color; @@ -1983,13 +1989,13 @@ static void test_colormatrix(void) TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); expect(Ok, stat); - stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppARGB, NULL, &bitmap1); expect(Ok, stat); - stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap2); + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppARGB, NULL, &bitmap2); expect(Ok, stat); - stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff40ffff); + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff40ccee); expect(Ok, stat); stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); @@ -2001,7 +2007,23 @@ static void test_colormatrix(void) stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); expect(Ok, stat); - todo_wine expect(0xff80ffff, color); + expect(0xff80ccee, color); + + colormatrix = asymmetric; + stat = GdipSetImageAttributesColorMatrix(imageattr, ColorAdjustTypeDefault, + TRUE, &colormatrix, NULL, ColorMatrixFlagsDefault); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap2, 0, 0, 0); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + ok(color_match(0xeeff40cc, color, 3), "expected 0xeeff40cc, got 0x%08x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap1);

1 0

Dmitry Timoshkov : server: Add excute permission when read file access is allowed.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 1b5602e59cbd72bceb173e2dba4d214f8ef97ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5602e59cbd72bceb173e2db… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 24 16:57:21 2011 +0800 server: Add excute permission when read file access is allowed. --- dlls/advapi32/tests/security.c | 12 ++++-------- server/file.c | 12 +++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 5409c35..7040add 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -881,10 +881,9 @@ cleanup: SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_EXECUTE, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == FILE_EXECUTE, "expected FILE_EXECUTE, got %#x\n", granted); -} + granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -906,19 +905,17 @@ todo_wine { SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, 0x1ff, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == 0x1ff, "expected 0x1ff, got %#x\n", granted); -} + granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_ALL_ACCESS, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", granted); -} + SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, 0xffffffff, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(!rc, "AccessCheck should fail\n"); @@ -995,10 +992,9 @@ todo_wine { SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_EXECUTE, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); -todo_wine { ok(status == 1, "expected 1, got %d\n", status); ok(granted == FILE_EXECUTE, "expected FILE_EXECUTE, got %#x\n", granted); -} + granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); diff --git a/server/file.c b/server/file.c index cca2633..ee7202b 100644 --- a/server/file.c +++ b/server/file.c @@ -358,11 +358,9 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); aaa->Mask = WRITE_DAC | WRITE_OWNER; if (mode & S_IRUSR) - aaa->Mask |= FILE_GENERIC_READ; + aaa->Mask |= FILE_GENERIC_READ | FILE_GENERIC_EXECUTE; if (mode & S_IWUSR) aaa->Mask |= FILE_GENERIC_WRITE | DELETE | FILE_DELETE_CHILD; - if (mode & S_IXUSR) - aaa->Mask |= FILE_GENERIC_EXECUTE; sid = (SID *)&aaa->SidStart; memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); } @@ -379,11 +377,9 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); ada->Mask = 0; if (!(mode & S_IRUSR) && (mode & (S_IRGRP|S_IROTH))) - ada->Mask |= FILE_GENERIC_READ; + ada->Mask |= FILE_GENERIC_READ | FILE_GENERIC_EXECUTE; if (!(mode & S_IWUSR) && (mode & (S_IWGRP|S_IROTH))) ada->Mask |= FILE_GENERIC_WRITE | DELETE | FILE_DELETE_CHILD; - if (!(mode & S_IXUSR) && (mode & (S_IXGRP|S_IXOTH))) - ada->Mask |= FILE_GENERIC_EXECUTE; ada->Mask &= ~STANDARD_RIGHTS_ALL; /* never deny standard rights */ sid = (SID *)&ada->SidStart; memcpy( sid, user, FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) ); @@ -399,11 +395,9 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]); aaa->Mask = 0; if (mode & S_IROTH) - aaa->Mask |= FILE_GENERIC_READ; + aaa->Mask |= FILE_GENERIC_READ | FILE_GENERIC_EXECUTE; if (mode & S_IWOTH) aaa->Mask |= FILE_GENERIC_WRITE | DELETE | FILE_DELETE_CHILD; - if (mode & S_IXOTH) - aaa->Mask |= FILE_GENERIC_EXECUTE; sid = (SID *)&aaa->SidStart; memcpy( sid, world_sid, FIELD_OFFSET(SID, SubAuthority[world_sid->SubAuthorityCount]) ); }

1 0

Dan Kegel : urlmon: IsValidUrl should not fail if first parameter is not NULL.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 6bbd0b87d5e9a7568f42ee7e90c299ac836a70ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbd0b87d5e9a7568f42ee7e9… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Mar 21 01:45:51 2011 +0000 urlmon: IsValidUrl should not fail if first parameter is not NULL. --- dlls/urlmon/tests/misc.c | 11 +++++++++++ dlls/urlmon/urlmon_main.c | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cd3372c..fc1ba53 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1454,9 +1454,20 @@ static void test_MkParseDisplayNameEx(void) static void test_IsValidURL(void) { HRESULT hr; + IBindCtx *bctx = NULL; hr = IsValidURL(NULL, 0, 0); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IsValidURL(NULL, wszHttpWineHQ, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + CreateBindCtx(0, &bctx); + + hr = IsValidURL(bctx, wszHttpWineHQ, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + IBindCtx_Release(bctx); } START_TEST(misc) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 57eeaf9..01442c1 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -426,7 +426,7 @@ HRESULT WINAPI DllRegisterServerEx(void) * Determines if a specified string is a valid URL. * * PARAMS - * pBC [I] ignored, must be NULL. + * pBC [I] ignored, should be NULL. * szURL [I] string that represents the URL in question. * dwReserved [I] reserved and must be zero. * @@ -442,7 +442,7 @@ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved) { FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved); - if (pBC || dwReserved || !szURL) + if (dwReserved || !szURL) return E_INVALIDARG; return S_OK;

1 0

Austin English : traffic: Add a stub for TcDeregisterClient.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 570f446f8c19a9b56b7d26773390d7b426852c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=570f446f8c19a9b56b7d26773… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Mar 19 16:59:47 2011 -0500 traffic: Add a stub for TcDeregisterClient. --- dlls/traffic/traffic.spec | 2 +- dlls/traffic/traffic_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/traffic/traffic.spec b/dlls/traffic/traffic.spec index 4638af3..ad4bce0 100644 --- a/dlls/traffic/traffic.spec +++ b/dlls/traffic/traffic.spec @@ -4,7 +4,7 @@ @ stub TcCloseInterface @ stub TcDeleteFilter @ stub TcDeleteFlow -@ stub TcDeregisterClient +@ stdcall TcDeregisterClient(ptr) @ stub TcEnumerateFlows @ stub TcEnumerateInterfaces @ stub TcGetFlowNameA diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 6efea89..6b8a975 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -54,3 +54,12 @@ ULONG WINAPI TcRegisterClient(ULONG version, HANDLE context, if(buffer) *buffer = INVALID_HANDLE_VALUE; return ERROR_CALL_NOT_IMPLEMENTED; } + +/***************************************************************************** + * TcDeregisterClient [TRAFFIC.@] + */ +ULONG WINAPI TcDeregisterClient(HANDLE ClientHandle) +{ + FIXME("%p: stub\n", ClientHandle); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for PsSetLoadImageNotifyRoutine.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: c643aec1759c82ab3c187ff1fe518e2dda1dc8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c643aec1759c82ab3c187ff1f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 19 10:26:58 2011 +0100 ntoskrnl.exe: Add stub for PsSetLoadImageNotifyRoutine. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a697751..6fc0fb2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1596,6 +1596,15 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti } /***************************************************** + * PsSetLoadImageNotifyRoutine (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) +{ + FIXME("(%p) stub\n", routine); + return STATUS_SUCCESS; +} + +/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ed0059e..7e4918f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -911,7 +911,7 @@ @ stdcall PsSetCreateThreadNotifyRoutine(ptr) @ stub PsSetJobUIRestrictionsClass @ stub PsSetLegoNotifyRoutine -@ stub PsSetLoadImageNotifyRoutine +@ stdcall PsSetLoadImageNotifyRoutine(ptr) @ stub PsSetProcessPriorityByClass @ stub PsSetProcessPriorityClass @ stub PsSetProcessSecurityPort diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 1ea8d05..df58951 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -107,7 +107,28 @@ typedef enum _CONFIGURATION_TYPE MaximunType } CONFIGURATION_TYPE, *PCONFIGURATION_TYPE; +typedef struct _IMAGE_INFO +{ + union + { + ULONG Properties; + struct + { + ULONG ImageAddressingMode : 8; + ULONG SystemModeImage : 1; + ULONG ImageMappedToAllPids : 1; + ULONG ExtendedInfoPresent : 1; + ULONG Reserved : 21; + }; + }; + PVOID ImageBase; + ULONG ImageSelector; + SIZE_T ImageSize; + ULONG ImageSectionNumber; +} IMAGE_INFO, *PIMAGE_INFO; + typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); +typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERFACE_TYPE,ULONG, PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); @@ -115,5 +136,6 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); #endif

1 0

Marcus Meissner : comctl32: Added missing break (Coverity).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: e766a132dba7ee8fd20c6b603c01208dc16a8520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e766a132dba7ee8fd20c6b603… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:27:04 2011 +0100 comctl32: Added missing break (Coverity). --- dlls/comctl32/tests/treeview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 653807f..71df978 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -999,6 +999,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, } } } + break; } case WM_DESTROY:

1 0

Marcus Meissner : kernel32: Added missing break (Coverity).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 7cd22f7037514187a97ff18a1a7147c1745d26c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd22f7037514187a97ff18a1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:21:35 2011 +0100 kernel32: Added missing break (Coverity). --- dlls/kernel32/computername.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index dabaae8..8650440 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -131,8 +131,10 @@ static BOOL dns_fqdn ( char *name, int *size ) { case ENAMETOOLONG: SetLastError ( ERROR_MORE_DATA ); + break; default: SetLastError ( ERROR_INVALID_PARAMETER ); + break; } return FALSE; }

1 0

Marcus Meissner : dnsapi: Added missing breaks (Coverity).
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 409aae33ddabe413ef9aae5c63e1d994bfcbbcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409aae33ddabe413ef9aae5c6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 23:18:31 2011 +0100 dnsapi: Added missing breaks (Coverity). --- dlls/dnsapi/record.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 9755a3d..15efbf1 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -376,6 +376,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; } case DnsCharSetUtf8: switch (out) @@ -387,6 +388,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; case DnsCharSetAnsi: switch (out) { @@ -397,6 +399,7 @@ static LPVOID dns_strcpyX( LPCVOID src, DNS_CHARSET in, DNS_CHARSET out ) WARN( "unhandled target charset: %d\n", out ); break; } + break; default: WARN( "unhandled source charset: %d\n", in ); break;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011